From 607e35bcc784a095e19d6f72b34e7a3d93419592 Mon Sep 17 00:00:00 2001 From: zacharyburnett Date: Thu, 14 Mar 2024 14:13:23 -0400 Subject: [PATCH 1/4] require Python 3.10 --- pyproject.toml | 45 +++++++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index c07a0438..6f265f3a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,25 +1,35 @@ [build-system] -requires = ["setuptools >= 61.2", - "setuptools_scm[toml]>=7.1"] -build-backend = 'setuptools.build_meta' +requires = [ + "setuptools >= 61.2", + "setuptools_scm[toml]>=7.1", +] +build-backend = "setuptools.build_meta" [project] name = "poppy" description = "Physical optics propagation (wavefront diffraction) for optical simulations, particularly of telescopes." -authors = [{name = "Marshall Perrin", email = "mperrin@stsci.edu"}] -license = {text = "BSD-3-Clause"} -requires-python = ">=3.9" +authors = [ + { name = "Marshall Perrin", email = "mperrin@stsci.edu" }, +] +requires-python = ">=3.10" dependencies = [ "numpy>=1.20.0", "scipy>=1.5.0", "matplotlib>=3.2.0", "astropy>=5.1.0", ] -dynamic = ["version"] +dynamic = [ + "version", +] readme = "README.rst" +[project.license] +text = "BSD-3-Clause" + [project.optional-dependencies] -all = ["synphot"] +all = [ + "synphot", +] test = [ "pytest", "pytest-astropy", @@ -55,19 +65,26 @@ addopts = "-p no:warnings" zip-safe = false include-package-data = false -[tool.setuptools.packages] -find = {namespaces = false} +[tool.setuptools.packages.find] +namespaces = false [tool.setuptools.package-data] -"*" = ["*.fits", "*.csv"] -"poppy.tests" = ["data/*"] +"*" = [ + "*.fits", + "*.csv", +] +"poppy.tests" = [ + "data/*", +] [tool.setuptools_scm] write_to = "poppy/version.py" write_to_template = "__version__ = '{version}'\n" [tool.coverage.run] -source = ["poppy",] +source = [ + "poppy", +] omit = [ "poppy/conftest*", "poppy/cython_version*", @@ -117,4 +134,4 @@ omit = [ "*/poppy/*/tests/*", "*/poppy/*/*/tests/*", "*/poppy/version*", -] \ No newline at end of file +] From be6bb8ef7a610abb60a8b69f03ea2ee8d3eb8020 Mon Sep 17 00:00:00 2001 From: zacharyburnett Date: Fri, 15 Mar 2024 10:40:05 -0400 Subject: [PATCH 2/4] update references to Python 3.9 --- .github/workflows/ci_workflows.yml | 4 ++-- poppy/__init__.py | 2 +- readthedocs.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci_workflows.yml b/.github/workflows/ci_workflows.yml index b60654b1..8d6c62dc 100644 --- a/.github/workflows/ci_workflows.yml +++ b/.github/workflows/ci_workflows.yml @@ -41,8 +41,8 @@ jobs: - name: Try minimum supported versions os: ubuntu-latest - python: '3.9' - toxenv: py39-legacy-test + python: '3.10' + toxenv: py310-legacy-test steps: - name: Checkout code diff --git a/poppy/__init__.py b/poppy/__init__.py index 415d3607..0a3163e6 100644 --- a/poppy/__init__.py +++ b/poppy/__init__.py @@ -23,7 +23,7 @@ except ImportError: __version__ = "" -__minimum_python_version__ = "3.9" +__minimum_python_version__ = "3.10" class UnsupportedPythonError(Exception): diff --git a/readthedocs.yml b/readthedocs.yml index 891d88fb..3a5f0788 100644 --- a/readthedocs.yml +++ b/readthedocs.yml @@ -9,7 +9,7 @@ version: 2 build: os: ubuntu-22.04 tools: - python: "3.9" + python: "3.11" # Build documentation in the docs/ directory with Sphinx sphinx: @@ -26,4 +26,4 @@ python: - method: pip path: . extra_requirements: - - docs \ No newline at end of file + - docs From 1c920a8d730d74f5396b62092a47b3ecf7ed1862 Mon Sep 17 00:00:00 2001 From: zacharyburnett Date: Fri, 15 Mar 2024 13:17:42 -0400 Subject: [PATCH 3/4] update references to Python 3.9 --- docs/installation.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation.rst b/docs/installation.rst index 10df1352..14019a81 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -17,7 +17,7 @@ POPPY may be installed one of two different ways. Requirements -------------- -* Python 3.9, or more recent. +* Python 3.10, or more recent. * The standard Python scientific stack: :py:mod:`numpy`, :py:mod:`scipy`, :py:mod:`matplotlib` * POPPY relies upon the `astropy From ca4d673deb6da74dabf22f65952ab24a00cc5c2f Mon Sep 17 00:00:00 2001 From: zacharyburnett Date: Fri, 15 Mar 2024 13:18:38 -0400 Subject: [PATCH 4/4] use oldest-supported-numpy --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index ddd009b1..cf1f51f1 100644 --- a/tox.ini +++ b/tox.ini @@ -16,7 +16,7 @@ deps= cov: pytest-astropy cov: pytest-cov syn: synphot - legacy: numpy==1.20.0 + legacy: oldest-supported-numpy legacy: astropy==5.1.0 legacy: scipy==1.10.1 latest: -rrequirements.txt