From 5cd97e0b782e84f11cd9219d267050476c15c3e1 Mon Sep 17 00:00:00 2001 From: Kevin Anderson Date: Wed, 18 Jan 2023 15:37:17 -0500 Subject: [PATCH 1/2] ditch nose --- ci/requirements-py3.10.yml | 1 - ci/requirements-py3.7-min.yml | 1 - ci/requirements-py3.7.yml | 1 - ci/requirements-py3.8.yml | 1 - ci/requirements-py3.9.yml | 1 - docs/sphinx/source/user_guide/installation.rst | 2 +- setup.py | 2 +- 7 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ci/requirements-py3.10.yml b/ci/requirements-py3.10.yml index a2b2284c37..c6f95fcbc8 100644 --- a/ci/requirements-py3.10.yml +++ b/ci/requirements-py3.10.yml @@ -8,7 +8,6 @@ dependencies: - ephem - h5py # - netcdf4 # pulls in a different version of numpy with ImportError - - nose # - numba # python 3.9 compat in early 2021 - numpy >= 1.16.0 - pandas >= 0.25.0 diff --git a/ci/requirements-py3.7-min.yml b/ci/requirements-py3.7-min.yml index 71acbf8aec..598e790049 100644 --- a/ci/requirements-py3.7-min.yml +++ b/ci/requirements-py3.7-min.yml @@ -3,7 +3,6 @@ channels: - defaults dependencies: - coveralls - - nose - pip - pytest - pytest-cov diff --git a/ci/requirements-py3.7.yml b/ci/requirements-py3.7.yml index 4a03fdb928..442e5d1adc 100644 --- a/ci/requirements-py3.7.yml +++ b/ci/requirements-py3.7.yml @@ -8,7 +8,6 @@ dependencies: - ephem - h5py - netcdf4 - - nose - numba - numpy >= 1.16.0 - pandas >= 0.25.0 diff --git a/ci/requirements-py3.8.yml b/ci/requirements-py3.8.yml index 0ccc865928..013a7e4684 100644 --- a/ci/requirements-py3.8.yml +++ b/ci/requirements-py3.8.yml @@ -8,7 +8,6 @@ dependencies: - ephem - h5py - netcdf4 - - nose - numba - numpy >= 1.16.0 - pandas >= 0.25.0 diff --git a/ci/requirements-py3.9.yml b/ci/requirements-py3.9.yml index 84b6c03b1a..b208a10c24 100644 --- a/ci/requirements-py3.9.yml +++ b/ci/requirements-py3.9.yml @@ -8,7 +8,6 @@ dependencies: - ephem - h5py # - netcdf4 # pulls in a different version of numpy with ImportError - - nose # - numba # python 3.9 compat in early 2021 - numpy >= 1.16.0 - pandas >= 0.25.0 diff --git a/docs/sphinx/source/user_guide/installation.rst b/docs/sphinx/source/user_guide/installation.rst index 1a79f6b6b4..8ed206f864 100644 --- a/docs/sphinx/source/user_guide/installation.rst +++ b/docs/sphinx/source/user_guide/installation.rst @@ -174,7 +174,7 @@ referred to as *conda environments*, but they're the same for our purposes. ``conda create --name pvlibdev python pandas scipy`` #. **Activate** the new conda environment: ``conda activate pvlibdev`` #. **Install** additional packages into your development environment: - ``conda install jupyter ipython matplotlib pytest nose flake8`` + ``conda install jupyter ipython matplotlib pytest flake8`` The `conda documentation `_ has more information on how to use conda virtual environments. You can also add diff --git a/setup.py b/setup.py index 0848422f8c..6e25d097da 100755 --- a/setup.py +++ b/setup.py @@ -42,7 +42,7 @@ 'h5py', 'importlib-metadata; python_version < "3.8"'] -TESTS_REQUIRE = ['nose', 'pytest', 'pytest-cov', 'pytest-mock', +TESTS_REQUIRE = ['pytest', 'pytest-cov', 'pytest-mock', 'requests-mock', 'pytest-timeout', 'pytest-rerunfailures', 'pytest-remotedata'] EXTRAS_REQUIRE = { From 763a875cc6e6b1895ab3e2b87f849da9580179fc Mon Sep 17 00:00:00 2001 From: Kevin Anderson Date: Wed, 18 Jan 2023 15:56:38 -0500 Subject: [PATCH 2/2] whatsnew --- docs/sphinx/source/whatsnew/v0.9.5.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/sphinx/source/whatsnew/v0.9.5.rst b/docs/sphinx/source/whatsnew/v0.9.5.rst index 32b785fbfd..dd2ad9c189 100644 --- a/docs/sphinx/source/whatsnew/v0.9.5.rst +++ b/docs/sphinx/source/whatsnew/v0.9.5.rst @@ -5,7 +5,7 @@ v0.9.5 (anticipated March 2023) ------------------------------- Starting with this version, new releases are no longer distributed through -the ``pvlib`` `conda channel`_. We recommend +the ``pvlib`` `conda channel `_. We recommend ``conda`` users install from the ``conda-forge`` channel instead (see :ref:`installation`). @@ -36,7 +36,7 @@ Benchmarking Requirements ~~~~~~~~~~~~ - +* Removed unnecessary ``nose`` test requirement (:pull:`1637`) Contributors ~~~~~~~~~~~~