Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

## [Unreleased]

### Changed
- Require lunarsky>1.0 to drop spiceypy requirement

### Removed
- Spiceypy error catching in tests

## [1.4.2] - 2025-10-03

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ Optional:

* astropy-healpix>=1.0.2 (for using healpix based sky catalogs or beams)
* mpi4py>=3.1.3 (for actually running simulations)
* lunarsky>=0.2.5 (for simulating telescopes on the moon)
* lunarsky>=1.0 (for simulating telescopes on the moon)
* python-casacore>=3.5.2 (for writing CASA measurement sets, not available on Windows)
* matplotlib>=3.6 (for plotting functions)

Expand Down
2 changes: 1 addition & 1 deletion ci/min_versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ dependencies:
- pip:
- pyradiosky==1.1.0
- mpi-pytest==2025.7.0
- lunarsky==0.2.5
- lunarsky==1.0.1.post2
- git+https://github.com/aelanman/analytic_diffuse
2 changes: 1 addition & 1 deletion ci/pyuvsim_tests_mpich.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ dependencies:
- pip:
- pyradiosky>=1.1.0
- mpi-pytest>=2025.7.0
- lunarsky>=0.2.5
- lunarsky>=1.0
- git+https://github.com/aelanman/analytic_diffuse
2 changes: 1 addition & 1 deletion ci/pyuvsim_tests_openmpi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ dependencies:
- pip:
- pyradiosky>=1.1.0
- mpi-pytest>=2025.7.0
- lunarsky>=0.2.5
- lunarsky>=1.0
- git+https://github.com/aelanman/analytic_diffuse
2 changes: 1 addition & 1 deletion ci/pyuvsim_tests_refsim.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ dependencies:
- pyradiosky>=1.1.0
- pytest-benchmark
- mpi-pytest>=2025.7.0
- lunarsky>=0.2.5
- lunarsky>=1.0
- git+https://github.com/aelanman/analytic_diffuse
- requests
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ dependencies:
- pip:
- pyradiosky>=1.1.0
- mpi-pytest>=2025.7.0
- lunarsky>=0.2.5
- lunarsky>=1.0
- git+https://github.com/aelanman/analytic_diffuse
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ classifiers = [
[project.optional-dependencies]
casa = ["python-casacore>=3.5.2"]
healpix = ["astropy-healpix>=1.0.2"]
moon = ["lunarsky>=0.2.5"]
moon = ["lunarsky>=1.0"]
plot = ["matplotlib>=3.6"]
sim = ["mpi4py>=3.1.3", "psutil"]
sim-test = ["pyuvsim[sim,test]", "mpi-pytest>=2025.7.0"]
Expand Down
16 changes: 4 additions & 12 deletions tests/test_run.py
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,6 @@ def test_pol_error():
@pytest.mark.parametrize("selenoid", ["SPHERE", "GSFC", "GRAIL23", "CE-1-LAM-GEO"])
def test_sim_on_moon(goto_tempdir, selenoid):
pytest.importorskip("lunarsky")
from spiceypy.utils.exceptions import SpiceUNKNOWNFRAME

param_filename = os.path.join(
SIM_DATA_PATH, "test_config", "obsparam_tranquility_hex.yaml"
Expand Down Expand Up @@ -609,12 +608,9 @@ def test_sim_on_moon(goto_tempdir, selenoid):
return_data=True,
)
# Run simulation.
try:
uv_out = pyuvsim.uvsim.run_uvdata_uvsim(
uv_obj, beam_list, beam_dict, catalog=sources, quiet=True
)
except SpiceUNKNOWNFRAME as err:
pytest.skip("SpiceUNKNOWNFRAME error: " + str(err))
uv_out = pyuvsim.uvsim.run_uvdata_uvsim(
uv_obj, beam_list, beam_dict, catalog=sources, quiet=True
)

assert history_utils._check_history_version(uv_out.history, pyradiosky.__version__)
assert history_utils._check_history_version(uv_out.history, pyuvdata.__version__)
Expand All @@ -640,7 +636,6 @@ def test_sim_on_moon(goto_tempdir, selenoid):
def test_lunar_gauss(goto_tempdir, selenoid):
pytest.importorskip("lunarsky")
from lunarsky import MoonLocation
from spiceypy.utils.exceptions import SpiceUNKNOWNFRAME

# Make a gaussian source that passes through zenith
# Confirm that simulated visibilities match expectation.
Expand Down Expand Up @@ -680,10 +675,7 @@ def test_lunar_gauss(goto_tempdir, selenoid):

params["filing"]["outdir"] = str(tmpdir)

try:
uv_out = pyuvsim.run_uvsim(params, return_uv=True, quiet=True)
except SpiceUNKNOWNFRAME as err:
pytest.skip("SpiceUNKNOWNFRAME error: " + str(err))
uv_out = pyuvsim.run_uvsim(params, return_uv=True, quiet=True)

assert uv_out.telescope.location.ellipsoid == selenoid

Expand Down
Loading