Drop Python 3.7 and Add Python 3.12 & 3.13 (#495)

* drop support for py 3.7, add support for py 3.12 and 3.13 * fix docs build issue * remove py 3.7 and add py 3.12/3.13 to integration tests * update Makefile to use target_version variable and update spellbook requirements in examples
LLNL · Feb 19, 2025 · c08032d · c08032d
1 parent e1655df
commit c08032d
Show file tree

Hide file tree

Showing 13 changed files with 40 additions and 37 deletions.
diff --git a/.github/workflows/push-pr_workflow.yml b/.github/workflows/push-pr_workflow.yml
@@ -92,7 +92,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
 
     steps:
     - uses: actions/checkout@v4
@@ -158,7 +158,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
 
     steps:
     - uses: actions/checkout@v4
@@ -224,7 +224,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
 
     steps:
     - uses: actions/checkout@v4

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -11,5 +11,6 @@ python:
 
 mkdocs:
   fail_on_warning: false
+  configuration: mkdocs.yml
 
 formats: [pdf]
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 ### Added
+- Added support for Python 3.12 and 3.13
 - Added additional tests for the `merlin run` and `merlin purge` commands
 - Aliased types to represent different types of pytest fixtures
 - New test condition `StepFinishedFilesCount` to help search for `MERLIN_FINISHED` files in output workspaces
@@ -14,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added `command-tests`, `workflow-tests`, and `integration-tests` to the Makefile
 
 ### Changed
+- Dropped support for Python 3.7
 - Ported all distributed tests of the integration test suite to pytest
   - There is now a `commands/` directory and a `workflows/` directory under the integration suite to house these tests
   - Removed the "Distributed-tests" GitHub action as these tests will now be run under "Integration-tests"

diff --git a/Makefile b/Makefile
@@ -138,9 +138,9 @@ check-flake8:
 
 check-black:
 	. $(VENV)/bin/activate; \
-	$(PYTHON) -m black --check --line-length $(MAX_LINE_LENGTH) --target-version py38 $(MRLN); \
-	$(PYTHON) -m black --check --line-length $(MAX_LINE_LENGTH) --target-version py38 $(TEST); \
-	$(PYTHON) -m black --check --line-length $(MAX_LINE_LENGTH) --target-version py38 *.py; \
+	$(PYTHON) -m black --check --line-length $(MAX_LINE_LENGTH) --target-version $(PY_TARGET_VER) $(MRLN); \
+	$(PYTHON) -m black --check --line-length $(MAX_LINE_LENGTH) --target-version $(PY_TARGET_VER) $(TEST); \
+	$(PYTHON) -m black --check --line-length $(MAX_LINE_LENGTH) --target-version $(PY_TARGET_VER) *.py; \
 
 
 check-isort:
@@ -182,9 +182,9 @@ fix-style:
 	$(PYTHON) -m isort -w $(MAX_LINE_LENGTH) $(MRLN); \
 	$(PYTHON) -m isort -w $(MAX_LINE_LENGTH) $(TEST); \
 	$(PYTHON) -m isort -w $(MAX_LINE_LENGTH) *.py; \
-	$(PYTHON) -m black --target-version py38 -l $(MAX_LINE_LENGTH) $(MRLN); \
-	$(PYTHON) -m black --target-version py38 -l $(MAX_LINE_LENGTH) $(TEST); \
-	$(PYTHON) -m black --target-version py38 -l $(MAX_LINE_LENGTH) *.py; \
+	$(PYTHON) -m black --target-version $(PY_TARGET_VER) -l $(MAX_LINE_LENGTH) $(MRLN); \
+	$(PYTHON) -m black --target-version $(PY_TARGET_VER) -l $(MAX_LINE_LENGTH) $(TEST); \
+	$(PYTHON) -m black --target-version $(PY_TARGET_VER) -l $(MAX_LINE_LENGTH) *.py; \
 
 
 # Increment the Merlin version. USE ONLY ON DEVELOP BEFORE MERGING TO MASTER.

diff --git a/README.md b/README.md
@@ -86,7 +86,7 @@ Need help? <[email protected]>
 
 ## Quick Start
 
-Note: Merlin supports Python 3.6+.
+Note: Merlin supports Python 3.8+.
 
 To install Merlin and its dependencies, run:
 

diff --git a/config.mk b/config.mk
@@ -1,4 +1,5 @@
 PYTHON?=python3
+PY_TARGET_VER?=py311
 PYV=$(shell $(PYTHON) -c "import sys;t='{v[0]}_{v[1]}'.format(v=list(sys.version_info[:2]));sys.stdout.write(t)")
 PYVD=$(shell $(PYTHON) -c "import sys;t='{v[0]}.{v[1]}'.format(v=list(sys.version_info[:2]));sys.stdout.write(t)")
 VENV?=venv_merlin_py_$(PYV)

diff --git a/merlin/common/openfilelist.py b/merlin/common/openfilelist.py
@@ -31,29 +31,29 @@
 ###############################################################################
 
 """
-  OpenFileList
+OpenFileList
 
-  A synthetic file class that opens a list of files and reads them as if they
-  were a single file
+A synthetic file class that opens a list of files and reads them as if they
+were a single file
 
-  SYNOPSIS:
+SYNOPSIS:
 
-    with OpenFileList(["file1.txt","file2.txt",...]) as f :
-      print f.read();
+  with OpenFileList(["file1.txt","file2.txt",...]) as f :
+    print f.read();
 
-  reads the concatenation of file1.txt, file2.txt, etc.
+reads the concatenation of file1.txt, file2.txt, etc.
 
-  file methods supported :
+file methods supported :
 
-    f.read([bytes])
-    f.readlines([bytes])
-    f.readline([bytes])
-    f.tell()
-    f.close()
-    f.__iter__()
+  f.read([bytes])
+  f.readlines([bytes])
+  f.readline([bytes])
+  f.tell()
+  f.close()
+  f.__iter__()
 
-  TODO:
-    implement a seek method
+TODO:
+  implement a seek method
 
 """
 

diff --git a/merlin/examples/workflows/feature_demo/requirements.txt b/merlin/examples/workflows/feature_demo/requirements.txt
@@ -1,2 +1,3 @@
 scikit-learn
-merlin-spellbook
+merlin-spellbook; python_version < "3.12"
+merlin-spellbook>=0.9.0; python_version >= "3.12"
diff --git a/merlin/examples/workflows/optimization/requirements.txt b/merlin/examples/workflows/optimization/requirements.txt
@@ -1,4 +1,5 @@
-merlin-spellbook
+merlin-spellbook; python_version < "3.12"
+merlin-spellbook>=0.9.0; python_version >= "3.12"
 numpy
 scikit-learn
 matplotlib

diff --git a/merlin/examples/workflows/remote_feature_demo/requirements.txt b/merlin/examples/workflows/remote_feature_demo/requirements.txt
@@ -1,2 +1,3 @@
 scikit-learn
-merlin-spellbook
+merlin-spellbook; python_version < "3.12"
+merlin-spellbook>=0.9.0; python_version >= "3.12"
diff --git a/merlin/router.py b/merlin/router.py
@@ -38,6 +38,7 @@
 import logging
 import os
 import time
+from importlib import resources
 from typing import Dict, List, Tuple
 
 from merlin.exceptions import NoWorkersException
@@ -57,12 +58,6 @@
 )
 
 
-try:
-    from importlib import resources
-except ImportError:
-    import importlib_resources as resources
-
-
 LOG = logging.getLogger(__name__)
 
 # TODO go through this file and find a way to make a common return format to main.py

diff --git a/setup.py b/setup.py
@@ -96,11 +96,12 @@ def extras_require():
     long_description=readme(),
     long_description_content_type="text/markdown",
     classifiers=[
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
     ],
     keywords="machine learning workflow",
     url="https://github.com/LLNL/merlin",

diff --git a/tests/fixture_types.py b/tests/fixture_types.py
@@ -50,7 +50,7 @@
     FixtureStr = Annotated[str, pytest.fixture]
     FixtureTuple = Annotated[Tuple[K, V], pytest.fixture]
 else:
-    # Fallback for Python 3.7 and 3.8
+    # Fallback for Python 3.8
     class FixtureDict(Generic[K, V], Dict[K, V]):
         """
         This class is necessary to allow FixtureDict to be subscriptable