From 3c7c57a202cbc27ef1171fc5504896a40473acb6 Mon Sep 17 00:00:00 2001 From: Abinash-bit Date: Sat, 23 Nov 2024 18:10:28 +0530 Subject: [PATCH 1/4] added new dependencies --- pyproject.toml | 50 +++++++++++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 3ba8b619..53015308 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ build-backend = "setuptools.build_meta" [project] name = "sunkit_instruments" -description = "A SunPy-affiliated package for solar instrum" +description = "A SunPy-affiliated package for solar instruments" requires-python = ">=3.10" readme = { file = "README.rst", content-type = "text/x-rst" } license = { file = "licenses/LICENSE.rst" } @@ -18,6 +18,13 @@ authors = [ dependencies = [ "sunpy[map,net,timeseries,visualization]>=6.0.0", "xarray>=2023.12.0", + "astropy", + "packaging", + "scipy", + "numpy", + "h5py", + "matplotlib", + "pandas", ] dynamic = ["version"] @@ -37,6 +44,7 @@ docs = [ "sphinx-changelog", "sphinx-gallery", ] + [project.urls] repository = "https://sunpy.org" @@ -51,14 +59,14 @@ exclude = ["sunkit_instruments._dev*"] [tool.setuptools_scm] write_to = "sunkit_instruments/_version.py" -[ tool.gilesbot ] - [ tool.gilesbot.circleci_artifacts ] +[tool.gilesbot] + [tool.gilesbot.circleci_artifacts] enabled = true - [ tool.gilesbot.pull_requests ] + [tool.gilesbot.pull_requests] enabled = true - [ tool.gilesbot.towncrier_changelog ] + [tool.gilesbot.towncrier_changelog] enabled = true verify_pr_number = true changelog_skip_label = "No Changelog Entry Needed" @@ -66,7 +74,7 @@ write_to = "sunkit_instruments/_version.py" changelog_missing_long = "There isn't a changelog file in this pull request. Please add a changelog file to the `changelog/` directory following the instructions in the changelog [README](https://github.com/sunpy/sunkit-instruments/blob/main/changelog/README.rst)." - type_incorrect_long = "The changelog file you added is not one of the allowed types. Please use one of the types described in the changelog [README](https://github.com/sunpy/sunkit-instruments/blob/main/changelog/README.rst)" + type_incorrect_long = "The changelog file you added is not one of the allowed types. Please use one of the types described in the changelog [README](https://github.com/sunpy/sunkit-instruments/blob/main/changelog/README.rst)." number_incorrect_long = "The number in the changelog file you added does not match the number of this pull request. Please rename the file." @@ -88,26 +96,26 @@ write_to = "sunkit_instruments/_version.py" showcontent = true [[tool.towncrier.type]] - directory = "removal" - name = "Deprecations and Removals" - showcontent = true + directory = "removal" + name = "Deprecations and Removals" + showcontent = true [[tool.towncrier.type]] - directory = "feature" - name = "Features" - showcontent = true + directory = "feature" + name = "Features" + showcontent = true [[tool.towncrier.type]] - directory = "bugfix" - name = "Bug Fixes" - showcontent = true + directory = "bugfix" + name = "Bug Fixes" + showcontent = true [[tool.towncrier.type]] - directory = "doc" - name = "Improved Documentation" - showcontent = true + directory = "doc" + name = "Improved Documentation" + showcontent = true [[tool.towncrier.type]] - directory = "trivial" - name = "Trivial/Internal Changes" - showcontent = true + directory = "trivial" + name = "Trivial/Internal Changes" + showcontent = true From 886ec058b31cc585485b8affa36a9fac329f26be Mon Sep 17 00:00:00 2001 From: Abinash-bit Date: Mon, 25 Nov 2024 22:19:13 +0530 Subject: [PATCH 2/4] Adding minimum versions --- pyproject.toml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 53015308..7a850ffc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,13 +18,13 @@ authors = [ dependencies = [ "sunpy[map,net,timeseries,visualization]>=6.0.0", "xarray>=2023.12.0", - "astropy", - "packaging", - "scipy", - "numpy", - "h5py", - "matplotlib", - "pandas", + "astropy>=5.3.0", + "packaging>=23.0", + "scipy>=1.11.0", + "numpy>=1.24.0", + "h5py>=3.9.0", + "matplotlib>=3.7.0", + "pandas>=2.0.0", ] dynamic = ["version"] @@ -74,7 +74,7 @@ write_to = "sunkit_instruments/_version.py" changelog_missing_long = "There isn't a changelog file in this pull request. Please add a changelog file to the `changelog/` directory following the instructions in the changelog [README](https://github.com/sunpy/sunkit-instruments/blob/main/changelog/README.rst)." - type_incorrect_long = "The changelog file you added is not one of the allowed types. Please use one of the types described in the changelog [README](https://github.com/sunpy/sunkit-instruments/blob/main/changelog/README.rst)." + type_incorrect_long = "The changelog file you added is not one of the allowed types. Please use one of the types described in the changelog [README](https://github.com/sunpy/sunkit-instruments/blob/main/changelog/README.rst)" number_incorrect_long = "The number in the changelog file you added does not match the number of this pull request. Please rename the file." From d4ad7db1dc3dc2270be188c817e441277ec2a8bb Mon Sep 17 00:00:00 2001 From: Nabil Freij Date: Mon, 25 Nov 2024 08:53:54 -0800 Subject: [PATCH 3/4] Update pyproject.toml --- pyproject.toml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 7a850ffc..a1deee02 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -20,11 +20,12 @@ dependencies = [ "xarray>=2023.12.0", "astropy>=5.3.0", "packaging>=23.0", - "scipy>=1.11.0", - "numpy>=1.24.0", - "h5py>=3.9.0", - "matplotlib>=3.7.0", - "pandas>=2.0.0", + # !=1.10.0 due to https://github.com/scipy/scipy/issues/17718 + "scipy>=1.9.0,!=1.10.0", + "numpy>=1.23.5", + "h5py>=3.7.0", + "matplotlib>=3.6.0", + "pandas>=1.4.0", ] dynamic = ["version"] From 8b6818b72196aa252af052fd21329a293c72a141 Mon Sep 17 00:00:00 2001 From: Abinash-bit Date: Mon, 25 Nov 2024 22:35:39 +0530 Subject: [PATCH 4/4] Changing the pytest.ini file --- pytest.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pytest.ini b/pytest.ini index fb4ff5cd..19feaa99 100644 --- a/pytest.ini +++ b/pytest.ini @@ -37,3 +37,5 @@ filterwarnings = # Needs a release of zeep 4.2.2 or higher # https://github.com/mvantellingen/python-zeep/pull/1364 ignore:'cgi' is deprecated and slated for removal in Python 3.13:DeprecationWarning + # Ignore RuntimeWarning about numpy.ndarray size changed, caused by binary incompatibility + ignore:numpy.ndarray size changed:RuntimeWarning