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.

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

[SCSB-145] require Python 3.10 #612

Merged
merged 4 commits into from
Mar 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/ci_workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion poppy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
except ImportError:
__version__ = ""

__minimum_python_version__ = "3.9"
__minimum_python_version__ = "3.10"


class UnsupportedPythonError(Exception):
Expand Down
45 changes: 31 additions & 14 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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*",
Expand Down Expand Up @@ -117,4 +134,4 @@ omit = [
"*/poppy/*/tests/*",
"*/poppy/*/*/tests/*",
"*/poppy/version*",
]
]
4 changes: 2 additions & 2 deletions readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -26,4 +26,4 @@ python:
- method: pip
path: .
extra_requirements:
- docs
- docs
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ deps=
cov: pytest-astropy
cov: pytest-cov
syn: synphot
legacy: numpy==1.20.0
legacy: oldest-supported-numpy
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool! Had no idea that meta-package existed. Thanks!

legacy: astropy==5.1.0
legacy: scipy==1.10.1
latest: -rrequirements.txt
Expand Down
Loading