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

Remove Python 3.6 #498

Merged
merged 4 commits into from
Nov 18, 2021
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
12 changes: 6 additions & 6 deletions .github/workflows/ci_workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ jobs:

- name: Coverage test in Python 3
os: ubuntu-latest
python: 3.8
toxenv: py38-poppydev-pysiafdev-cov
python: 3.9
toxenv: py39-poppydev-pysiafdev-cov

- name: Check for Sphinx doc build errors
os: ubuntu-latest
Expand All @@ -28,13 +28,13 @@ jobs:

- name: Try latest versions of all dependencies
os: ubuntu-latest
python: 3.8
toxenv: py38-latest-test
python: 3.9
toxenv: py39-latest-test

- name: Try minimum supported versions
os: ubuntu-latest
python: 3.6
toxenv: py36-legacy36-test
python: 3.7
toxenv: py37-legacy37-test

- name: Try released POPPY and PySIAF
os: ubuntu-latest
Expand Down
10 changes: 5 additions & 5 deletions docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Requirements & Installation
===========================

.. note::
.. note::

This is entirely optional, but you may wish to sign up to the mailing list ``[email protected]``. This is a very low-traffic moderated announce-only list, to which we will periodically post announcements of updates to this software.

Expand Down Expand Up @@ -73,7 +73,7 @@ Stsynphot is an optional dependency, but is highly recommended. Stsynphot is be
Installing the Required Data Files
----------------------------------

*If you install via pip or manually*, you must install the data files yourself. If you install via Conda, the data files are automatically installed, in which case you can skip this section.
*If you install via pip or manually*, you must install the data files yourself. If you install via Conda, the data files are automatically installed, in which case you can skip this section.

Files containing such information as the JWST pupil shape, instrument throughputs, and aperture positions are distributed separately from WebbPSF. To run WebbPSF, you must download these files and tell WebbPSF where to find them using the ``WEBBPSF_PATH`` environment variable.

Expand All @@ -92,7 +92,7 @@ You should now be able to successfully ``import webbpsf`` in a Python session.
If you have previously installed the data files for an earlier version of WebbPSF, and then update to a newer version, the
software may prompt you that you must download and install a new updated version of the data files.

.. Note::
.. Note::

**For STScI Users Only:** Users at STScI may access the required data files from the Central Storage network. Set the following environment variables in your ``bash`` shell. (You will probably want to add this to your ``.bashrc``.) ::

Expand All @@ -105,7 +105,7 @@ Software Requirements

See `the environment.yml specification file <https://github.com/spacetelescope/webbpsf/blob/develop/environment.yml>`_ for the required package dependencies.

**Required Python version**: WebbPSF 0.9.1 and above require Python 3.6 or higher.
**Required Python version**: WebbPSF 1.0 and above require Python 3.7 or higher.

The major dependencies are the standard `NumPy, SciPy <http://www.scipy.org/scipylib/download.html>`_, `matplotlib <http://matplotlib.org>`_ stack, and `Astropy <http://astropy.org>`_

Expand All @@ -119,7 +119,7 @@ The major dependencies are the standard `NumPy, SciPy <http://www.scipy.org/scip
**Optional Python packages**:

Some calculations with POPPY can benefit from the optional packages `psutil <https://pypi.python.org/pypi/psutil>`_ and `pyFFTW <https://pypi.python.org/pypi/pyFFTW>`_, but these are not needed in general. See `the POPPY installation docs <http://poppy-optics.readthedocs.io/en/stable/installation.html>`_ for more details.
These optional packages are only worth adding for speed improvements if you are spending substantial time running calculations.
These optional packages are only worth adding for speed improvements if you are spending substantial time running calculations.

Additional packages are needed for the optional use of GPUs to accelerate calculations. See the POPPY documentation.

Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
astropy==4.3.1
ipython==7.29.0
matplotlib==3.4.3
numpy==1.21.3
numpy==1.21.4
photutils==1.2.0
poppy>=0.9.1
pysiaf==0.13.0
scipy==1.7.1
scipy==1.7.1
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ install_requires =
photutils>=0.6.0
poppy>=0.9.1
pysiaf>=0.9.0
python_requires = >=3.6
python_requires = >=3.7
setup_requires = setuptools_scm

[options.extras_require]
Expand Down
18 changes: 10 additions & 8 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
[tox]
envlist =
py{36,37,38}-test
py{36,37,38}-{poppydev,pysiafdev,astropydev,latest,stable}-test
py36-legacy36-test
py{36,37,38}-{poppydev,pysiafdev}-cov
py{37,38,39}-test
py{37,38,39}-{poppydev,pysiafdev,astropydev,latest,stable}-test
py37-legacy37-test
py{37,38,39}-{poppydev,pysiafdev}-cov

[testenv]
passenv = *
deps =
pytest
poppydev,legacy36,astropydev,latest: git+https://github.com/spacetelescope/poppy.git#egg=poppy
pysiafdev,legacy36,astropydev: git+https://github.com/spacetelescope/pysiaf.git#egg=pysiaf
legacy36: numpy==1.17.*
poppydev,legacy37,astropydev,latest: git+https://github.com/spacetelescope/poppy.git#egg=poppy
pysiafdev,astropydev: git+https://github.com/spacetelescope/pysiaf.git#egg=pysiaf
legacy37: numpy==1.17.0
legacy37: pysiaf==0.9.0
legacy37: astropy==4.0.0
astropydev: git+git://github.com/astropy/astropy
poppydev: synphot
latest: -rrequirements.txt
Expand Down Expand Up @@ -56,4 +58,4 @@ description = check package code style
deps =
pycodestyle
commands =
pycodestyle webbpsf
pycodestyle webbpsf
2 changes: 1 addition & 1 deletion webbpsf/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
except ImportError:
__version__ = ''

__minimum_python_version__ = "3.6"
__minimum_python_version__ = "3.7"


class UnsupportedPythonError(Exception):
Expand Down