From a43d34e45cf642e1f4a5d1b0406953a50242332f Mon Sep 17 00:00:00 2001 From: Sean Freeman Date: Thu, 17 Nov 2022 08:34:17 -0600 Subject: [PATCH 1/7] updated requirements.txt and renamed from conda-requirements --- conda-requirements.txt => requirements.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) rename conda-requirements.txt => requirements.txt (85%) diff --git a/conda-requirements.txt b/requirements.txt similarity index 85% rename from conda-requirements.txt rename to requirements.txt index f150e749..c8ff9242 100644 --- a/conda-requirements.txt +++ b/requirements.txt @@ -2,11 +2,10 @@ numpy scipy scikit-image +scikit-learn pandas -pytables matplotlib iris -cf-units xarray cartopy trackpy From a2318237e93596cd3cb7f4df7e6ca4b1a3b869cf Mon Sep 17 00:00:00 2001 From: Sean Freeman Date: Thu, 17 Nov 2022 10:02:51 -0600 Subject: [PATCH 2/7] added requirements to setup.py --- setup.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index e1019b2a..020daddd 100644 --- a/setup.py +++ b/setup.py @@ -49,6 +49,17 @@ def get_version(pkg_name): ], license="BSD-3-Clause License", packages=[PACKAGE_NAME], - install_requires=[], + install_requires=[ + "numpy", + "scipy", + "scikit-image", + "scikit-learn", + "pandas", + "matplotlib", + "iris", + "xarray", + "cartopy", + "trackpy", + ], zip_safe=False, ) From ff25054b63246b8c83d2ea6fa106b700477cc6cc Mon Sep 17 00:00:00 2001 From: Sean Freeman Date: Thu, 17 Nov 2022 14:43:28 -0600 Subject: [PATCH 3/7] updates to clarify iris and fix requirements link. Also removed cartopy due to setup difficulties --- .github/workflows/codecov-CI.yml | 46 ++++++++++++++++---------------- setup.py | 2 +- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/codecov-CI.yml b/.github/workflows/codecov-CI.yml index 91058278..78093965 100644 --- a/.github/workflows/codecov-CI.yml +++ b/.github/workflows/codecov-CI.yml @@ -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 - \ No newline at end of file + - 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 diff --git a/setup.py b/setup.py index 020daddd..04325192 100644 --- a/setup.py +++ b/setup.py @@ -56,7 +56,7 @@ def get_version(pkg_name): "scikit-learn", "pandas", "matplotlib", - "iris", + "scitools-iris", "xarray", "cartopy", "trackpy", From 405375603ba5522c415ebbb764c469d96a7e3f34 Mon Sep 17 00:00:00 2001 From: Sean Freeman Date: Thu, 17 Nov 2022 14:45:25 -0600 Subject: [PATCH 4/7] removal of cartopy as a mandatory requirement --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index 04325192..32396628 100644 --- a/setup.py +++ b/setup.py @@ -58,7 +58,6 @@ def get_version(pkg_name): "matplotlib", "scitools-iris", "xarray", - "cartopy", "trackpy", ], zip_safe=False, From 1dd56bd7816c8740b826aee3f25d09db9d9d0342 Mon Sep 17 00:00:00 2001 From: Sean Freeman Date: Thu, 17 Nov 2022 15:02:06 -0600 Subject: [PATCH 5/7] removed iris as a mandatory requirement because cartopy builds are broken --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index 32396628..f9780a74 100644 --- a/setup.py +++ b/setup.py @@ -56,7 +56,6 @@ def get_version(pkg_name): "scikit-learn", "pandas", "matplotlib", - "scitools-iris", "xarray", "trackpy", ], From 7fcd6ee7b315bc43e12fafa6ed1144486f96ae32 Mon Sep 17 00:00:00 2001 From: Sean Freeman Date: Mon, 28 Nov 2022 12:10:56 -0600 Subject: [PATCH 6/7] updated readme to correct requirements file. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fad9a640..d213f5da 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,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: ``` From 8ca22b25a8c53b2486410c3fc013a1223acb8ec9 Mon Sep 17 00:00:00 2001 From: Sean Freeman Date: Tue, 29 Nov 2022 11:32:25 -0600 Subject: [PATCH 7/7] add pytest to test_requires --- setup.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup.py b/setup.py index f9780a74..01b3baf8 100644 --- a/setup.py +++ b/setup.py @@ -59,5 +59,8 @@ def get_version(pkg_name): "xarray", "trackpy", ], + test_requires=[ + "pytest", + ], zip_safe=False, )