From 6e793248173c2258f3fd58963eb58794b6e6b9b2 Mon Sep 17 00:00:00 2001 From: Nabil Freij Date: Wed, 31 Jul 2024 13:56:12 -0700 Subject: [PATCH] increase min sunpy (#223) * increase min sunpy * changelog --- .github/workflows/ci.yml | 19 +------------------ changelog/223.breaking.rst | 1 + pyproject.toml | 12 ++++++------ ...mpl_390_ft_261_sunpy_600_astropy_610.json} | 0 tox.ini | 7 ++++--- 5 files changed, 12 insertions(+), 27 deletions(-) create mode 100644 changelog/223.breaking.rst rename sunkit_image/tests/{figure_hashes_mpl_390_ft_261_sunpy_513_astropy_610.json => figure_hashes_mpl_390_ft_261_sunpy_600_astropy_610.json} (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3ac39681..e98a165d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -87,25 +87,8 @@ jobs: secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - cron: - if: | - github.event_name == 'workflow_dispatch' || ( - github.event_name == 'pull_request' && - contains(github.event.pull_request.labels.*.name, 'Run cron CI') - ) - uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@main - with: - default_python: '3.10' - submodules: false - coverage: codecov - toxdeps: tox-pypi-filter - envs: | - - linux: py311-devdeps - secrets: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - devdeps: - needs: [online] + needs: [test] uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@main with: submodules: false diff --git a/changelog/223.breaking.rst b/changelog/223.breaking.rst new file mode 100644 index 00000000..8f8b177d --- /dev/null +++ b/changelog/223.breaking.rst @@ -0,0 +1 @@ +Increased the minimum required version of ``sunpy`` to the latest LTS version 6.0.0 diff --git a/pyproject.toml b/pyproject.toml index 8500109d..3d949ae4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,12 +31,12 @@ classifiers = [ "Topic :: Scientific/Engineering :: Physics", ] dependencies = [ - 'astropy>=5.2.0', - 'numpy>=1.23.0', + 'astropy>=5.3.0', + 'numpy>=1.23.5', 'matplotlib>=3.5.0', - 'scipy>=1.8.0,!=1.10.0', + 'scipy>=1.10.1', 'scikit-image>=0.20.0', - 'sunpy[map]>=5.0.0', + 'sunpy[map]>=6.0.0', ] [project.optional-dependencies] @@ -49,7 +49,7 @@ tests = [ 'pytest-astropy', 'pytest-mpl', "pytest-xdist", - "sunpy[data]>=5.0.0", + "sunpy[data]>=6.0.0", ] docs = [ "sunkit_image[all]", @@ -62,7 +62,7 @@ docs = [ 'sphinx-gallery', 'sphinx', 'sunpy-sphinx-theme', - 'sunpy[data,net]>=5.0.0', + 'sunpy[data,net]>=6.0.0', ] dev = ["sunkit_image[all,tests,docs]"] diff --git a/sunkit_image/tests/figure_hashes_mpl_390_ft_261_sunpy_513_astropy_610.json b/sunkit_image/tests/figure_hashes_mpl_390_ft_261_sunpy_600_astropy_610.json similarity index 100% rename from sunkit_image/tests/figure_hashes_mpl_390_ft_261_sunpy_513_astropy_610.json rename to sunkit_image/tests/figure_hashes_mpl_390_ft_261_sunpy_600_astropy_610.json diff --git a/tox.ini b/tox.ini index 9c7c186a..64732d79 100644 --- a/tox.ini +++ b/tox.ini @@ -42,15 +42,16 @@ set_env = deps = # For packages which publish nightly wheels this will pull the latest nightly devdeps: numpy>=0.0.dev0 + devdeps: sunpy>=0.0.dev0 + devdeps: scikit_image>=0.0.dev0 # Packages without nightly wheels will be built from source like this - devdeps: git+https://github.com/scikit-image/scikit-image.git - devdeps: git+https://github.com/sunpy/sunpy.git + # devdeps: git+https://github.com/scikit-image/scikit-image.git # Handle minimum dependencies via minimum_dependencies oldestdeps: minimum_dependencies # Figure tests need a tightly controlled environment figure-!devdeps: astropy==6.1.0 figure-!devdeps: matplotlib==3.9.0 - figure-!devdeps: sunpy==5.1.3 + figure-!devdeps: sunpy==6.0.0 # The following indicates which extras_require will be installed extras = all