Skip to content

Commit 62d7c96

Browse files
[SCSB-145] require Python 3.10 (spacetelescope#330)
1 parent 26c0b37 commit 62d7c96

File tree

3 files changed

+62
-66
lines changed

3 files changed

+62
-66
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ jobs:
2020
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
2121
with:
2222
envs: |
23-
- linux: py39-oldestdeps-cov
23+
- linux: py310-oldestdeps-cov
2424
coverage: codecov
25-
- linux: py39
2625
- linux: py310
2726
- linux: py311
2827
- macos: py311
2928
- linux: py311-cov
3029
coverage: codecov
30+
- linux: py312
3131
test_upstream:
3232
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
3333
with:

.github/workflows/ci_cron.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,5 @@ jobs:
2020
if: (github.repository == 'spacetelescope/roman_datamodels' && (github.event_name == 'schedule' || github.event_name == 'push' || github.event_name == 'workflow_dispatch' || contains(github.event.pull_request.labels.*.name, 'Weekly CI')))
2121
with:
2222
envs: |
23-
- macos: py39
2423
- macos: py310
2524
- linux: py312-devdeps

pyproject.toml

Lines changed: 60 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,83 @@
11
[project]
2-
name = 'roman_datamodels'
3-
description = 'data models supporting calibration of the Nancy Grace Roman Space Telescope'
4-
readme = 'README.md'
5-
requires-python = '>=3.9'
6-
license = { file = 'LICENSE' }
7-
authors = [{ name = 'STScI', email = 'help@stsci.edu' }]
2+
name = "roman_datamodels"
3+
description = "data models supporting calibration of the Nancy Grace Roman Space Telescope"
4+
readme = "README.md"
5+
requires-python = ">=3.10"
6+
authors = [
7+
{ name = "STScI", email = "help@stsci.edu" },
8+
]
89
classifiers = [
9-
'Intended Audience :: Science/Research',
10-
'Topic :: Scientific/Engineering :: Astronomy',
11-
'License :: OSI Approved :: BSD License',
12-
'Programming Language :: Python :: 3',
10+
"Intended Audience :: Science/Research",
11+
"Topic :: Scientific/Engineering :: Astronomy",
12+
"License :: OSI Approved :: BSD License",
13+
"Programming Language :: Python :: 3",
1314
]
1415
dependencies = [
15-
'asdf >=2.15.0',
16-
'asdf-astropy >=0.5.0',
17-
'gwcs >=0.18.1',
18-
'numpy >=1.22',
19-
'astropy >=5.3.0',
20-
# 'rad >=0.18.0',
21-
'rad @ git+https://github.com/spacetelescope/rad.git',
22-
'asdf-standard >=1.0.3',
16+
"asdf >=2.15.0",
17+
"asdf-astropy >=0.5.0",
18+
"gwcs >=0.18.1",
19+
"numpy >=1.22",
20+
"astropy >=5.3.0",
21+
"rad @ git+https://github.com/spacetelescope/rad.git",
22+
"asdf-standard >=1.0.3",
23+
]
24+
dynamic = [
25+
"version",
2326
]
24-
dynamic = ['version']
27+
28+
[project.license]
29+
file = "LICENSE"
2530

2631
[project.optional-dependencies]
2732
test = [
28-
'pytest >=6.0.0',
29-
'pytest-doctestplus',
30-
'pytest-doctestplus >=0.10.0',
31-
'pytest-env >= 0.8'
33+
"pytest >=6.0.0",
34+
"pytest-doctestplus",
35+
"pytest-doctestplus >=0.10.0",
36+
"pytest-env >= 0.8",
3237
]
3338
aws = [
34-
'stsci-aws-utils >= 0.1.2',
39+
"stsci-aws-utils >= 0.1.2",
3540
]
3641
docs = [
37-
'sphinx',
38-
'sphinx-automodapi',
39-
'sphinx-rtd-theme',
40-
'sphinx-astropy',
41-
'tomli; python_version <"3.11"',
42+
"sphinx",
43+
"sphinx-automodapi",
44+
"sphinx-rtd-theme",
45+
"sphinx-astropy",
46+
"tomli; python_version <\"3.11\"",
4247
]
4348

4449
[project.urls]
45-
'issues' = 'https://github.com/spacetelescope/roman_datamodels/issues'
46-
'repository' = 'https://github.com/spacetelescope/roman_datamodels'
50+
issues = "https://github.com/spacetelescope/roman_datamodels/issues"
51+
repository = "https://github.com/spacetelescope/roman_datamodels"
4752

48-
[project.entry-points]
49-
'asdf.extensions' = { roman_datamodels = 'roman_datamodels.stnode._integration:get_extensions' }
53+
[project.entry-points."asdf.extensions"]
54+
roman_datamodels = "roman_datamodels.stnode._integration:get_extensions"
5055

5156
[build-system]
52-
requires = ["setuptools >=61", "setuptools_scm[toml] >=3.4", "wheel"]
57+
requires = [
58+
"setuptools >=61",
59+
"setuptools_scm[toml] >=3.4",
60+
"wheel",
61+
]
5362
build-backend = "setuptools.build_meta"
5463

5564
[tool.setuptools_scm]
5665
write_to = "src/roman_datamodels/_version.py"
5766

5867
[tool.setuptools.packages.find]
59-
where = ['src']
68+
where = [
69+
"src",
70+
]
6071

6172
[tool.pytest.ini_options]
6273
minversion = 4.6
6374
doctest_plus = true
6475
doctest_rst = true
65-
text_file_format = 'rst'
66-
addopts = '--color=yes --doctest-rst'
67-
testpaths = ['tests']
76+
text_file_format = "rst"
77+
addopts = "--color=yes --doctest-rst"
78+
testpaths = [
79+
"tests",
80+
]
6881
filterwarnings = [
6982
"error",
7083
"ignore:numpy.ndarray size changed:RuntimeWarning",
@@ -76,18 +89,13 @@ env = [
7689

7790
[tool.coverage.report]
7891
exclude_lines = [
79-
# Have to re-enable the standard pragma
80-
'pragma: no cover',
81-
# Don't complain about packages we have installed
82-
'except ImportError',
83-
# Don't complain if tests don't hit assertions
84-
'raise AssertionError',
85-
'raise NotImplementedError',
86-
# Don't complain about script hooks
87-
'def main\(.*\):',
88-
'if __name__ == \(.*\):',
89-
# Don't complain if non-runnable code isn't run
90-
'pass\n',
92+
"pragma: no cover",
93+
"except ImportError",
94+
"raise AssertionError",
95+
"raise NotImplementedError",
96+
"def main\\(.*\\):",
97+
"if __name__ == \\(.*\\):",
98+
"pass\\n",
9199
]
92100

93101
[tool.isort]
@@ -97,21 +105,10 @@ line_length = 130
97105

98106
[tool.black]
99107
line-length = 130
100-
force-exclude = '''
101-
^/(
102-
(
103-
\.eggs
104-
| \.git
105-
| \.pytest_cache
106-
| \.tox
107-
)/
108-
)
109-
'''
108+
force-exclude = "^/(\n (\n \\.eggs\n | \\.git\n | \\.pytest_cache\n | \\.tox\n )/\n)\n"
110109

111110
[tool.ruff]
112111
line-length = 130
113112

114113
[tool.codespell]
115-
skip="*.pdf,*.fits,*.asdf,.tox,build,./tags,.git,docs/_build"
116-
# ignore-words-list="""
117-
# """
114+
skip = "*.pdf,*.fits,*.asdf,.tox,build,./tags,.git,docs/_build"

0 commit comments

Comments
 (0)