From f7087dae2b813da56edfdcf2ae3aae78391ad01f Mon Sep 17 00:00:00 2001 From: Zach Burnett Date: Fri, 14 Apr 2023 11:49:55 -0400 Subject: [PATCH 1/5] drop support for Python 3.8 --- .readthedocs.yaml | 6 +++++- pyproject.toml | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 373eaa4a..a3e380c0 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -7,9 +7,13 @@ sphinx: configuration: docs/conf.py fail_on_warning: true +build: + os: ubuntu-22.04 + tools: + python: "3.11" + # Set the version of Python and requirements required to build your docs python: - version: 3.8 install: - method: pip path: . diff --git a/pyproject.toml b/pyproject.toml index 3e02d7f9..2296e959 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [project] name = "gwcs" description = "Generalized World Coordinate System" -requires-python = ">=3.8" +requires-python = ">=3.9" authors = [ { name = "gwcs developers", email = "help@stsci.edu" }, ] From 27660e67148fcfabf496055e5dd814b770ff1a6e Mon Sep 17 00:00:00 2001 From: Zach Burnett Date: Fri, 14 Apr 2023 13:35:37 -0400 Subject: [PATCH 2/5] use Mamba and install graphviz --- .readthedocs.yaml | 6 +++++- docs/rtd_environment.yaml | 8 ++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 docs/rtd_environment.yaml diff --git a/.readthedocs.yaml b/.readthedocs.yaml index a3e380c0..2ec342f8 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -10,10 +10,14 @@ sphinx: build: os: ubuntu-22.04 tools: - python: "3.11" + python: mambaforge-4.10 + +conda: + environment: docs/rtd_environment.yaml # Set the version of Python and requirements required to build your docs python: + system_packages: false install: - method: pip path: . diff --git a/docs/rtd_environment.yaml b/docs/rtd_environment.yaml new file mode 100644 index 00000000..f0fee16e --- /dev/null +++ b/docs/rtd_environment.yaml @@ -0,0 +1,8 @@ +name: rtd311 +channels: + - conda-forge + - defaults +dependencies: + - python=3.11 + - pip + - graphviz From 726b952d2464224f4f72b0fdd5f20ec16adaf710 Mon Sep 17 00:00:00 2001 From: Zach Burnett Date: Thu, 4 May 2023 13:42:24 -0400 Subject: [PATCH 3/5] fix import error --- docs/conf.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 84259845..73f5592b 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -29,7 +29,11 @@ from datetime import datetime from pathlib import Path -import tomli +try: + import tomllib +except ImportError: + import tomli as tomllib + from pkg_resources import get_distribution try: @@ -69,7 +73,7 @@ # This does not *have* to match the package name, but typically does with open(Path(__file__).parent.parent / "pyproject.toml", "rb") as metadata_file: - configuration = tomli.load(metadata_file) + configuration = tomllib.load(metadata_file) metadata = configuration['project'] project = metadata['name'] author = metadata["authors"][0]["name"] From 0baac3ef824c785708de954ff472e3b19851dbce Mon Sep 17 00:00:00 2001 From: Zach Burnett Date: Thu, 4 May 2023 13:43:01 -0400 Subject: [PATCH 4/5] remove uppser pin on Scipy --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 2296e959..7873249a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ dependencies = [ "asdf >= 2.8.1", "astropy >= 5.1", "numpy", - "scipy < 1.10.0", + "scipy", "asdf_wcs_schemas", "asdf-astropy >= 0.2.0", ] From 4f862210c3475835ee19bfdcf5ff4031eaebcd15 Mon Sep 17 00:00:00 2001 From: Zach Burnett Date: Thu, 4 May 2023 13:45:19 -0400 Subject: [PATCH 5/5] remove 3.8 toxenvs --- .github/workflows/ci.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b9e73bc2..b43e08c8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,7 +40,7 @@ jobs: fail-fast: false matrix: toxenv: [ test ] - python-version: [ '3.8', '3.9', '3.10', '3.11' ] + python-version: [ '3.9', '3.10', '3.11' ] os: [ ubuntu-latest, macos-latest ] include: - toxenv: test-dev @@ -67,15 +67,6 @@ jobs: - toxenv: test-numpy120 os: ubuntu-latest python-version: '3.9' - - toxenv: test-numpy122 - os: ubuntu-latest - python-version: '3.8' - - toxenv: test-numpy121 - os: ubuntu-latest - python-version: '3.8' - - toxenv: test-numpy120 - os: ubuntu-latest - python-version: '3.8' - toxenv: test-jwst-xdist os: ubuntu-latest python-version: '3.x'