Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v1.5.0 #948

Merged
merged 64 commits into from
Dec 9, 2024
Merged
Changes from 11 commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
aa6773f
allow manual run to specify data URL
zacharyburnett Sep 13, 2024
06ef8f7
Merge pull request #914 from zacharyburnett/ci/data_url
BradleySappington Sep 13, 2024
cd6647d
MNT: Use hash for Action workflow versions and update if needed
pllim Sep 27, 2024
490d6bf
Add IFU+datacubes docs page. Also, fix minor nbsphinx formatting issu…
mperrin Sep 27, 2024
4715903
trivial fix to string formatting for a debug message
mperrin Sep 27, 2024
81f32f3
include IFU page in docs
mperrin Sep 27, 2024
4e04465
Merge pull request #918 from mperrin/minor_fix_debug_msg
obi-wan76 Sep 27, 2024
17c26f5
Merge pull request #917 from mperrin/ifu_docs
obi-wan76 Sep 27, 2024
fcf8b1e
build(deps): update pysiaf requirement
dependabot[bot] Oct 1, 2024
3043186
Merge pull request #920 from spacetelescope/dependabot/pip/pysiaf-gte…
BradleySappington Oct 2, 2024
4a4b869
update ifu docs to describe about coord_system and pixel scale
mperrin Oct 30, 2024
3f8fa7e
increase size of PSF grid in test case
mperrin Oct 30, 2024
6bdec62
fix a few more test cases
mperrin Oct 31, 2024
5668412
build(deps): update ipython requirement
dependabot[bot] Nov 1, 2024
1b997ca
Merge remote-tracking branch 'upstream/stable' into develop
Skyhawk172 Nov 22, 2024
1ea7936
Revert "Merge pull request #920 from spacetelescope/dependabot/pip/py…
Skyhawk172 Nov 22, 2024
238f899
Revert "Revert "Merge pull request #920 from spacetelescope/dependabo…
Skyhawk172 Nov 22, 2024
3d173e3
Merge pull request #925 from mperrin/fix_for_photutils2
obi-wan76 Nov 22, 2024
25e37a7
Merge pull request #916 from pllim/action-ver-hash
BradleySappington Nov 22, 2024
67c975f
consolidate dependabot PRs
BradleySappington Nov 22, 2024
fdc05e0
photutils not working
BradleySappington Nov 22, 2024
82489b0
add photutil top limit in pyproject
BradleySappington Nov 22, 2024
9af6b0e
Merge pull request #926 from spacetelescope/dependabot/pip/ipython-gt…
BradleySappington Nov 22, 2024
2dc5d45
Merge branch 'develop' into update_ifu_docs
mperrin Nov 22, 2024
4d9af0a
switch a float comparison to allclose for robustness
mperrin Nov 22, 2024
629d73e
Merge pull request #923 from mperrin/update_ifu_docs
BradleySappington Nov 22, 2024
3db3adf
Update the `WEBBPSF_PATH` handling to automatically try to get the da…
WilliamJamieson Nov 19, 2024
ab8b44a
update photutils upper bound
BradleySappington Nov 22, 2024
5ca4e6b
Merge pull request #935 from BradleySappington/photutils
mperrin Nov 22, 2024
4c4cbf8
Merge pull request #932 from WilliamJamieson/auto_download_data
BradleySappington Nov 22, 2024
540a751
Merge pull request #934 from mperrin/fix_test_case_float_check
BradleySappington Nov 22, 2024
47afb26
Initial update with note about WFI optical model
Skyhawk172 Nov 27, 2024
ccf8935
Fixing NOTE in readme
Skyhawk172 Nov 27, 2024
4e8d564
Fixing NOTE in readme
Skyhawk172 Nov 27, 2024
709538b
Fixing NOTE in roman.rst
Skyhawk172 Nov 27, 2024
bd2f943
Fixing NOTE in roman.rst
Skyhawk172 Nov 27, 2024
948d3f2
Fixing NOTE in roman.rst
Skyhawk172 Nov 27, 2024
25bd96b
support for new sensing point and target phase map
obi-wan76 Nov 30, 2024
545d583
build(deps): update ipython requirement
dependabot[bot] Dec 1, 2024
6937630
increase the required version of pysiaf that support the new NIRCAM a…
obi-wan76 Dec 1, 2024
7fd0fbc
this commit adress mperrin comments by adding a function to utils to…
obi-wan76 Dec 2, 2024
16d3312
this commit improve efficiency by reading a new field point only when…
obi-wan76 Dec 4, 2024
aec66ba
Merge pull request #937 from spacetelescope/new_WFSC_field_point
obi-wan76 Dec 4, 2024
6cad95d
Merge pull request #936 from Skyhawk172/readme_update
obi-wan76 Dec 4, 2024
f8a4b21
Include all dependabot updates
BradleySappington Dec 4, 2024
5103fd8
Merge branch 'develop' into dependabot/pip/ipython-gte-8.27.0-and-lt-…
BradleySappington Dec 4, 2024
3c1bccd
Merge pull request #939 from spacetelescope/dependabot/pip/ipython-gt…
BradleySappington Dec 4, 2024
d7ec70d
update monthly trending plot to allow shifted date ranges for display…
mperrin Dec 4, 2024
eadb24e
Merge pull request #943 from mperrin/monthly_plot_pad
obi-wan76 Dec 4, 2024
fbe2069
update readme with advisory
BradleySappington Dec 5, 2024
b25b569
remove hash
BradleySappington Dec 5, 2024
dd27973
try using warning
BradleySappington Dec 5, 2024
2fbe9ab
update warning
BradleySappington Dec 5, 2024
3c018c3
update warning
BradleySappington Dec 5, 2024
39a2169
formatting
BradleySappington Dec 5, 2024
94537f5
formatting
BradleySappington Dec 5, 2024
2c8affb
Merge pull request #944 from BradleySappington/readme_advise
obi-wan76 Dec 5, 2024
7283bbb
update MAST query for OPDs to also check FP6. And include field point…
mperrin Dec 6, 2024
0929727
Merge pull request #945 from mperrin/more_fp6
obi-wan76 Dec 6, 2024
97ab658
pre-release
BradleySappington Dec 9, 2024
15b6435
update relnotes.rst
BradleySappington Dec 9, 2024
f13cbd2
doc update
BradleySappington Dec 9, 2024
9568cd3
update phrasing, fix paste error
BradleySappington Dec 9, 2024
207f724
Merge pull request #947 from spacetelescope/version_release
obi-wan76 Dec 9, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ on:

jobs:
build:
uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@v1
uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@924441154cf3053034c6513d5e06c69d262fb9a6 # v1.13.0
with:
upload_to_pypi: ${{ (github.event_name == 'release') && (github.event.action == 'released') }}
secrets:
10 changes: 5 additions & 5 deletions .github/workflows/ci_workflows.yml
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ on: [push, pull_request]

jobs:
retrieve_cache:
uses: spacetelescope/webbpsf/.github/workflows/retrieve_cache.yml@develop
uses: spacetelescope/webbpsf/.github/workflows/retrieve_cache.yml@beda656c80a0254e6f80649d9c9c49235634522f # v1.4.0
with:
minimal: true
tests:
@@ -49,20 +49,20 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
with:
fetch-depth: 0

- name: Set up Python ${{ matrix.python }}
uses: actions/setup-python@v5
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: ${{ matrix.python }}

- name: Install Python dependencies
run: pip install tox tox-conda>=0.2

- name: Get WebbPSF Data
uses: actions/cache/restore@v4
uses: actions/cache/restore@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
with:
path: ${{ needs.retrieve_cache.outputs.cache_path }}
key: ${{ needs.retrieve_cache.outputs.cache_key }}
@@ -90,6 +90,6 @@ jobs:

- name: Upload coverage to codecov
if: ${{ contains(matrix.toxenv,'-cov') }}
uses: codecov/codecov-action@v2
uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
with:
file: ./coverage.xml
4 changes: 2 additions & 2 deletions .github/workflows/download_data.yml
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@
# - cron: "0 0 * * 0"
# jobs:
# download_webbpsf:
# uses: spacetelescope/webbpsf/.github/workflows/download_data.yml@develop
# uses: spacetelescope/webbpsf/.github/workflows/download_data.yml@beda656c80a0254e6f80649d9c9c49235634522f # v1.4.0
# with:
# minimal: true

@@ -81,7 +81,7 @@ jobs:
run: echo "version=$(cat ${{ steps.cache_path.outputs.cache_path }}/webbpsf-data/version.txt)" >> $GITHUB_OUTPUT
- id: cache_key
run: echo "cache_key=webbpsf-data-${{ (github.event_name == 'schedule' || github.event_name == 'release') && 'mini' || inputs.minimal && 'mini' || 'full' }}-${{ steps.version.outputs.version }}" >> $GITHUB_OUTPUT
- uses: actions/cache/save@v4
- uses: actions/cache/save@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
with:
path: ${{ runner.temp }}/data/
key: ${{ steps.cache_key.outputs.cache_key }}
4 changes: 2 additions & 2 deletions .github/workflows/retrieve_cache.yml
Original file line number Diff line number Diff line change
@@ -13,15 +13,15 @@
# ...
# jobs:
# webbpsf_data_cache_key:
# uses: spacetelescope/webbpsf/.github/workflows/retrieve_cache.yml@develop
# uses: spacetelescope/webbpsf/.github/workflows/retrieve_cache.yml@beda656c80a0254e6f80649d9c9c49235634522f # v1.4.0
# with:
# minimal: true
# tests:
# needs: [ webbpsf_data_cache_key ]
# steps:
# ...
# - name: retrieve WebbPSF data cache
# uses: actions/cache/restore@v4
# uses: actions/cache/restore@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
# with:
# path: ${{ runner.temp }}/webbpsf-data
# key: ${{ needs.webbpsf_data_cache_key.outputs.cache_key }}
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ dependencies = [
"scipy>=1.5.0",
"matplotlib>=3.2.0",
"astropy>=5.1.0",
"photutils>=1.10.0",
"photutils>=1.10.0,<2.0.0",
"poppy>=1.0.0",
"pysiaf>=0.19.1",
"synphot>=1.0.0",
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
astropy>=6.1.2,<6.2.0
ipython>=8.27.0,<8.28.0
ipython>=8.27.0,<8.30.0
matplotlib>=3.9.1,<3.10.0
numpy>=2.1.0,<2.2.0
photutils>=1.13.0,<1.14.0
photutils>=1.13.0,<2.0.0
poppy>=1.0.0
pysiaf>=0.22.0,<0.24.0
scipy>=1.14.0,<1.15.0
14 changes: 7 additions & 7 deletions webbpsf/tests/test_psfgrid.py
Original file line number Diff line number Diff line change
@@ -107,7 +107,7 @@ def test_all_detectors():

# Case 1: Shortwave -> check that only the SW detectors are applied for the SW filter
nir.filter = shortfilt
grid1 = nir.psf_grid(all_detectors=True, num_psfs=1, add_distortion=False, fov_pixels=1, oversample=2, verbose=False)
grid1 = nir.psf_grid(all_detectors=True, num_psfs=1, add_distortion=False, fov_pixels=4, oversample=2, verbose=False)
det_list = []
for hdu in grid1:
det_list.append(hdu.meta['detector'][0])
@@ -117,7 +117,7 @@ def test_all_detectors():

# Case 2: Longwave -> check that only the LW detectors are applied for the LW filter
nir.filter = longfilt
grid2 = nir.psf_grid(all_detectors=True, num_psfs=1, add_distortion=False, fov_pixels=1, oversample=2, verbose=False)
grid2 = nir.psf_grid(all_detectors=True, num_psfs=1, add_distortion=False, fov_pixels=4, oversample=2, verbose=False)
det_list = []
for hdu in grid2:
det_list.append(hdu.meta['detector'][0])
@@ -189,29 +189,29 @@ def test_nircam_errors():
# Shouldn't error - applying SW to SW and LW to LW
nir.filter = longfilt
nir.detector = longdet
nir.psf_grid(all_detectors=False, num_psfs=1, fov_pixels=1, detector_oversample=2, fft_oversample=2, verbose=False)
nir.psf_grid(all_detectors=False, num_psfs=1, fov_pixels=4, detector_oversample=2, fft_oversample=2, verbose=False)

nir.filter = shortfilt
nir.detector = shortdet
nir.psf_grid(all_detectors=False, num_psfs=1, fov_pixels=1, detector_oversample=2, fft_oversample=2, verbose=False)
nir.psf_grid(all_detectors=False, num_psfs=1, fov_pixels=4, detector_oversample=2, fft_oversample=2, verbose=False)

# Should error - Bad filter/detector combination (LW filt to SW det)
with pytest.raises(RuntimeError) as excinfo: # Errors inside calc_psf() call
nir.filter = longfilt
nir.detector = shortdet
nir.psf_grid(all_detectors=False, num_psfs=1, fov_pixels=1, verbose=False) # error
nir.psf_grid(all_detectors=False, num_psfs=1, fov_pixels=4, verbose=False) # error
assert 'RuntimeError' in str(excinfo)

# Should error - Bad filter/detector combination (SW filt to LW det)
with pytest.raises(RuntimeError) as excinfo: # Errors inside calc_psf() call
nir.filter = shortfilt
nir.detector = longdet
nir.psf_grid(all_detectors=False, num_psfs=1, fov_pixels=1, verbose=False) # error
nir.psf_grid(all_detectors=False, num_psfs=1, fov_pixels=4, verbose=False) # error
assert 'RuntimeError' in str(excinfo)

# Should error - Bad num_psfs entry (must be a square number)
with pytest.raises(ValueError) as excinfo:
nir.psf_grid(all_detectors=False, num_psfs=2, fov_pixels=1, verbose=False) # error
nir.psf_grid(all_detectors=False, num_psfs=2, fov_pixels=4, verbose=False) # error
assert 'ValueError' in str(excinfo)