COMPUTE-196 Support Python >=3.8 for dxpy (#1296)

dnanexus · Dec 11, 2023 · 955e34e · 955e34e
1 parent 65fa93a
commit 955e34e
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ Categories for each release: Added, Changed, Deprecated, Removed, Fixed, Securit
 
 ## Unreleased
 
+### Changed
+
+* Require Python >= 3.8 for dxpy
+
 ### Fixed
 
 * Suppressing traceback when `dx extract_assay expression` attempts to access a dataset it does not have access to

diff --git a/Readme.md b/Readme.md
@@ -42,7 +42,7 @@ Supported languages
 
 The Platform SDK contains API language bindings for the following platforms:
 
-* [Python](src/python/Readme.md) (requires Python 3.6 or higher)
+* [Python](src/python/Readme.md) (requires Python 3.8 or higher)
 * C++
 * [Java](src/java/Readme.md) (requires Java 7 or higher)
 

diff --git a/src/mk/Makefile.linux b/src/mk/Makefile.linux
@@ -15,7 +15,7 @@
 #   under the License.
 
 $(DNANEXUS_HOME)/bin/dx: $(shell find python/{dxpy,scripts,requirements*,setup*} -not -name toolkit_version*)
-	python3 -c 'import sys; exit("dx-toolkit is not compatible with Python < 3.6" if sys.version_info < (3, 6) else 0)'
+	python3 -c 'import sys; exit("dx-toolkit is not compatible with Python < 3.8" if sys.version_info < (3, 8) else 0)'
 	rm -rf "$(DX_PY_ENV)"
 	$(VIRTUAL_ENV) "$(DX_PY_ENV)"
 

diff --git a/src/mk/Makefile.osx b/src/mk/Makefile.osx
@@ -15,7 +15,7 @@
 #   under the License.
 
 $(DNANEXUS_HOME)/bin/dx: $(shell find python/{dxpy,scripts,requirements*,setup*} -not -name toolkit_version*)
-	python3 -c 'import sys; exit("dx-toolkit is not compatible with Python < 3.6" if sys.version_info < (3, 6) else 0)'
+	python3 -c 'import sys; exit("dx-toolkit is not compatible with Python < 3.8" if sys.version_info < (3, 8) else 0)'
 	rm -rf "$(DX_PY_ENV)" python/dist
 	$(VIRTUAL_ENV) "$(DX_PY_ENV)"
 

diff --git a/src/python/Readme.md b/src/python/Readme.md
@@ -56,7 +56,7 @@ Other useful resources:
 
 Python version compatibility
 ----------------------------
-dxpy is supported on Python 3 (3.6+)
+dxpy is supported on Python 3 (3.8+)
 
 Convention for Python scripts that are also modules
 ---------------------------------------------------

diff --git a/src/python/requirements.txt b/src/python/requirements.txt
@@ -5,6 +5,5 @@ python-dateutil>=2.5
 psutil>=5.9.3
 certifi
 urllib3>=1.26.18,<2.2
-pyreadline3==3.4.1; sys_platform == "win32" and python_version >= "3.5"
-colorama==0.4.4; sys_platform == "win32" and python_version >= "3.5" and python_version < "3.7"
-colorama>=0.4.4,<=0.4.6; sys_platform == "win32" and python_version >= "3.7"
+pyreadline3==3.4.1; sys_platform == "win32"
+colorama>=0.4.4,<=0.4.6; sys_platform == "win32"
diff --git a/src/python/requirements_setuptools.txt b/src/python/requirements_setuptools.txt
@@ -1,3 +1,3 @@
-pip==21.3.1
-setuptools==68.0.0
-wheel==0.41.3
+pip==23.3.1
+setuptools==69.0.2
+wheel==0.42.0
diff --git a/src/python/setup.py b/src/python/setup.py
@@ -97,10 +97,10 @@ def make_valid_pypi_version(raw):
     entry_points = {
         "console_scripts": scripts,
     },
-    python_requires = '>=3.6',
+    python_requires = '>=3.8',
     install_requires = dependencies,
     extras_require={
-        'pandas': ["pandas==1.3.5; python_version>='3.7'", "pandas>=0.23.3,<=0.25.3; python_version>='3.5.3' and python_version<'3.7'"],
+        'pandas': ["pandas==1.3.5"],
         'xattr': ["xattr==0.10.1; sys_platform == 'linux2' or sys_platform == 'linux'"]
     },
     tests_require = test_dependencies,