Skip to content

Commit

Permalink
Update min versions of scipy and setuptools_scm
Browse files Browse the repository at this point in the history
scipy 1.8 is required given numpy requirements
setuptools_scm was not matched between pyproject.toml and our requirements, needed to go to 8.1 to avoid a bug,
  • Loading branch information
bhazelton committed Jul 1, 2024
1 parent f4de421 commit ffd1cf3
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 23 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ conjugation convention and ordering along the baseline-time axis.
- Support for pyuvdata version 3.0 and later.

### Changed
- Updated minimum dependency versions: scipy>=1.8, setuptools_scm>=8.1
- pyuvdata utils imports to ensure compatibility with version 3.0.
- `numpy.string_` calls to `numpy.bytes_`, `np.in1d` to `np.isin` and a few other
changes for numpy 2.0 compatibility.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ Required:
* python>=3.10
* pyuvdata>=2.4.3
* pyyaml>=5.4.1
* scipy>=1.7.3
* setuptools_scm>=7.0.3
* scipy>=1.8
* setuptools_scm>=8.1

Optional:

Expand Down
5 changes: 2 additions & 3 deletions ci/min_deps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@ dependencies:
- pytest-xdist
- pyuvdata>=2.4.3
- pyyaml>=5.4.1
- scipy>=1.7.3
- setuptools>=61
- setuptools_scm>=7.0.3
- scipy>=1.8
- setuptools_scm>=8.1
- psutil
- pip:
- pyradiosky>=0.2
5 changes: 2 additions & 3 deletions ci/min_versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@ dependencies:
- pytest-xdist
- pyuvdata==2.4.3
- pyyaml==5.4.1
- scipy==1.7.3
- setuptools==61
- setuptools_scm==7.0.3
- scipy==1.8.*
- setuptools_scm==8.1
- pip:
- pyradiosky==0.2.0
- lunarsky==0.2.2
Expand Down
5 changes: 2 additions & 3 deletions ci/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ dependencies:
- pip
- pyuvdata>=2.4.3
- pyyaml>=5.4.1
- scipy>=1.7.3
- setuptools>=61
- setuptools_scm>=7.0.3
- scipy>=1.8
- setuptools_scm>=8.1
- psutil
- pip:
- pyradiosky>=0.2
Expand Down
5 changes: 2 additions & 3 deletions ci/pyuvsim_tests_mpich.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@ dependencies:
- pytest-xdist
- pyuvdata>=2.4.3
- pyyaml>=5.4.1
- scipy>=1.7.3
- setuptools>=61
- setuptools_scm>=7.0.3
- scipy>=1.8
- setuptools_scm>=8.1
- pip:
- pyradiosky>=0.2
- lunarsky>=0.2.2
Expand Down
5 changes: 2 additions & 3 deletions ci/pyuvsim_tests_openmpi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@ dependencies:
- pytest-xdist
- pyuvdata>=2.4.3
- pyyaml>=5.4.1
- scipy>=1.7.3
- setuptools>=61
- setuptools_scm>=7.0.3
- scipy>=1.8
- setuptools_scm>=8.1
- pip:
- pyradiosky>=0.2
- lunarsky>=0.2.2
Expand Down
5 changes: 2 additions & 3 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@ dependencies:
- pytest-xdist
- pyuvdata>=2.4.3
- pyyaml>=5.4.1
- scipy>=1.7.3
- setuptools>=61
- setuptools_scm>=7.0.3
- scipy>=1.8
- setuptools_scm>=8.1
- sphinx
- pip:
- pyradiosky>=0.2
Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["setuptools>=64", "wheel", "setuptools_scm>=8"]
requires = ["setuptools>=64", "wheel", "setuptools_scm>=8.1"]
build-backend = "setuptools.build_meta"

[project]
Expand Down Expand Up @@ -28,9 +28,9 @@ dependencies = [
"pyradiosky>=0.2.0",
"pyuvdata>=2.4.3",
"pyyaml>=5.4.1",
"scipy>=1.7.3",
"scipy>=1.8",
"setuptools>=64",
"setuptools_scm>=8",
"setuptools_scm>=8.1",
]
requires-python = ">=3.10"
keywords = ["radio astronomy", "interferometry"]
Expand Down

0 comments on commit ffd1cf3

Please sign in to comment.