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

Update requirements to require scikit-learn and purge old requirements #204

Merged
merged 8 commits into from
Nov 30, 2022
46 changes: 23 additions & 23 deletions .github/workflows/codecov-CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,27 @@ jobs:
runs-on: ubuntu-latest
env:
OS: ubuntu-latest
PYTHON: '3.9'
PYTHON: "3.9"
steps:
- uses: actions/checkout@v2
# Similar to MetPy install-conda action
- name: Set up conda
uses: conda-incubator/setup-miniconda@v2
with:
miniforge-version: latest
miniforge-variant: mambaforge
channel-priority: strict
channels: conda-forge
show-channel-urls: true
use-only-tar-bz2: true
- name: Install dependencies and generate report
shell: bash -l {0}
run: mamba install --quiet --yes --file conda-requirements.txt coverage pytest-cov &&
python -m coverage run -m pytest --cov=./ --cov-report=xml
- name: Upload Coverage to Codecov
uses: codecov/codecov-action@v3
with:
fail_ci_if_error: true
flags: unittests

- uses: actions/checkout@v2
# Similar to MetPy install-conda action
- name: Set up conda
uses: conda-incubator/setup-miniconda@v2
with:
miniforge-version: latest
miniforge-variant: mambaforge
channel-priority: strict
channels: conda-forge
show-channel-urls: true
use-only-tar-bz2: true

- name: Install dependencies and generate report
shell: bash -l {0}
run:
mamba install --quiet --yes --file requirements.txt coverage pytest-cov &&
python -m coverage run -m pytest --cov=./ --cov-report=xml
- name: Upload Coverage to Codecov
uses: codecov/codecov-action@v3
with:
fail_ci_if_error: true
flags: unittests
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ You can also install conda via git, either for development purposes or to use sp

If you are using anaconda, the following command from within the cloned repository should make sure all dependencies are met and up to date:
```
conda install -c conda-forge --yes --file conda-requirements.txt
conda install -c conda-forge --yes --file requirements.txt
```
You can directly install the package directly from github with pip and either of the two following commands:
```
Expand Down
3 changes: 1 addition & 2 deletions conda-requirements.txt → requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@
numpy
scipy
scikit-image
scikit-learn
pandas
pytables
matplotlib
iris
cf-units
xarray
cartopy
trackpy
Expand Down
14 changes: 13 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,18 @@ def get_version(pkg_name):
],
license="BSD-3-Clause License",
packages=[PACKAGE_NAME, PACKAGE_NAME + ".utils"],
install_requires=[],
install_requires=[
"numpy",
"scipy",
"scikit-image",
"scikit-learn",
"pandas",
"matplotlib",
"xarray",
"trackpy",
],
freemansw1 marked this conversation as resolved.
Show resolved Hide resolved
test_requires=[
"pytest",
],
zip_safe=False,
)