Skip to content

Commit

Permalink
Update min version of lunarsky and astropy
Browse files Browse the repository at this point in the history
drop testing against python 3.9 because it isn't supported by astropy 6
update various minimum dependencies to get a solvable environment.
  • Loading branch information
bhazelton committed Mar 23, 2024
1 parent 689268b commit cac2611
Show file tree
Hide file tree
Showing 10 changed files with 65 additions and 69 deletions.
6 changes: 1 addition & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,6 @@ workflows:
version: 2
build_and_test:
jobs:
- pyuvdata:
name: pyuvdata_3.9
python_version: "3.9"
env_name: "pyuvdata_tests"
- pyuvdata:
name: pyuvdata_3.10
python_version: "3.10"
Expand All @@ -147,7 +143,7 @@ workflows:
env_name: "pyuvdata_min_deps_tests"
- pyuvdata:
name: pyuvdata_min_versions
python_version: "3.9"
python_version: "3.10"
env_name: "pyuvdata_min_versions_tests"
- doctest:
python_version: "3.11"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macosx_windows_ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
fail-fast: false
matrix:
os: [macos-latest, windows-latest]
python-version: [3.9, "3.10", "3.11", "3.12"]
python-version: ["3.10", "3.11", "3.12"]
steps:
- uses: actions/checkout@main
with:
Expand Down
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -141,23 +141,23 @@ Note that as of v2.2, `pyuvdata` is only supported on python 3.7+.

Required:

* astropy >= 5.0.4
* astropy >= 6.0
* docstring_parser>=0.15
* h5py >= 3.1
* numpy >= 1.20
* pyerfa >= 2.0
* scipy >= 1.5
* h5py >= 3.4
* numpy >= 1.23
* pyerfa >= 2.0.1.1
* scipy >= 1.7.3
* setuptools_scm <7.0|>=7.0.3

Optional:

* astropy-healpix >= 0.6 (for working with beams in HEALPix formats)
* astroquery >= 0.4.4 (for enabling phasing to ephemeris objects using JPL-Horizons)
* hdf5plugin >= 3.1.0 (for enabling bitshuffle and other hdf5 compression filters in uvh5 files)
* lunarsky >=0.2.1 (for working with simulated datasets for lunar telescopes)
* hdf5plugin >= 3.2.0 (for enabling bitshuffle and other hdf5 compression filters in uvh5 files)
* lunarsky >=0.2.2 (for working with simulated datasets for lunar telescopes)
* novas and novas_de405 (for using the NOVAS library for astrometry)
* python-casacore >= 3.3.1 (for working with CASA measurement sets)
* pyyaml >= 5.3 (for working with settings files for CST beam files)
* python-casacore >= 3.5.2 (for working with CASA measurement sets)
* pyyaml >= 5.4.1 (for working with settings files for CST beam files)


The numpy and astropy versions are important, so make sure these are up to date.
Expand Down
4 changes: 2 additions & 2 deletions ci/pyuvdata_min_deps_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ name: pyuvdata_min_deps_tests
channels:
- conda-forge
dependencies:
- astropy>=5.0.4
- astropy>=6.0
- docstring_parser>=0.15
- h5py>=3.1
- scipy>=1.5
- numpy>=1.20.*
- numpy>=1.23
- pyerfa>=2.0
- coverage
- pytest>=6.2.0
Expand Down
23 changes: 12 additions & 11 deletions ci/pyuvdata_min_versions_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,27 @@ name: pyuvdata_min_versions_tests
channels:
- conda-forge
dependencies:
- astropy==5.0.4
- astropy==6.0.0
- astropy-healpix==0.6
- astroquery==0.4.4
- docstring_parser==0.15
- h5py==3.1.*
- hdf5plugin==3.1.*
- numpy==1.20.*
- pyerfa==2.0
- python-casacore==3.3.1
- pyyaml==5.3.*
- scipy==1.5.*
- h5py==3.4.0
- hdf5plugin==3.2.0
- numpy==1.23
- pyerfa==2.0.1.1
- python-casacore==3.5.0
- pyyaml==5.4.1
- scipy==1.7.3
- coverage
- pytest==6.2.0
- pytest==6.2.5
- pytest-cases==3.8.3
- pytest-cov
- pytest-xdist
- cython
- setuptools_scm<7.0|>=7.0.3
- setuptools==61
- setuptools_scm==7.0.3
- pip
- pip:
- lunarsky==0.2.1
- lunarsky==0.2.2
- novas
- novas_de405
20 changes: 10 additions & 10 deletions ci/pyuvdata_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,27 @@ name: pyuvdata_tests
channels:
- conda-forge
dependencies:
- astropy>=5.0.4
- astropy>=6.0
- astropy-healpix>=0.6
- astroquery>=0.4.4
- docstring_parser>=0.15
- h5py>=3.1
- hdf5plugin>=3.1.0
- h5py>=3.4
- hdf5plugin>=3.2.0
- matplotlib # this is just for the doctests.
- numpy>=1.20.*
- pyerfa>=2.0
- python-casacore>=3.3.1
- pyyaml>=5.3
- scipy>=1.5
- numpy>=1.23
- pyerfa>=2.0.1.1
- python-casacore>=3.5.2
- pyyaml>=5.4.1
- scipy>=1.7.3
- coverage
- pytest>=6.2.0
- pytest>=6.2.5
- pytest-cases>=3.8.3
- pytest-cov
- pytest-xdist
- cython
- setuptools_scm<7.0|>=7.0.3
- pip
- pip:
- lunarsky>=0.2.1
- lunarsky>=0.2.2
- novas
- novas_de405
18 changes: 9 additions & 9 deletions ci/pyuvdata_tests_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@ name: pyuvdata_tests_windows
channels:
- conda-forge
dependencies:
- astropy>=5.0.4
- astropy>=6.0
- astropy-healpix>=0.6
- astroquery>=0.4.4
- docstring_parser>=0.15
- h5py>=3.1
- h5py>=3.4
- hdf5>=1.12.0
- hdf5plugin>=3.1.0
- numpy>=1.20.*
- pyerfa>=2.0
- pyyaml>=5.3
- scipy>=1.5
- hdf5plugin>=3.2.0
- numpy>=1.23
- pyerfa>=2.0.1.1
- pyyaml>=5.4.1
- scipy>=1.7.3
- coverage
- pytest>=6.2.0
- pytest>=6.2.5
- pytest-cases>=3.8.3
- pytest-cov
- pytest-xdist
- cython
- setuptools_scm<7.0|>=7.0.3
- pip
- pip:
- lunarsky>=0.2.1
- lunarsky>=0.2.2
2 changes: 1 addition & 1 deletion ci/test_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
coverage
packaging
pytest>=6.2
pytest>=6.2.5
pytest-cov
pytest-cases>=3.8.3
20 changes: 10 additions & 10 deletions environment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,30 @@ name: pyuvdata
channels:
- conda-forge
dependencies:
- astropy>=5.0.4
- astropy>=6.0
- astropy-healpix>=0.6
- astroquery>=0.4.4
- coverage
- cython>=0.23
- docstring_parser>=0.15
- h5py>=3.1
- hdf5plugin>=3.1.0
- h5py>=3.4
- hdf5plugin>=3.2.0
- matplotlib
- numpy>=1.20
- numpy>=1.23
- pip
- pre-commit
- pyerfa>=2.0
- pyerfa>=2.0.1.1
- pypandoc
- pytest>=6.2.0
- pytest>=6.2.5
- pytest-cases>=3.8.3
- pytest-cov
- pytest-xdist
- python-casacore>=3.3.1
- pyyaml>=5.3
- scipy>=1.5
- python-casacore>=3.5.2
- pyyaml>=5.4.1
- scipy>=1.7.3
- setuptools_scm<7.0|>=7.0.3
- sphinx
- pip:
- lunarsky>=0.2.1
- lunarsky>=0.2.2
- novas
- novas_de405
21 changes: 10 additions & 11 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,11 @@ def is_platform_windows():
extensions.append(miriad_extension)

astroquery_reqs = ["astroquery>=0.4.4"]
casa_reqs = ["python-casacore>=3.3.1"]
cst_reqs = ["pyyaml>=5.3"]
hdf5_compression_reqs = ["hdf5plugin>=3.1.0"]
casa_reqs = ["python-casacore>=3.5.2"]
cst_reqs = ["pyyaml>=5.4.1"]
hdf5_compression_reqs = ["hdf5plugin>=3.2.0"]
healpix_reqs = ["astropy_healpix>=0.6"]
lunar_reqs = ["lunarsky>=0.2.1"]
lunar_reqs = ["lunarsky>=0.2.2"]
novas_reqs = ["novas", "novas_de405"]
all_optional_reqs = (
astroquery_reqs
Expand All @@ -119,7 +119,7 @@ def is_platform_windows():
+ novas_reqs
)
test_reqs = all_optional_reqs + [
"pytest>=6.2",
"pytest>=6.2.5",
"pytest-xdist",
"pytest-cases>=3.8.3",
"pytest-cov",
Expand All @@ -144,12 +144,12 @@ def is_platform_windows():
"use_scm_version": {"local_scheme": branch_scheme},
"include_package_data": True,
"install_requires": [
"astropy>=5.0.4",
"astropy>=6.0",
"docstring-parser>=0.15",
"h5py>=3.1",
"numpy>=1.20",
"pyerfa>=2.0",
"scipy>=1.5",
"h5py>=3.4",
"numpy>=1.23",
"pyerfa>=2.0.1.1",
"scipy>=1.7.3",
"setuptools>=61",
"setuptools_scm!=7.0.0,!=7.0.1,!=7.0.2",
],
Expand All @@ -170,7 +170,6 @@ def is_platform_windows():
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Science/Research",
"License :: OSI Approved :: BSD License",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
Expand Down

0 comments on commit cac2611

Please sign in to comment.