From: Clifford Wolf <clifford@clifford.at>
Date: Sat, 22 Aug 2015 07:59:25 +0000 (+0200)
Subject: Switched to Python 3
X-Git-Tag: yosys-0.6~178
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c475deec6c69d509ac828cca437e2b9502f7b0c3;p=yosys.git

Switched to Python 3
---

diff --git a/README b/README
index 5e89922c3..0a1c20688 100644
--- a/README
+++ b/README
@@ -56,7 +56,7 @@ For example on Ubuntu Linux 14.04 LTS the following commands will install all
 prerequisites for building yosys:
 
 	$ yosys_deps="build-essential clang bison flex libreadline-dev gawk
-	       tcl-dev libffi-dev git mercurial graphviz xdot pkg-config python"
+	       tcl-dev libffi-dev git mercurial graphviz xdot pkg-config python3"
 	$ sudo apt-get install $yosys_deps
 
 There are also pre-compiled Yosys binary packages for Ubuntu and Win32 as well
diff --git a/techlibs/ice40/Makefile.inc b/techlibs/ice40/Makefile.inc
index ed495519a..63d6086a7 100644
--- a/techlibs/ice40/Makefile.inc
+++ b/techlibs/ice40/Makefile.inc
@@ -12,7 +12,7 @@ EXTRA_OBJS += techlibs/ice40/brams_init.mk
 
 techlibs/ice40/brams_init.mk: techlibs/ice40/brams_init.py
 	$(Q) mkdir -p techlibs/ice40
-	$(P) python $<
+	$(P) python3 $<
 	$(Q) touch techlibs/ice40/brams_init.mk
 
 techlibs/ice40/brams_init1.vh: techlibs/ice40/brams_init.mk
diff --git a/techlibs/ice40/brams_init.py b/techlibs/ice40/brams_init.py
index 93eb9846b..4a1485110 100644
--- a/techlibs/ice40/brams_init.py
+++ b/techlibs/ice40/brams_init.py
@@ -1,7 +1,4 @@
-#!/usr/bin/python
-
-from __future__ import division
-from __future__ import print_function
+#!/usr/bin/env python3
 
 def write_init_vh(filename, initbits):
     with open(filename, "w") as f:
diff --git a/techlibs/xilinx/Makefile.inc b/techlibs/xilinx/Makefile.inc
index cca41f917..ccf88ec7e 100644
--- a/techlibs/xilinx/Makefile.inc
+++ b/techlibs/xilinx/Makefile.inc
@@ -11,7 +11,7 @@ EXTRA_OBJS += techlibs/xilinx/brams_init.mk
 
 techlibs/xilinx/brams_init.mk: techlibs/xilinx/brams_init.py
 	$(Q) mkdir -p techlibs/xilinx
-	$(P) python $<
+	$(P) python3 $<
 	$(Q) touch $@
 
 techlibs/xilinx/brams_init_36.vh: techlibs/xilinx/brams_init.mk
diff --git a/techlibs/xilinx/brams_init.py b/techlibs/xilinx/brams_init.py
index eac829ddf..e787b1f76 100644
--- a/techlibs/xilinx/brams_init.py
+++ b/techlibs/xilinx/brams_init.py
@@ -1,7 +1,4 @@
-#!/usr/bin/python
-
-from __future__ import division
-from __future__ import print_function
+#!/usr/bin/env python3
 
 with open("techlibs/xilinx/brams_init_18.vh", "w") as f:
     for i in range(8):
diff --git a/tests/bram/generate.py b/tests/bram/generate.py
index 766157eb3..05a7ed027 100644
--- a/tests/bram/generate.py
+++ b/tests/bram/generate.py
@@ -1,7 +1,4 @@
-#!/usr/bin/python
-
-from __future__ import division
-from __future__ import print_function
+#!/usr/bin/env python3
 
 import os
 import sys
diff --git a/tests/bram/run-test.sh b/tests/bram/run-test.sh
index d617187ec..f0bf0131e 100755
--- a/tests/bram/run-test.sh
+++ b/tests/bram/run-test.sh
@@ -8,7 +8,7 @@ rm -rf temp
 mkdir -p temp
 
 echo "generating tests.."
-python generate.py
+python3 generate.py
 
 {
 	echo -n "all:"
diff --git a/tests/fsm/generate.py b/tests/fsm/generate.py
index fb5695ff6..8757d4741 100644
--- a/tests/fsm/generate.py
+++ b/tests/fsm/generate.py
@@ -1,7 +1,4 @@
-#!/usr/bin/python
-
-from __future__ import division
-from __future__ import print_function
+#!/usr/bin/env python3
 
 import sys
 import random
diff --git a/tests/fsm/run-test.sh b/tests/fsm/run-test.sh
index 57c2a5b12..423892334 100755
--- a/tests/fsm/run-test.sh
+++ b/tests/fsm/run-test.sh
@@ -8,7 +8,7 @@ set -e
 rm -rf temp
 mkdir -p temp
 echo "generating tests.."
-python generate.py
+python3 generate.py
 
 {
 	all_targets="all_targets:"
diff --git a/tests/realmath/generate.py b/tests/realmath/generate.py
index aee211185..19d01c7c6 100644
--- a/tests/realmath/generate.py
+++ b/tests/realmath/generate.py
@@ -1,7 +1,4 @@
-#!/usr/bin/python
-
-from __future__ import division
-from __future__ import print_function
+#!/usr/bin/env python3
 
 import sys
 import random
diff --git a/tests/realmath/run-test.sh b/tests/realmath/run-test.sh
index 8419688c9..f1ec5476b 100755
--- a/tests/realmath/run-test.sh
+++ b/tests/realmath/run-test.sh
@@ -4,7 +4,7 @@ set -e
 rm -rf temp
 mkdir -p temp
 echo "generating tests.."
-python generate.py
+python3 generate.py
 
 cd temp
 echo "running tests.."
diff --git a/tests/share/generate.py b/tests/share/generate.py
index 271dd9c40..01a19a8d9 100644
--- a/tests/share/generate.py
+++ b/tests/share/generate.py
@@ -1,7 +1,4 @@
-#!/usr/bin/python
-
-from __future__ import division
-from __future__ import print_function
+#!/usr/bin/env python3
 
 import sys
 import random
diff --git a/tests/share/run-test.sh b/tests/share/run-test.sh
index 6e880677c..18dbbc279 100755
--- a/tests/share/run-test.sh
+++ b/tests/share/run-test.sh
@@ -8,7 +8,7 @@ set -e
 rm -rf temp
 mkdir -p temp
 echo "generating tests.."
-python generate.py
+python3 generate.py
 
 echo "running tests.."
 for i in $( ls temp/*.ys | sed 's,[^0-9],,g; s,^0*\(.\),\1,g;' ); do
diff --git a/tests/tools/txt2tikztiming.py b/tests/tools/txt2tikztiming.py
index cfefe339f..9c6cd3a19 100755
--- a/tests/tools/txt2tikztiming.py
+++ b/tests/tools/txt2tikztiming.py
@@ -1,7 +1,4 @@
-#!/usr/bin/python
-
-from __future__ import division
-from __future__ import print_function
+#!/usr/bin/env python3
 
 import argparse
 import fileinput