diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index 08169711b..c9b4d46f5 100644 --- a/.github/workflows/windows-ci.yml +++ b/.github/workflows/windows-ci.yml @@ -6,15 +6,15 @@ jobs: strategy: matrix: include: - - python_version: 3.7 + - python_version: 3.9 numpy_version: numpy tf_version: tensorflow nengo_version: nengo[tests] - - python_version: 3.8 + - python_version: 3.10 numpy_version: numpy tf_version: tensorflow --pre nengo_version: git+https://github.com/nengo/nengo.git#egg=nengo[tests] - - python_version: 3.6 + - python_version: 3.7 numpy_version: numpy==1.16.0 tf_version: tensorflow==2.2.0 nengo_version: nengo[tests]==3.0.0 diff --git a/.nengobones.yml b/.nengobones.yml index f42ef48fb..582f38bbb 100644 --- a/.nengobones.yml +++ b/.nengobones.yml @@ -6,6 +6,8 @@ description: Deep learning integration for Nengo copyright_start: 2015 license: abr-free +min_python: "3.7" + license_rst: {} contributing_rst: {} @@ -238,7 +240,7 @@ ci_scripts: - template: deploy travis_yml: - python: 3.7 + python: "3.9" global_vars: NUMPY_VERSION: numpy>=1.16.0 TF_VERSION: tensorflow @@ -258,13 +260,13 @@ travis_yml: NENGO_VERSION: git+https://github.com/nengo/nengo.git#egg=nengo[tests] SCIPY_VERSION: scipy dist: bionic - python: 3.8 + python: "3.10" - script: test-coverage env: NENGO_VERSION: nengo[tests]==3.0.0 TF_VERSION: tensorflow==2.2.0 NUMPY_VERSION: numpy==1.16.0 - python: 3.6 + python: "3.7" - script: test-coverage test_args: --graph-mode - stage: advanced @@ -323,9 +325,10 @@ setup_py: - "Operating System :: Microsoft :: Windows" - "Operating System :: POSIX :: Linux" - "Programming Language :: Python" - - "Programming Language :: Python :: 3.6" - "Programming Language :: Python :: 3.7" - "Programming Language :: Python :: 3.8" + - "Programming Language :: Python :: 3.9" + - "Programming Language :: Python :: 3.10" - "Topic :: Scientific/Engineering" - "Topic :: Scientific/Engineering :: Artificial Intelligence" @@ -339,6 +342,6 @@ pre_commit_config_yaml: version_py: major: 3 - minor: 4 - patch: 5 + minor: 5 + patch: 0 release: false diff --git a/.travis.yml b/.travis.yml index 5c14772f9..81fcf9a57 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ # Automatically generated by nengo-bones, do not edit this file directly language: python -python: 3.7 +python: 3.9 notifications: email: on_success: change @@ -48,14 +48,14 @@ jobs: SCIPY_VERSION="scipy" SCRIPT="test-coverage" dist: bionic - python: 3.8 + python: 3.10 - env: NENGO_VERSION="nengo[tests]==3.0.0" TF_VERSION="tensorflow==2.2.0" NUMPY_VERSION="numpy==1.16.0" SCRIPT="test-coverage" - python: 3.6 + python: 3.7 - env: SCRIPT="test-coverage" diff --git a/CHANGES.rst b/CHANGES.rst index 5c32d6f09..8793015b5 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -18,13 +18,23 @@ Release history - Deprecated - Removed -3.4.5 (unreleased) +3.5.0 (unreleased) ------------------ *Compatible with Nengo 3.0 - 3.2* *Compatible with TensorFlow 2.2 - 2.9* +**Added** + +- Added support for Python 3.9/3.10. (`#224`_) + +**Removed** + +- Dropped support for Python 3.7. (`#224`_) + +.. _#224: https://github.com/nengo/nengo-dl/pull/224 + 3.4.4 (February 10, 2022) ------------------------- diff --git a/docs/installation.rst b/docs/installation.rst index a6d748246..6060aea93 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -13,7 +13,7 @@ That's it! Requirements ------------ -NengoDL works with Python 3.6 or later. ``pip`` will do its best to install +NengoDL works with Python 3.7 or later. ``pip`` will do its best to install all of NengoDL's requirements when it installs NengoDL. However, if anything goes wrong during this process you can install the requirements manually and then try to ``pip install nengo-dl`` again. diff --git a/nengo_dl/tests/test_tensor_graph.py b/nengo_dl/tests/test_tensor_graph.py index 0af2bc405..595dc8d1f 100644 --- a/nengo_dl/tests/test_tensor_graph.py +++ b/nengo_dl/tests/test_tensor_graph.py @@ -565,9 +565,6 @@ class MyOp(dummies.Op): # pylint: disable=abstract-method tensor_graph.TensorGraph(model, None, None, None, None, None, None) -@pytest.mark.skipif( - sys.version_info < (3, 6, 0), reason="order is not deterministic in python<3.6" -) @pytest.mark.parametrize( "planner", ("greedy_planner", "tree_planner", "transitive_planner", "noop_planner") ) diff --git a/nengo_dl/version.py b/nengo_dl/version.py index 45f6bf67b..eb2a2b70e 100644 --- a/nengo_dl/version.py +++ b/nengo_dl/version.py @@ -10,7 +10,7 @@ a release version. Release versions are git tagged with the version. """ -version_info = (3, 4, 5) +version_info = (3, 5, 0) name = "nengo-dl" dev = 0 diff --git a/pyproject.toml b/pyproject.toml index eeeb4d223..d4dafb14a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ requires = ["setuptools", "wheel"] [tool.black] -target-version = ['py36'] +target-version = ['py37'] exclude = ''' ( '*/whitepaper2018_code.py' diff --git a/setup.py b/setup.py index b4e5f2eda..8ea970700 100755 --- a/setup.py +++ b/setup.py @@ -122,7 +122,7 @@ def read(*filenames, **kwargs): "optional": optional_req, "tests": tests_req, }, - python_requires=">=3.6", + python_requires=">=3.7", entry_points={ "nengo.backends": [ "dl = nengo_dl:Simulator", @@ -136,9 +136,10 @@ def read(*filenames, **kwargs): "Operating System :: Microsoft :: Windows", "Operating System :: POSIX :: Linux", "Programming Language :: Python", - "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", "Topic :: Scientific/Engineering", "Topic :: Scientific/Engineering :: Artificial Intelligence", ],