From 4addd40e5bd3f56606cec5056dccf1ac00790740 Mon Sep 17 00:00:00 2001 From: Brian Cherinka Date: Thu, 2 Nov 2023 13:58:40 -0400 Subject: [PATCH 1/4] updating for ipl3 --- CHANGELOG.rst | 6 +++++- docs/sphinx/path_defs.rst | 9 +++++++++ docs/sphinx/path_evolution.rst | 4 ++++ docs/sphinx/paths.rst | 1 + 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 845b067..a82f566 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,9 +6,13 @@ Change Log This document records the main changes to the sdss_access code. -3.0.2 (unreleased) +3.0.3 (unreleased) +------------------ + +3.0.2 (11-2-2023) ------------------ - Add support for .fz compression +- Release for IPL-3 3.0.1 (2023-06-17) ------------------ diff --git a/docs/sphinx/path_defs.rst b/docs/sphinx/path_defs.rst index ddeb68d..bf3bc24 100644 --- a/docs/sphinx/path_defs.rst +++ b/docs/sphinx/path_defs.rst @@ -132,4 +132,13 @@ IPL2 .. datamodel:: sdss_access.path.path:Path :prog: IPL2 + :templates: + +.. _ipl3: + +IPL3 +---- + +.. datamodel:: sdss_access.path.path:Path + :prog: IPL3 :templates: \ No newline at end of file diff --git a/docs/sphinx/path_evolution.rst b/docs/sphinx/path_evolution.rst index 5764e09..dd62fe2 100644 --- a/docs/sphinx/path_evolution.rst +++ b/docs/sphinx/path_evolution.rst @@ -56,6 +56,10 @@ Internal Data Releases Internal Product Launches (IPLs) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.. changelog:: sdss_access.path.changelog:compute_changelog + :prog: changes + :drs: ipl3, ipl2 + .. changelog:: sdss_access.path.changelog:compute_changelog :prog: changes :drs: ipl2, ipl1 diff --git a/docs/sphinx/paths.rst b/docs/sphinx/paths.rst index 85d41c6..b13b7cd 100644 --- a/docs/sphinx/paths.rst +++ b/docs/sphinx/paths.rst @@ -30,6 +30,7 @@ Internal SDSS Release Paths * :ref:`IPL-1 ` - Internal Product Launch 1 * :ref:`IPL-2 ` - Internal Product Launch 2 +* :ref:`IPL-3 ` - Internal Product Launch 3 Latest Path Evolution From 4dfe3de500ae916cd032fe5296ff6ba310a4b31c Mon Sep 17 00:00:00 2001 From: Brian Cherinka Date: Thu, 2 Nov 2023 15:29:37 -0400 Subject: [PATCH 2/4] fixing broken test --- tests/path/test_sdss5.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/path/test_sdss5.py b/tests/path/test_sdss5.py index 7309363..317b3d8 100644 --- a/tests/path/test_sdss5.py +++ b/tests/path/test_sdss5.py @@ -67,7 +67,7 @@ def test_special_function(self, path, name, special, keys, exp): assert exp in full @pytest.mark.parametrize('name, keys', [('specLite', ['fieldid', 'catalogid', 'run2d', 'mjd']), - ('mwmStar', ['cat_id', 'apred', 'v_astra', 'component', 'run2d']),]) + ('mwmStar', ['component', 'sdss_id', 'v_astra']),]) def test_lookup_keys(self, path, name, keys): realkeys = path.lookup_keys(name) assert set(keys) == set(realkeys) From d00e553f4ea9606c26343859ffcc16a6e9029aa5 Mon Sep 17 00:00:00 2001 From: Brian Cherinka Date: Thu, 2 Nov 2023 15:36:07 -0400 Subject: [PATCH 3/4] =?UTF-8?q?Bump=20version:=203.0.2dev=20=E2=86=92=203.?= =?UTF-8?q?0.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- setup.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 369b927..081e14b 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.0.2dev +current_version = 3.0.2 commit = True tag = False tag_name = {new_version} diff --git a/setup.cfg b/setup.cfg index b846540..9ebb59e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = sdss-access -version = 3.0.2dev +version = 3.0.2 author = Brian Cherinka author_email = bcherinka@stsci.edu description = Package to dynamically build filepaths and access all SDSS SAS products From 1b0682acfb42364948ccb1d13e52c67d358bf5c3 Mon Sep 17 00:00:00 2001 From: Brian Cherinka Date: Thu, 2 Nov 2023 15:36:37 -0400 Subject: [PATCH 4/4] =?UTF-8?q?Bump=20version:=203.0.2=20=E2=86=92=203.0.3?= =?UTF-8?q?dev?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- setup.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 081e14b..6bb7760 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.0.2 +current_version = 3.0.3dev commit = True tag = False tag_name = {new_version} diff --git a/setup.cfg b/setup.cfg index 9ebb59e..1b4a20d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = sdss-access -version = 3.0.2 +version = 3.0.3dev author = Brian Cherinka author_email = bcherinka@stsci.edu description = Package to dynamically build filepaths and access all SDSS SAS products