Switched to Python 3

diff --git a/README b/README
index 5e89922c30b906e0c55a245a9400aec5f8717003..0a1c20688d9c2f0d4aebd10c5932ce4b7e0009e2 100644 (file)
--- 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 ed495519a11b1e1814e597135fb010d08aa624f2..63d6086a7f895617f184bfa2b87ea3eaf99d064e 100644 (file)
--- 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 93eb9846b9678d3775224a1dcc6147749959b841..4a1485110bb37756ff6f472f2c719255774609a7 100644 (file)
--- 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 cca41f9171067a4d7eabfe7b208a9cd6b886a9ad..ccf88ec7ed275989203084e8f9122c6569e87f3c 100644 (file)
--- 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 eac829ddfaebee95c753b014701d9d88c71a1807..e787b1f7693a42081c4e4ab6db3a823ef25c6c26 100644 (file)
--- 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 766157eb3a913490eb2f5ba0426084a6b78a1eb5..05a7ed02784d1fd990be155654e56873f1cefee3 100644 (file)
--- 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 d617187ecaacd24d8f0a039c740819ca4fc0554f..f0bf0131ea47ff1d9f0cb05ea89d6c611c50beb2 100755 (executable)
--- 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 fb5695ff67c60ed6d5acc29fc8939f9ce847bb33..8757d474183a8989bf84db6f3af728bd40d3bc78 100644 (file)
--- 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 57c2a5b12c2b7ea878723adccb22b3b866b9ef7a..423892334f0b694f6f1cab51b97e658c24eb00f6 100755 (executable)
--- 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 aee2111859333dd83eaca28923acffabc83a7b47..19d01c7c6e543dd478984b233410e5a361549f93 100644 (file)
--- 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 8419688c9aace42c4c0c2be9fe659c50fcd3cd62..f1ec5476b612947fe391983e143480423b6c83c9 100755 (executable)
--- 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 271dd9c4084cc61517de281b29a6efbf6117b3d3..01a19a8d98e0c00b74023dd89731d2d0433f09f6 100644 (file)
--- 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 6e880677c6304e8fd461cc8959dcc2199eb55c04..18dbbc27922911dc1866a3efec192b82b518a656 100755 (executable)
--- 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 cfefe339fa4aad8edb4d539db2cc8de1e8ebd78e..9c6cd3a19e54acf9c65a48f0b6f477d9ff3505fb 100755 (executable)
--- 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