Skip to content

Commit

Permalink
Drop Python 3.6
Browse files Browse the repository at this point in the history
  • Loading branch information
mwtoews committed Dec 11, 2023
1 parent 0206444 commit 0bb1e67
Show file tree
Hide file tree
Showing 11 changed files with 9 additions and 155 deletions.
8 changes: 2 additions & 6 deletions .github/workflows/weekly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
workflow_dispatch:

jobs:
environment:
weekly:
runs-on: ${{ matrix.os }}-latest
strategy:
max-parallel: 5
Expand All @@ -23,10 +23,6 @@ jobs:
- os: ubuntu
python: 3.9
extras: -minimal
# python-eccodes removed old versions from conda-forge
# - os: ubuntu
# python: 3.6
# extras: -minver

steps:
- uses: actions/checkout@v2
Expand All @@ -42,7 +38,7 @@ jobs:
conda env export --no-build -f tests/environment-${{ matrix.os }}-${{ matrix.python }}${{ matrix.extras }}.yml
git diff
- name: Archive environment-${{ matrix.os }}-${{ matrix.python }}${{ matrix.extras }}.yml
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: environment-${{ matrix.os }}-${{ matrix.python }}${{ matrix.extras }}.yml
path: tests/environment-${{ matrix.os }}-${{ matrix.python }}${{ matrix.extras }}.yml
4 changes: 2 additions & 2 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ you already have `virtualenv` and `Git` installed and ready to go.
$ git clone https://github.com/YOUR_NAME/cfgrib.git
$ cd cfgrib

3. Assuming you have virtualenv installed (If you have Python3.5 this should already be there), you can create a new environment for your local development by typing::
3. Assuming you have virtualenv installed, you can create a new environment for your local development by typing::

$ virtualenv ../cfgrib-env
$ source ../cfgrib-env/bin/activate
Expand Down Expand Up @@ -101,7 +101,7 @@ Before you submit a pull request, check that it meets these guidelines:
your new functionality into a function with a docstring, and add the
feature to the list in README.rst.

3. The pull request should work for Python 2.7, 3.5, 3.6 and 3.7, and for PyPy2 and Pypy3. Check
3. The pull request should work for all supported versions of Python, including PyPy3. Check
the tox results and make sure that the tests pass for all supported Python versions.


Expand Down
1 change: 0 additions & 1 deletion ci/requirements-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ dependencies:
- eccodes
- future
- nomkl
- python=3.6
- sphinx
- xarray

22 changes: 0 additions & 22 deletions ci/requirements-py36-old.yml

This file was deleted.

23 changes: 0 additions & 23 deletions ci/requirements-py36-qc.yml

This file was deleted.

18 changes: 0 additions & 18 deletions ci/requirements-py36-without-xarray.yml

This file was deleted.

4 changes: 2 additions & 2 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Features with development status **Beta**:

- enables the ``engine='cfgrib'`` option to read GRIB files with *xarray*,
- reads most GRIB 1 and 2 files including heterogeneous ones with ``cfgrib.open_datasets``,
- supports all modern versions of Python 3.7, 3.6, 3.5 and PyPy3,
- supports all modern versions of Python and PyPy3,
- the 0.9.6.x series with support for Python 2 will stay active and receive critical bugfixes,
- works on *Linux*, *MacOS* and *Windows*, the *ecCodes* C-library is the only binary dependency,
- conda-forge package on all supported platforms,
Expand Down Expand Up @@ -56,4 +56,4 @@ Limitations:
cfmessage
dataset
xarray_store
xarray_to_grib
xarray_to_grib
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def parse_version_from(path: str) -> str:
packages=setuptools.find_packages(),
include_package_data=True,
install_requires=["attrs>=19.2", "click", "eccodes>=0.9.8", "numpy"],
python_requires=">=3.6",
python_requires=">=3.7",
extras_require={
"xarray": ["xarray>=0.15"],
"tests": ["dask[array]", "flake8", "pytest", "pytest-cov", "scipy", "xarray>=0.15"],
Expand All @@ -60,7 +60,6 @@ def parse_version_from(path: str) -> str:
"Intended Audience :: Developers",
"License :: OSI Approved :: Apache Software License",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
Expand Down
76 changes: 0 additions & 76 deletions tests/environment-ubuntu-3.6-minver.yml

This file was deleted.

1 change: 0 additions & 1 deletion tests/test_20_cfcoords.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ def test_translate_coords(da1: xr.Dataset, da2: xr.Dataset, da3: xr.Dataset) ->
assert "longitude" in res.coords


@pytest.mark.skipif(sys.version_info < (3, 6), reason="test needs stable dict's")
def test_translate_coords_errors(da3: xr.Dataset) -> None:
cfcoords.translate_coords(da3)
cfcoords.translate_coords(da3, errors="ignore")
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = qc, docs, py37, py36, py35, pypy3, deps
envlist = qc, docs, py37, pypy3, deps

[testenv]
passenv = WHEELHOUSE PIP_FIND_LINKS PIP_WHEEL_DIR PIP_INDEX_URL
Expand All @@ -12,7 +12,7 @@ deps = -r{toxinidir}/ci/requirements-docs.txt
commands = sphinx-build -W -b html docs build/sphinx/html

[testenv:qc]
basepython = python3.6
basepython = python3.7
# needed for pytest-cov
usedevelop = true
commands = pytest -v --flakes --pep8 --mccabe --cov=cfgrib --cov=cf2cdm --doctest-glob="*.rst" --cov-report=html --cache-clear --basetemp={envtmpdir} {posargs}
Expand Down

0 comments on commit 0bb1e67

Please sign in to comment.