diff --git a/.github/workflows/build_container.yaml b/.github/workflows/build_container.yaml index 9da2e85e..3af219a7 100644 --- a/.github/workflows/build_container.yaml +++ b/.github/workflows/build_container.yaml @@ -31,9 +31,10 @@ jobs: run: | mamba install --quiet --file=requirements.txt mamba install --quiet --file=test-requirements.txt + pip install lsst.resources mamba list rubin-scheduler | grep -v "#" | awk '{print $2}' > ${{ github.workspace }}/rs_version echo "rs-version" `cat ${{ github.workspace }}/rs_version` - echo "rs-version=`cat ${{ github.workspace }}/rs_version`" >> $GITHUB_OUTPUT + echo "rs-version=`cat ${{ github.workspace }}/rs_version`" >> $GITHUB_OUTPUT - name: Access rubin-sched-data cache id: cache-rs @@ -77,10 +78,3 @@ jobs: echo Pushed ghcr.io/${{ github.repository }}:${{ steps.build.outputs.tag }} echo Fully qualified image digest: ${{ steps.build.outputs.fully_qualified_image_digest }} echo Tag of the image: ${{ steps.build.outputs.tag }} - - - - - - - diff --git a/.github/workflows/test_and_build.yaml b/.github/workflows/test_and_build.yaml index 4cb3494b..576e5842 100644 --- a/.github/workflows/test_and_build.yaml +++ b/.github/workflows/test_and_build.yaml @@ -42,9 +42,10 @@ jobs: run: | mamba install --quiet --file=requirements.txt mamba install --quiet --file=test-requirements.txt + pip install lsst.resources mamba list rubin-scheduler | grep -v "#" | awk '{print $2}' > ${{ github.workspace }}/rs_version echo "rs-version" `cat ${{ github.workspace }}/rs_version` - echo "rs-version=`cat ${{ github.workspace }}/rs_version`" >> $GITHUB_OUTPUT + echo "rs-version=`cat ${{ github.workspace }}/rs_version`" >> $GITHUB_OUTPUT - name: Access rubin-sched-data cache id: cache-rs @@ -115,4 +116,4 @@ jobs: uses: pypa/gh-action-pypi-publish@release/v1 with: user: __token__ - password: ${{ secrets.SP_PYPI_UPLOADS }} \ No newline at end of file + password: ${{ secrets.SP_PYPI_UPLOADS }} diff --git a/container_environment.yaml b/container_environment.yaml index 04854660..9cb26cea 100644 --- a/container_environment.yaml +++ b/container_environment.yaml @@ -15,5 +15,7 @@ dependencies: - uranography - param - git - - pip - wget + - pip + - pip: + - lsst.resources diff --git a/environment.yaml b/environment.yaml index af71c5e7..ee4bc211 100644 --- a/environment.yaml +++ b/environment.yaml @@ -10,3 +10,6 @@ dependencies: - firefox - geckodriver - build + - pip + - pip: + - lsst.resources diff --git a/pyproject.toml b/pyproject.toml index 5f950ece..772f14d0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,6 +34,7 @@ dependencies = [ "param", "pytz", "rubin-scheduler", + "lsst.resounces", "uranography >= 1.1.0 ", ] diff --git a/requirements.txt b/requirements.txt index 703828a4..86c1bd96 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,3 +11,4 @@ param pytz uranography rubin-scheduler +pip