Skip to content

Commit

Permalink
Merge pull request #2317 from dopplershift/drop-3.7
Browse files Browse the repository at this point in the history
Drop Python 3.7
  • Loading branch information
dcamron authored Feb 2, 2022
2 parents 1f86451 + c860f83 commit 0a04ec5
Show file tree
Hide file tree
Showing 12 changed files with 13 additions and 28 deletions.
7 changes: 1 addition & 6 deletions .github/actions/install-conda/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,4 @@ runs:

- name: Install
shell: bash -l {0}
# For some reason on Windows 3.7 building the wheel fails to properly include our extra
# stuff. Executing the egg_info beforehand for some reason fixes it. No idea why. We're
# deep in territory where googling for answers helps not at all.
run: |
python setup.py egg_info
python -m pip install --no-deps .
run: python -m pip install --no-deps .
1 change: 0 additions & 1 deletion .github/actions/install-pypi/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ runs:
ci/${{ inputs.version-file }}
- name: Setup PROJ
if: ${{ inputs.need-cartopy == 'true' }}
uses: ./.github/actions/setup-proj

# This installs the stuff needed to build and install Shapely and CartoPy from source.
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/docs-conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ concurrency:
cancel-in-progress: true

jobs:
#
# Build our docs on macOS and Windows on Python 3.8 and 3.7, respectively.
#
Docs:
name: ${{ matrix.os }} ${{ matrix.python-version }}
runs-on: ${{ matrix.os }}-latest
Expand All @@ -25,7 +22,7 @@ jobs:
include:
- python-version: 3.8
os: macOS
- python-version: 3.7
- python-version: 3.9
os: Windows

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:
- name: Download doc build
uses: actions/download-artifact@v2
with:
name: Linux-3.9-docs
name: Linux-3.10-docs
path: ./docs/build/html

# This overrides the version "dev" with the proper version if we're building off a
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests-conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [3.7, 3.8, 3.9, '3.10']
python-version: [3.8, 3.9, '3.10']
os: [macOS, Windows]

steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tests-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [3.7, 3.8, 3.9, "3.10"]
python-version: [3.8, 3.9, '3.10']
dep-versions: [requirements.txt]
no-extras: ['']
include:
- python-version: 3.7
- python-version: 3.8
dep-versions: Minimum
no-extras: 'No Extras'
- python-version: 3.9
- python-version: '3.10'
dep-versions: requirements.txt
no-extras: 'No Extras'

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,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.7.
We support Python >= 3.8.

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.7 and is freely available under a permissive
with weather data. MetPy supports Python >= 3.8 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.7.
currently supports Python >= 3.8.

.. literalinclude:: ../../setup.cfg
:start-after: importlib_resources
Expand Down
6 changes: 2 additions & 4 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.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Expand All @@ -38,12 +37,11 @@ package_dir =
packages = find:
include_package_data = True
setup_requires = setuptools_scm
python_requires = >=3.7
python_requires = >=3.8
install_requires =
importlib_metadata>=1.0.0; python_version < '3.8'
importlib_resources>=1.3.0; python_version < '3.9'
matplotlib>=3.3.0
numpy>=1.17.0
numpy>=1.18.0
pandas>=0.24.0
pint>=0.10.1
pooch>=1.2.0
Expand Down
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

if sys.version_info[0] < 3:
error = """
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
5 changes: 1 addition & 4 deletions src/metpy/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,7 @@ def get_version():
return get_version(root='../..', relative_to=__file__,
version_scheme='post-release')
except (ImportError, LookupError):
try:
from importlib.metadata import PackageNotFoundError, version
except ImportError: # Can remove when we require Python > 3.7
from importlib_metadata import PackageNotFoundError, version
from importlib.metadata import PackageNotFoundError, version

try:
return version(__package__)
Expand Down

0 comments on commit 0a04ec5

Please sign in to comment.