Skip to content

Commit

Permalink
Raise minimum python version to 3.7
Browse files Browse the repository at this point in the history
This version of python will be supported until 2023, while 3.6 will end
support at the end of this calendar year. Establishing 3.7 as our
baseline also simplifies our dependency requirements, which is a nice
bonus.

To reflect this change on the minimum support python version I've
removed the old versions from our matrix builds.

Signed-off-by: Rodrigo Tobar <rtobar@icrar.org>
  • Loading branch information
rtobar committed Jun 30, 2021
1 parent 830c114 commit 0e50452
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 19 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ matrix:
# - python: "3.8"
# env: TEST_OPENAPI=1
- python: "3.7"
- python: "3.6"
- python: "3.5"
- name: doxygen
if: branch = master
before_install:
Expand Down
14 changes: 2 additions & 12 deletions daliuge-engine/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,25 +129,15 @@ def run(self):
"python-daemon",
"pyzmq",
"scp",
# 0.19.0 requires netifaces < 0.10.5, exactly the opposite of what *we* need
"zeroconf >= 0.19.1",
# 0.6 brings python3 support plus other fixes
"zerorpc >= 0.6",
"pyarrow",
"numpy"
]
# Keep alpha-sorted PLEASE!

# Python 2 support has been dropped in zeroconf 0.20.
# Also, 0.19.0 requires netifaces < 0.10.5, exactly the opposite of what *we* need
# Also, 0.21.0 erroneously tags 3.4 as supported, while in fact it isn't
# (see https://github.com/jstasiak/python-zeroconf/issues/139 for details).
# We provided a fix for that, so from 0.21.1 is already good.
if sys.version_info[:2] == (2, 7):
install_requires.append("zeroconf == 0.19.1")
elif sys.version_info[:2] <= (3, 4):
install_requires.append("zeroconf != 0.21.0")
else:
install_requires.append("zeroconf >= 0.19.1")

# Extra requirements that are not needed by your every day daliuge installation
extra_requires = {
# spead is required only for a specific app and its test, which we
Expand Down
6 changes: 2 additions & 4 deletions daliuge-translator/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,8 @@ def package_files(directory):
"cwlgen",
"daliuge-common==%s" % (VERSION,),
"metis>=0.2a3",
# Python 3.6 is only supported in NetworkX 2 and above
# But we are not compatible with 2.4 yet, so we need to constrain that
"networkx<2.4; python_version<'3.6'",
"networkx<2.4,>= 2.0; python_version>='3.6.0'",
# We are not compatible with networkx 2.4 yet, so we need to constrain that
"networkx<2.4",
"numpy",
"psutil",
"pyswarm",
Expand Down
2 changes: 1 addition & 1 deletion docs/installing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ installed on the system:
Installing
##########

|daliuge| requires python 3.
|daliuge| requires python 3.7 or later.

|daliuge| is based on setuptools, and thus it follows the standard python installation
procedures.
Expand Down

0 comments on commit 0e50452

Please sign in to comment.