From ef86f309f30824ed0284dcc02ade86bb34ca4967 Mon Sep 17 00:00:00 2001 From: Tim Jenness Date: Thu, 5 Dec 2024 13:30:35 -0700 Subject: [PATCH 1/2] Fix access_format to refer to datalink not fits --- configs/dc2.yaml | 8 ++++---- configs/dp02.yaml | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/configs/dc2.yaml b/configs/dc2.yaml index c027949..01c2b79 100644 --- a/configs/dc2.yaml +++ b/configs/dc2.yaml @@ -9,7 +9,7 @@ dataset_types: calib_level: 1 obs_id_fmt: "{records[exposure].obs_id}" o_ucd: phot.count - access_format: image/fits + access_format: "application/x-votable+xml;content=datalink" datalink_url_fmt: "http://datalink.org/{obs_id}" calexp: dataproduct_type: image @@ -17,7 +17,7 @@ dataset_types: calib_level: 2 obs_id_fmt: "{records[visit].name}" o_ucd: phot.count - access_format: image/fits + access_format: "application/x-votable+xml;content=datalink" datalink_url_fmt: "http://datalink.org/{obs_id}" deepCoadd_calexp: dataproduct_type: image @@ -25,14 +25,14 @@ dataset_types: calib_level: 3 obs_id_fmt: "{skymap}-{tract}-{patch}" o_ucd: phot.count - access_format: image/fits + access_format: "application/x-votable+xml;content=datalink" datalink_url_fmt: "http://datalink.org/{obs_id}" deepCoadd_forced_src: dataproduct_type: measurements dataproduct_subtype: lsst.deepCoadd_forced_src calib_level: 3 obs_id_fmt: "{skymap}-{tract}-{patch}" - access_format: application/x-votable+xml;content=datalink + access_format: "application/x-votable+xml;content=datalink" datalink_url_fmt: "http://datalink.org/{obs_id}" spectral_ranges: "u": [330.0e-9, 400.0e-9] diff --git a/configs/dp02.yaml b/configs/dp02.yaml index b4d18ab..8fcb781 100644 --- a/configs/dp02.yaml +++ b/configs/dp02.yaml @@ -9,7 +9,7 @@ dataset_types: calib_level: 1 obs_id_fmt: "{records[exposure].obs_id}-{records[detector].full_name}" o_ucd: phot.count - access_format: image/fits + access_format: "application/x-votable+xml;content=datalink" datalink_url_fmt: "https://data.lsst.cloud/api/datalink/links?ID=butler%3A//dp02/{id}" calexp: dataproduct_type: image @@ -17,7 +17,7 @@ dataset_types: calib_level: 2 obs_id_fmt: "{records[visit].name}-{records[detector].full_name}" o_ucd: phot.count - access_format: image/fits + access_format: "application/x-votable+xml;content=datalink" datalink_url_fmt: "https://data.lsst.cloud/api/datalink/links?ID=butler%3A//dp02/{id}" deepCoadd_calexp: dataproduct_type: image @@ -25,7 +25,7 @@ dataset_types: calib_level: 3 obs_id_fmt: "{skymap}-{tract}-{patch}" o_ucd: phot.count - access_format: image/fits + access_format: "application/x-votable+xml;content=datalink" datalink_url_fmt: "https://data.lsst.cloud/api/datalink/links?ID=butler%3A//dp02/{id}" goodSeeingCoadd: dataproduct_type: image @@ -33,7 +33,7 @@ dataset_types: calib_level: 3 obs_id_fmt: "{skymap}-{tract}-{patch}" o_ucd: phot.count - access_format: image/fits + access_format: "application/x-votable+xml;content=datalink" datalink_url_fmt: "https://data.lsst.cloud/api/datalink/links?ID=butler%3A//dp02/{id}" goodSeeingDiff_differenceExp: dataproduct_type: image @@ -41,7 +41,7 @@ dataset_types: calib_level: 3 obs_id_fmt: "{records[visit].name}-{records[detector].full_name}" o_ucd: phot.count - access_format: image/fits + access_format: "application/x-votable+xml;content=datalink" datalink_url_fmt: "https://data.lsst.cloud/api/datalink/links?ID=butler%3A//dp02/{id}" extra_columns: lsst_visit: From b57a61c0830b72346e92f6583aacc50ef79caf77 Mon Sep 17 00:00:00 2001 From: Tim Jenness Date: Thu, 5 Dec 2024 13:36:00 -0700 Subject: [PATCH 2/2] Add --no-deps to docs pip install --- .github/workflows/build_docs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_docs.yaml b/.github/workflows/build_docs.yaml index 7275bf7..afd2d4f 100644 --- a/.github/workflows/build_docs.yaml +++ b/.github/workflows/build_docs.yaml @@ -35,7 +35,7 @@ jobs: uv pip install --system -r requirements.txt - name: Build and install - run: uv pip install --system -v . + run: uv pip install --system -v --no-deps . - name: Install documenteer run: uv pip install --system 'documenteer[pipelines]==0.8.2'