Skip to content

Commit

Permalink
MNT: Bump minimum Python to 3.7 (Closes Unidata#1546)
Browse files Browse the repository at this point in the history
  • Loading branch information
dopplershift committed Apr 30, 2021
1 parent 879fdf7 commit b37a674
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 24 deletions.
9 changes: 2 additions & 7 deletions .github/workflows/docs-conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
#
# Build our docs on macOS and Windows on Python 3.6 and 3.7, respectively.
# Build our docs on macOS and Windows on Python 3.8 and 3.7, respectively.
#
Docs:
name: ${{ matrix.os }} ${{ matrix.python-version }}
Expand All @@ -19,7 +19,7 @@ jobs:
fail-fast: false
matrix:
include:
- python-version: 3.6
- python-version: 3.8
os: macOS
- python-version: 3.7
os: Windows
Expand Down Expand Up @@ -55,11 +55,6 @@ jobs:
# Needed for caching
use-only-tar-bz2: true

# TODO: Remove this when we drop Python 3.6
- name: Adjust traitlets dependency for Python 3.6
if: ${{ matrix.python-version == 3.6 }}
run: sed -e "s/traitlets==.*/traitlets==4.3.3/" -i.bak ci/requirements.txt

# TODO: Remove this when scipy>1.5.3 is available on conda-forge
- name: Adjust scipy dependency for Conda
run: sed -e "s/scipy==.*/scipy==1.5.3/" -i.bak ci/requirements.txt
Expand Down
9 changes: 2 additions & 7 deletions .github/workflows/tests-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: [3.7, 3.8, 3.9]
dep-versions: [requirements.txt]
no-extras: ['']
include:
- python-version: 3.6
- python-version: 3.7
dep-versions: Minimum
no-extras: ''
- python-version: 3.9
Expand Down Expand Up @@ -63,11 +63,6 @@ jobs:
pip-tests-${{ runner.os }}-
pip-tests-
# TODO: Remove this when we drop Python 3.6
- name: Adjust traitlets dependency for Python 3.6
if: ${{ matrix.python-version == 3.6 }}
run: sed -e "s/traitlets==.*/traitlets==4.3.3/" -i.bak ci/requirements.txt

- name: Add extras to requirements
if: ${{ matrix.no-extras != 'No Extras' }}
run: cat ci/extra_requirements.txt >> ci/test_requirements.txt
Expand Down
6 changes: 1 addition & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,7 @@ on a future ``1.x`` version.
For additional MetPy examples not included in this repository, please see the [Unidata Python
Gallery](https://unidata.github.io/python-gallery/).

We support Python >= 3.6.

0.12 is the first version to drop support for Python 2.7 in Fall 2019. See
[here](https://github.com/Unidata/MetPy/blob/main/docs/installguide.rst) for more
information.
We support Python >= 3.7.

Need Help?
----------
Expand Down
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ MetPy
=====

MetPy is a collection of tools in Python for reading, visualizing, and performing calculations
with weather data. MetPy supports Python >= 3.6 and is freely available under a permissive
with weather data. MetPy supports Python >= 3.7 and is freely available under a permissive
`open source license <https://github.com/Unidata/MetPy/blob/main/LICENSE>`_.

If you're new to MetPy, check out our :doc:`Getting Started <userguide/startingguide>` guide.
Expand Down
2 changes: 1 addition & 1 deletion docs/userguide/installguide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Requirements
------------
In general, MetPy tries to support minor versions of dependencies released within the last two
years. For Python itself, that generally means supporting the last two minor releases; MetPy
currently supports Python >= 3.6.
currently supports Python >= 3.7.

* matplotlib >= 2.1.0
* numpy >= 1.16.0
Expand Down
3 changes: 1 addition & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ classifiers =
Development Status :: 5 - Production/Stable
Framework :: Matplotlib
Programming Language :: Python
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Expand All @@ -38,7 +37,7 @@ package_dir =
packages = find:
include_package_data = True
setup_requires = setuptools_scm
python_requires = >=3.6
python_requires = >=3.7
install_requires =
importlib_metadata>=1.0.0; python_version < '3.8'
importlib_resources>=1.3.0; python_version < '3.9'
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

if sys.version_info[0] < 3:
error = """
MetPy v0.12 and greater requires the Python 3.6 or above.
MetPy v1.1 and greater requires Python 3.7 or above.
If you're using Python 2.7, please install MetPy v0.11.1,
which is the last release of MetPy that supports Python 2.7,
but it is no longer maintained.
Expand Down

0 comments on commit b37a674

Please sign in to comment.