From 6932e9bb64e07aac3c05e3e7dd4f409cd2baaa81 Mon Sep 17 00:00:00 2001 From: Sebastian Gomez Date: Wed, 15 May 2024 11:06:16 -0400 Subject: [PATCH 1/3] Updated version of STIPS and WebbPSF --- CHANGES.rst | 5 +++++ docs/installation.rst | 2 +- environment.yml | 2 +- environment_dev.yml | 2 +- setup.cfg | 4 ++-- stips/__init__.py | 2 +- 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index b107841..cae5398 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,11 @@ Release Notes Version History and Change Log ------------------------------ +Version 2.2.1 +============= +- Fixed a bug on the version of STIPS in __init__.py +- Updated WebbPSF version to be >= 1.1.1 instead of == 1.1.1 + Version 2.2.0 ============= - Added a functionality to allow for faster simulations of extended sources. diff --git a/docs/installation.rst b/docs/installation.rst index 07c4d65..f5c4249 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -11,7 +11,7 @@ STIPS Requirements * ``pandeia>=3.1``: Exposure time calculator. -* ``webbpsf==1.1.1``: Nancy Grace Roman PSF calculator. STIPS also requires that ``poppy``, a +* ``webbpsf>=1.1.1``: Nancy Grace Roman PSF calculator. STIPS also requires that ``poppy``, a support package used by WebbPSF, have version ``>=1.0.3``. * ``astropy``: STIPS uses Astropy in order to: diff --git a/environment.yml b/environment.yml index 35558f8..ae15294 100644 --- a/environment.yml +++ b/environment.yml @@ -35,7 +35,7 @@ dependencies: - poppy==1.0.3 # Core Modules - - webbpsf==1.1.1 + - webbpsf>=1.1.1 - pandeia.engine==3.1 - synphot==1.1.1 - stsynphot==1.1.0 diff --git a/environment_dev.yml b/environment_dev.yml index 5e94022..1d18aa0 100644 --- a/environment_dev.yml +++ b/environment_dev.yml @@ -44,7 +44,7 @@ dependencies: - poppy==1.0.3 # Core Modules - - webbpsf==1.1.1 + - webbpsf>=1.1.1 - pandeia.engine==3.1 - synphot==1.1.1 - stsynphot==1.1.0 diff --git a/setup.cfg b/setup.cfg index 5688f7e..22873f8 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,7 +1,7 @@ [metadata] name = stips # version should be PEP440 compatible (https://www.python.org/dev/peps/pep-0440/) -version = 2.2.0 +version = 2.2.1 author = Space Telescope Science Institute author_email = york@stsci.edu description = STIPS is the Space Telescope Imaging Product Simulator. @@ -23,7 +23,7 @@ install_requires = photutils synphot==1.1.1 stsynphot==1.1.0 - webbpsf==1.1.1 + webbpsf>=1.1.1 pandeia.engine==3.1 montage-wrapper pyyaml diff --git a/stips/__init__.py b/stips/__init__.py index 7c64987..77fe55e 100755 --- a/stips/__init__.py +++ b/stips/__init__.py @@ -4,7 +4,7 @@ __all__ = ['observation_module', 'scene_module'] -__version__ = "2.1.0" +__version__ = "2.2.1" version = __version__ from .utilities import SetupDataPaths From 85343813e688479c31af31a8ddaf43dc9c1a3a54 Mon Sep 17 00:00:00 2001 From: Sebastian Gomez Date: Wed, 15 May 2024 13:20:34 -0400 Subject: [PATCH 2/3] Updated the synphot and stsynphot versions. --- docs/release.rst | 2 +- environment.yml | 4 ++-- environment_dev.yml | 4 ++-- setup.cfg | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/release.rst b/docs/release.rst index 491b8e2..ae050b3 100644 --- a/docs/release.rst +++ b/docs/release.rst @@ -16,7 +16,7 @@ In addition to addressing any byproducts of the code review, you should be able to answer "yes" to all of the following questions before merging a pull request intended for a release: -* Has ``setup.cfg`` been updated to reflect the release's new version number? +* Have ``setup.cfg`` and ``stips/__init__.py`` been updated to reflect the release's new version number? * If any dependencies have changed, have you updated them in all applicable files? These include: diff --git a/environment.yml b/environment.yml index ae15294..fa1c48d 100644 --- a/environment.yml +++ b/environment.yml @@ -37,8 +37,8 @@ dependencies: # Core Modules - webbpsf>=1.1.1 - pandeia.engine==3.1 - - synphot==1.1.1 - - stsynphot==1.1.0 + - synphot>=1.1.1 + - stsynphot>=1.1.0 - soc_roman_tools # Major modules diff --git a/environment_dev.yml b/environment_dev.yml index 1d18aa0..3072adb 100644 --- a/environment_dev.yml +++ b/environment_dev.yml @@ -46,8 +46,8 @@ dependencies: # Core Modules - webbpsf>=1.1.1 - pandeia.engine==3.1 - - synphot==1.1.1 - - stsynphot==1.1.0 + - synphot>=1.1.1 + - stsynphot>=1.1.0 - soc_roman_tools # Major modules diff --git a/setup.cfg b/setup.cfg index 22873f8..424d90a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -21,8 +21,8 @@ install_requires = numpy scipy photutils - synphot==1.1.1 - stsynphot==1.1.0 + synphot>=1.1.1 + stsynphot>=1.1.0 webbpsf>=1.1.1 pandeia.engine==3.1 montage-wrapper From 9a024bd5d371bf79bfb596dafccd485dff280498 Mon Sep 17 00:00:00 2001 From: Sebastian Gomez Date: Wed, 15 May 2024 13:51:34 -0400 Subject: [PATCH 3/3] Update synphot on updates. --- CHANGES.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.rst b/CHANGES.rst index cae5398..84458bd 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -9,6 +9,7 @@ Version 2.2.1 ============= - Fixed a bug on the version of STIPS in __init__.py - Updated WebbPSF version to be >= 1.1.1 instead of == 1.1.1 +- Updated synphot>=1.1.1 and stsynphot>=1.1.0 from forced to specific version. Version 2.2.0 =============