Merge pull request #5 from ptomulik/issue-4

ptomulik · web-flow · commit 2b92500feed4 · 2020-04-17T00:36:33.000+02:00
Fixed issue #4
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,9 @@ python:
   - 2.7
   - 3.5
   - 3.6
-  - 3.7-dev
+  - 3.7
+  - 3.8
+  - 3.9-dev
 
 addons:
   apt:
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,3 +1,5 @@
+RELEASE 0.7.4 - Fri, Apr 17 2020
+ - fixed issue #4 - review and update
 RELEASE 0.7.3 - Wed, Feb 26 2020
  - declared all *.py sources as utf8 (PEP 263)
  - modified scripts such that CI tests shall pass also under py2.7.
diff --git a/Pipfile b/Pipfile
@@ -3,9 +3,8 @@ url = "https://pypi.org/simple"
 verify_ssl = true
 name = "pypi"
 
-
 [dev-packages]
-scons = ">=3.0.1"
+scons-select = { path = "./deps/scons-select" }
 twine = "*"
 scons-tool-loader = ">=0.1.9"
 
diff --git a/about.py b/about.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 """Version information, etc."""
 
-#  DskLayout version info
-__version__ = '0.7.3'
+# version info
+__version__ = '0.7.4'
 """Package version as a string."""
 
 # Local Variables:
diff --git a/bin/downloads.py b/bin/downloads.py
@@ -1,8 +1,8 @@
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-#! /usr/bin/env python
 
 #
-# Copyright (c) 2014-2020 by Paweł Tomulik
+# Copyright (c) 2018-2020 by Paweł Tomulik
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -110,6 +110,9 @@ def download_scons_test(**kw):
     shutil.move(os.path.join(destdir, 'runtest.py'), os.path.join(destdir, 'runtest'))
     return 0
 
+def is_for_py2():
+    return sys.version_info.major == 2 or (os.getenv('TOXENV') or '').startswith('py2')
+
 # The script...
 _script = os.path.basename(sys.argv[0])
 _scriptabs = os.path.realpath(sys.argv[0])
@@ -121,32 +124,10 @@ def download_scons_test(**kw):
 _default_packages = [ 'scons-test', ]
 
 # scons versions other than x.y.z
-_scons_versions = [
-        'master',
-        '3.1.2',
-        '3.1.1',
-        '3.1.0',
-        '3.0.5',
-        '3.0.4',
-        '3.0.3',
-        '3.0.2',
-        '3.0.1',
-        '3.0.0',
-        '2.5.1',
-        '2.5.0',
-        '2.4.1',
-        '2.4.0',
-        '2.3.1',
-        '2.3.0',
-        '2.2.0',
-        '2.1.0.final.0'
-]
-if sys.version_info.major == 2 or (os.getenv('TOXENV') or '').startswith('py2'):
-    _default_scons_version = '3.0.5'
-else:
-    _default_scons_version = _scons_versions[0]
-
-# scons-test
+_scons_versions = ['master', '2.1.0.final.0']
+# default scons version
+_default_scons_version = '3.0.5' if is_for_py2() else _scons_versions[0]
+# default scons-test version
 _default_scons_test_version = _default_scons_version
 
 _parser = argparse.ArgumentParser(
diff --git a/deps/scons-select/setup.py b/deps/scons-select/setup.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+from setuptools import setup
+
+setup(
+        name='scons-select',
+        version='1.0',
+        install_requires=[
+            'scons>=3.0.1; python_version>="3"',
+            'scons>=3.0.1,<3.1; python_version<"3"'
+        ],
+        description='Selects appropriate SCons version for python2/python3',
+)
+
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/system/sconstool/gnuplot/emitter/order1/image/SConstruct b/test/system/sconstool/gnuplot/emitter/order1/image/SConstruct
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #
 # Copyright (c) 2013-2020 by Pawel Tomulik
 #
diff --git a/test/system/sconstool/gnuplot/emitter/order1/sconstest-order1.py b/test/system/sconstool/gnuplot/emitter/order1/sconstest-order1.py
@@ -1,5 +1,5 @@
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-#! /usr/bin/env python
 #
 # Copyright (c) 2013-2020 by Paweł Tomulik
 #
diff --git a/test/system/sconstool/gnuplot/emitter/scanout1/image/SConstruct b/test/system/sconstool/gnuplot/emitter/scanout1/image/SConstruct
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #
 # Copyright (c) 2013-2020 by Pawel Tomulik
 #
diff --git a/test/system/sconstool/gnuplot/emitter/scanout1/sconstest-scanout1.py b/test/system/sconstool/gnuplot/emitter/scanout1/sconstest-scanout1.py
@@ -1,5 +1,5 @@
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-#! /usr/bin/env python
 #
 # Copyright (c) 2013-2020 by Paweł Tomulik
 #
diff --git a/test/system/sconstool/gnuplot/emitter/scanout2/image/SConstruct b/test/system/sconstool/gnuplot/emitter/scanout2/image/SConstruct
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #
 # Copyright (c) 2013-2020 by Pawel Tomulik
 #
diff --git a/test/system/sconstool/gnuplot/emitter/scanout2/sconstest-scanout2.py b/test/system/sconstool/gnuplot/emitter/scanout2/sconstest-scanout2.py
@@ -1,5 +1,5 @@
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-#! /usr/bin/env python
 #
 # Copyright (c) 2013-2020 by Paweł Tomulik
 #
diff --git a/test/system/sconstool/gnuplot/extoutput/extouptut1/image/SConstruct b/test/system/sconstool/gnuplot/extoutput/extouptut1/image/SConstruct
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #
 # Copyright (c) 2013-2020 by Pawel Tomulik
 #
diff --git a/test/system/sconstool/gnuplot/extoutput/extouptut1/sconstest-extoutput1.py b/test/system/sconstool/gnuplot/extoutput/extouptut1/sconstest-extoutput1.py
@@ -1,5 +1,5 @@
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-#! /usr/bin/env python
 #
 # Copyright (c) 2013-2020 by Paweł Tomulik
 #
diff --git a/test/system/sconstool/gnuplot/multiscript/multiscript1/image/SConstruct b/test/system/sconstool/gnuplot/multiscript/multiscript1/image/SConstruct
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #
 # Copyright (c) 2013-2020 by Pawel Tomulik
 #
diff --git a/test/system/sconstool/gnuplot/multiscript/multiscript1/sconstest-multiscript1.py b/test/system/sconstool/gnuplot/multiscript/multiscript1/sconstest-multiscript1.py
@@ -1,5 +1,5 @@
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-#! /usr/bin/env python
 #
 # Copyright (c) 2013-2020 by Paweł Tomulik
 #
diff --git a/test/system/sconstool/gnuplot/simple/chdir1/image/SConstruct b/test/system/sconstool/gnuplot/simple/chdir1/image/SConstruct
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #
 # Copyright (c) 2013-2020 by Pawel Tomulik
 #
diff --git a/test/system/sconstool/gnuplot/simple/chdir1/sconstest-chdir1.py b/test/system/sconstool/gnuplot/simple/chdir1/sconstest-chdir1.py
@@ -1,5 +1,5 @@
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-#! /usr/bin/env python
 #
 # Copyright (c) 2013-2020 by Paweł Tomulik
 #
diff --git a/test/system/sconstool/gnuplot/simple/chdir2/image/SConstruct b/test/system/sconstool/gnuplot/simple/chdir2/image/SConstruct
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #
 # Copyright (c) 2013-2020 by Pawel Tomulik
 #
diff --git a/test/system/sconstool/gnuplot/simple/chdir2/image/sub/SConscript b/test/system/sconstool/gnuplot/simple/chdir2/image/sub/SConscript
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #
 # Copyright (c) 2013-2020 by Pawel Tomulik
 #
diff --git a/test/system/sconstool/gnuplot/simple/chdir2/sconstest-chdir2.py b/test/system/sconstool/gnuplot/simple/chdir2/sconstest-chdir2.py
@@ -1,5 +1,5 @@
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-#! /usr/bin/env python
 #
 # Copyright (c) 2013-2020 by Paweł Tomulik
 #
diff --git a/test/system/sconstool/gnuplot/simple/doublein1/image/SConstruct b/test/system/sconstool/gnuplot/simple/doublein1/image/SConstruct
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #
 # Copyright (c) 2013-2020 by Pawel Tomulik
 #
diff --git a/test/system/sconstool/gnuplot/simple/doublein1/sconstest-doublein1.py b/test/system/sconstool/gnuplot/simple/doublein1/sconstest-doublein1.py
@@ -1,5 +1,5 @@
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-#! /usr/bin/env python
 #
 # Copyright (c) 2013-2020 by Paweł Tomulik
 #
diff --git a/test/system/sconstool/gnuplot/simple/doubleinout1/image/SConstruct b/test/system/sconstool/gnuplot/simple/doubleinout1/image/SConstruct
@@ -1,5 +1,6 @@
+# -*- coding: utf-8 -*-
 #
-# Copyright (c) 2013-2020 by Pawel Tomulik
+# Copyright (c) 2013-2020 by Paweł Tomulik
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/test/system/sconstool/gnuplot/simple/doubleinout1/sconstest-doubleinout1.py b/test/system/sconstool/gnuplot/simple/doubleinout1/sconstest-doubleinout1.py
@@ -1,5 +1,5 @@
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-#! /usr/bin/env python
 #
 # Copyright (c) 2013-2020 by Paweł Tomulik
 #
diff --git a/test/system/sconstool/gnuplot/simple/namedinout1/image/SConstruct b/test/system/sconstool/gnuplot/simple/namedinout1/image/SConstruct
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #
 # Copyright (c) 2013-2020 by Pawel Tomulik
 #
diff --git a/test/system/sconstool/gnuplot/simple/namedinout1/sconstest-namedinout1.py b/test/system/sconstool/gnuplot/simple/namedinout1/sconstest-namedinout1.py
@@ -1,5 +1,5 @@
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-#! /usr/bin/env python
 #
 # Copyright (c) 2013-2020 by Paweł Tomulik
 #
diff --git a/test/system/sconstool/gnuplot/trivial/empty/image/SConstruct b/test/system/sconstool/gnuplot/trivial/empty/image/SConstruct
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #
 # Copyright (c) 2013-2020 by Pawel Tomulik
 #
diff --git a/test/system/sconstool/gnuplot/trivial/empty/sconstest-empty.py b/test/system/sconstool/gnuplot/trivial/empty/sconstest-empty.py
@@ -1,5 +1,5 @@
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-#! /usr/bin/env python
 #
 # Copyright (c) 2013-2020 by Paweł Tomulik
 #
diff --git a/test/system/sconstool/gnuplot/trivial/load/image/SConstruct b/test/system/sconstool/gnuplot/trivial/load/image/SConstruct
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #
 # Copyright (c) 2013-2020 by Pawel Tomulik
 #
diff --git a/test/system/sconstool/gnuplot/trivial/load/sconstest-load.py b/test/system/sconstool/gnuplot/trivial/load/sconstest-load.py
@@ -1,5 +1,5 @@
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-#! /usr/bin/env python
 #
 # Copyright (c) 2013-2020 by Paweł Tomulik
 #
diff --git a/test/system/sconstool/gnuplot/trivial/singleinout1/image/SConstruct b/test/system/sconstool/gnuplot/trivial/singleinout1/image/SConstruct
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #
 # Copyright (c) 2013-2020 by Pawel Tomulik
 #
diff --git a/test/system/sconstool/gnuplot/trivial/singleinout1/sconstest-singleinout1.py b/test/system/sconstool/gnuplot/trivial/singleinout1/sconstest-singleinout1.py
@@ -1,5 +1,5 @@
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-#! /usr/bin/env python
 #
 # Copyright (c) 2013-2020 by Paweł Tomulik
 #
diff --git a/test/system/sconstool/gnuplot/trivial/singleinout2/image/SConstruct b/test/system/sconstool/gnuplot/trivial/singleinout2/image/SConstruct
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #
 # Copyright (c) 2013-2020 by Pawel Tomulik
 #
diff --git a/test/system/sconstool/gnuplot/trivial/singleinout2/sconstest-singleinout2.py b/test/system/sconstool/gnuplot/trivial/singleinout2/sconstest-singleinout2.py
@@ -1,5 +1,5 @@
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-#! /usr/bin/env python
 #
 # Copyright (c) 2013-2020 by Paweł Tomulik
 #
diff --git a/test/system/sconstool/gnuplot/trivial/singleout1/image/SConstruct b/test/system/sconstool/gnuplot/trivial/singleout1/image/SConstruct
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #
 # Copyright (c) 2013-2020 by Pawel Tomulik
 #
diff --git a/test/system/sconstool/gnuplot/trivial/singleout1/sconstest-singleout1.py b/test/system/sconstool/gnuplot/trivial/singleout1/sconstest-singleout1.py
@@ -1,5 +1,5 @@
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-#! /usr/bin/env python
 #
 # Copyright (c) 2013-2020 by Paweł Tomulik
 #
diff --git a/test/system/sconstool/gnuplot/trivial/singleout2/image/SConstruct b/test/system/sconstool/gnuplot/trivial/singleout2/image/SConstruct
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #
 # Copyright (c) 2013-2020 by Pawel Tomulik
 #
diff --git a/test/system/sconstool/gnuplot/trivial/singleout2/sconstest-singleout2.py b/test/system/sconstool/gnuplot/trivial/singleout2/sconstest-singleout2.py
@@ -1,5 +1,5 @@
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-#! /usr/bin/env python
 #
 # Copyright (c) 2013-2020 by Paweł Tomulik
 #
diff --git a/test/system/sconstool/gnuplot/variant/variant1/image/SConstruct b/test/system/sconstool/gnuplot/variant/variant1/image/SConstruct
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #
 # Copyright (c) 2013-2020 by Pawel Tomulik
 #
diff --git a/test/system/sconstool/gnuplot/variant/variant1/image/src/SConscript b/test/system/sconstool/gnuplot/variant/variant1/image/src/SConscript
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #
 # Copyright (c) 2013-2020 by Pawel Tomulik
 #
diff --git a/test/system/sconstool/gnuplot/variant/variant1/sconstest-variant1.py b/test/system/sconstool/gnuplot/variant/variant1/sconstest-variant1.py
@@ -1,5 +1,5 @@
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-#! /usr/bin/env python
 #
 # Copyright (c) 2013-2020 by Paweł Tomulik
 #
diff --git a/test/system/sconstool/gnuplot/variant/variantchdir1/image/SConstruct b/test/system/sconstool/gnuplot/variant/variantchdir1/image/SConstruct
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #
 # Copyright (c) 2013-2020 by Pawel Tomulik
 #
diff --git a/test/system/sconstool/gnuplot/variant/variantchdir1/image/src/SConscript b/test/system/sconstool/gnuplot/variant/variantchdir1/image/src/SConscript
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #
 # Copyright (c) 2013-2020 by Pawel Tomulik
 #
diff --git a/test/system/sconstool/gnuplot/variant/variantchdir1/sconstest-variantchdir1.py b/test/system/sconstool/gnuplot/variant/variantchdir1/sconstest-variantchdir1.py
@@ -1,5 +1,5 @@
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-#! /usr/bin/env python
 #
 # Copyright (c) 2013-2020 by Paweł Tomulik
 #

-Original file line number
+Diff line change
   - 2.7
   - 3.5
   - 3.6
 -  - 3.7-dev
 +  - 3.7
 +  - 3.8
 +  - 3.9-dev
 addons:
   apt:
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+RELEASE 0.7.4 - Fri, Apr 17 2020`
	`2`	`+ - fixed issue #4 - review and update`
`1`	`3`	`RELEASE 0.7.3 - Wed, Feb 26 2020`
`2`	`4`	`- declared all *.py sources as utf8 (PEP 263)`
`3`	`5`	`- modified scripts such that CI tests shall pass also under py2.7.`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+# -- coding: utf-8 --`
`1`	`2`	`#`
`2`	`3`	`# Copyright (c) 2013-2020 by Pawel Tomulik`
`3`	`4`	`#`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
	`1`	`+#!/usr/bin/env python3`
`1`	`2`	`# -- coding: utf-8 --`
`2`		`-#! /usr/bin/env python`
`3`	`3`	`#`
`4`	`4`	`# Copyright (c) 2013-2020 by Paweł Tomulik`
`5`	`5`	`#`