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

Drop Python 3.6 #40

Merged
merged 5 commits into from
Apr 5, 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
6 changes: 5 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
fail-fast: false
matrix:
os: [windows-latest, ubuntu-latest, macos-latest]
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: [3.7, 3.8, 3.9]

steps:
- name: Checkout source
Expand All @@ -28,6 +28,10 @@ jobs:
shell: bash -l {0}
run: python -m pip install -e .

- name: List installed packages
shell: bash -l {0}
run: conda list

- name: Run tests
shell: bash -l {0}
run: python -m pytest --cov=xhistogram --cov-report=xml xhistogram
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/upstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ jobs:
shell: bash -l {0}
run: python -m pip install -e .

- name: List installed packages
shell: bash -l {0}
run: conda list

- name: Run tests
shell: bash -l {0}
run: python -m pytest --cov=xhistogram --cov-report=xml xhistogram
Expand Down
16 changes: 0 additions & 16 deletions ci/environment-3.6.yml

This file was deleted.

4 changes: 3 additions & 1 deletion ci/environment-3.7.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
name: xhistogram_test_env
channels:
- conda-forge
dependencies:
- python=3.7
- xarray
Expand All @@ -8,7 +10,7 @@ dependencies:
# see https://github.com/dask/dask/pull/7391
# and https://github.com/xgcm/xhistogram/issues/27
- dask!=2021.3.0
- numpy=1.17
- numpy=1.16
- pytest
- pip
- pip:
Expand Down
4 changes: 3 additions & 1 deletion ci/environment-3.8.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
name: xhistogram_test_env
channels:
- conda-forge
dependencies:
- python=3.8
- xarray
Expand All @@ -8,7 +10,7 @@ dependencies:
# see https://github.com/dask/dask/pull/7391
# and https://github.com/xgcm/xhistogram/issues/27
- dask!=2021.3.0
- numpy
- numpy=1.18
- pytest
- pip
- pip:
Expand Down
2 changes: 2 additions & 0 deletions ci/environment-3.9.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
name: xhistogram_test_env
channels:
- conda-forge
dependencies:
- python=3.9
- xarray
Expand Down
2 changes: 1 addition & 1 deletion doc/environment.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: xhistogram_test_env
dependencies:
- python=3.6
- python=3.9
- xarray
- netcdf4
- numpy>=1.16
Expand Down
6 changes: 4 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,14 @@
"Intended Audience :: Science/Research",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Topic :: Scientific/Engineering",
]

INSTALL_REQUIRES = ["xarray>=0.12.0", "dask", "numpy>=1.16"]
PYTHON_REQUIRES = ">=3.6"
PYTHON_REQUIRES = ">=3.7"

DESCRIPTION = "Fast, flexible, label-aware histograms for numpy and xarray"

Expand Down