Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

drop python 3.9 #287

Merged
merged 5 commits into from
Mar 19, 2024
Merged

drop python 3.9 #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a6edac0
drop python 3.9
braingram Mar 18, 2024
790ddb0
add changelog
braingram Mar 18, 2024
82c8fc8
remove out-of-date python version checks
braingram Mar 18, 2024
55eef19
importlib_resources to importlib.resources
braingram Mar 18, 2024
7a7d955
remove unused sys import
braingram Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ jobs:
cache-path: ${{ needs.data.outputs.crds_path }}
cache-key: crds-${{ needs.data.outputs.crds_context }}
envs: |
- linux: py39-xdist
- linux: py310-xdist
- macos: py311-xdist
- linux: py311-cov-xdist
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/ci_cron.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,7 @@ jobs:
cache-path: ${{ needs.data.outputs.crds_path }}
cache-key: crds-${{ needs.data.outputs.crds_context }}
envs: |
- macos: py39-xdist
- windows: py39-xdist
- macos: py310-xdist
- windows: py310-xdist
- macos: py311-xdist
- windows: py311-xdist
- windows: py3-xdist
2 changes: 2 additions & 0 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@

- Fix datamodel schema ids for abvegaoffset, keyword_lampmode, nrsfs_apcorr [#258]

- Drop support for python 3.9 [#287]


1.10.0 (2024-02-29)
===================
Expand Down
3 changes: 1 addition & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[project]
name = "stdatamodels"
description = "Core support for DataModel classes used in calibration pipelines"
requires-python = ">=3.9"
requires-python = ">=3.10"
authors = [
{ name = "STScI" },
]
Expand Down Expand Up @@ -51,7 +51,6 @@ test = [
"pytest-doctestplus",
"crds>=11.16.14",
"scipy>=1.5",
"importlib_resources; python_version < '3.10'"
]
docs = [
"sphinx",
Expand Down
9 changes: 2 additions & 7 deletions src/stdatamodels/jwst/datamodels/integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,7 @@
This module supports the entry points for ASDF support for the `jwst.datamodels`.
"""

import sys

if sys.version_info < (3, 9):
import importlib_resources
else:
import importlib.resources as importlib_resources
import importlib.resources


from asdf.resource import DirectoryResourceMapping
Expand All @@ -26,7 +21,7 @@ def get_resource_mappings():
list of the `asdf.resource.ResourceMapping` instances containing the `jwst.datamodels`
schemas.
"""
resources_root = importlib_resources.files(datamodels)
resources_root = importlib.resources.files(datamodels)
if not resources_root.is_dir():
raise RuntimeError(f"Missing resources directory: {resources_root=}")

Expand Down
15 changes: 5 additions & 10 deletions src/stdatamodels/jwst/datamodels/tests/test_integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,21 @@
import sys

if sys.version_info < (3, 10):
import importlib_resources
else:
import importlib.resources as importlib_resources
import importlib.resources

import asdf
import pytest
import yaml


METASCHEMAS = list(
importlib_resources.files("stdatamodels.jwst.datamodels.metaschema").glob("*.yaml")
importlib.resources.files("stdatamodels.jwst.datamodels.metaschema").glob("*.yaml")
)

DATAMODEL_SCHEMAS = list(
importlib_resources.files("stdatamodels.jwst.datamodels.schemas").glob("*.yaml")
importlib.resources.files("stdatamodels.jwst.datamodels.schemas").glob("*.yaml")
)
# transform schemas are nested in a directory with a '.'
TRANSFORM_SCHEMAS = list(
next(
importlib_resources.files(
importlib.resources.files(
"stdatamodels.jwst.transforms.resources.schemas"
).iterdir()
).glob("**/*.yaml")
Expand All @@ -29,7 +24,7 @@
SCHEMAS = METASCHEMAS + DATAMODEL_SCHEMAS + TRANSFORM_SCHEMAS

TRANSFORM_MANIFESTS = list(
importlib_resources.files("stdatamodels.jwst.transforms.resources.manifests").glob(
importlib.resources.files("stdatamodels.jwst.transforms.resources.manifests").glob(
"*.yaml"
)
)
Expand Down
9 changes: 2 additions & 7 deletions src/stdatamodels/jwst/transforms/integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,7 @@
This module supports the entry points for ASDF support for the `jwst.transforms`.
"""

import sys

if sys.version_info < (3, 9):
import importlib_resources
else:
import importlib.resources as importlib_resources
import importlib.resources


from asdf.resource import DirectoryResourceMapping
Expand All @@ -26,7 +21,7 @@ def get_resource_mappings():
list of the `asdf.resource.ResourceMapping` instances containing the `jwst.transforms`
schemas.
"""
resources_root = importlib_resources.files(transforms) / "resources"
resources_root = importlib.resources.files(transforms) / "resources"
if not resources_root.is_dir():
raise RuntimeError(f"Missing resources directory: {resources_root=}")

Expand Down
Loading