From 349e7256f1648cf30f829ef5d40e7fb4abc4bb76 Mon Sep 17 00:00:00 2001 From: buddhasystem Date: Fri, 19 Apr 2024 16:27:54 -0400 Subject: [PATCH 1/5] Set the LUSEEPY variable in the Dockerfile, re-enabled on line in the CI for starters. --- .github/workflows/luseepy-test.yml | 10 +++++----- docker/Dockerfile-unity-luseepy | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/luseepy-test.yml b/.github/workflows/luseepy-test.yml index 6b06ab7..3aeffd1 100644 --- a/.github/workflows/luseepy-test.yml +++ b/.github/workflows/luseepy-test.yml @@ -2,9 +2,9 @@ name: luseepy-test on: # Triggers the workflow on push or pull request events but only for the main branch push: - branches: [ main ] + branches: [ maxim-ci ] pull_request: - branches: [ main ] + branches: [ maxim-ci ] # Enable manual activation, too workflow_dispatch: @@ -15,13 +15,13 @@ jobs: PYTHONPATH: .:.. LUSEE_DRIVE_DIR: Drive LUSEE_OUTPUT_DIR: ./output - container: lusee/lusee-night-unity-luseepy:1.0 + container: lusee/lusee-night-unity-luseepy:1.2 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - run: wget "https://drive.google.com/uc?export=download&id=1cdKZpq81DmLBy_gbGy-DpNYXbvnQAJG9" -O drive.tgz - run: tar zxvf drive.tgz - run: ls -l -# - run: python tests/LunarCalendarTest.py -v + - run: python tests/LunarCalendarTest.py -v # - run: python tests/CoordTest.py # - run: python tests/SimTest.py # - run: cd simulation; ln -s ../Drive .; mkdir output; python driver/run_sim.py config/example.yaml; ls -l output diff --git a/docker/Dockerfile-unity-luseepy b/docker/Dockerfile-unity-luseepy index bed4161..bdbd90d 100644 --- a/docker/Dockerfile-unity-luseepy +++ b/docker/Dockerfile-unity-luseepy @@ -25,7 +25,8 @@ COPY lusee lusee COPY tests tests # ENV REFSPEC_PATH=/user/refspec -ENV PYTHONPATH=/user/luseepy:$PYTHONPATH +ENV LUSEEPY_PATH=/user/luseepy +ENV PYTHONPATH=$LUSEEPY_PATH:$PYTHONPATH ENV LUSEE_DRIVE_DIR=/data/ # CMD ["bash"] From 1ab7266cec6d9f8f08b0eec57b3271069cadb284 Mon Sep 17 00:00:00 2001 From: buddhasystem Date: Fri, 19 Apr 2024 16:35:30 -0400 Subject: [PATCH 2/5] Added two more tests to the CI block in the workflow section --- .github/workflows/luseepy-test.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/luseepy-test.yml b/.github/workflows/luseepy-test.yml index 3aeffd1..db369e2 100644 --- a/.github/workflows/luseepy-test.yml +++ b/.github/workflows/luseepy-test.yml @@ -1,6 +1,6 @@ name: luseepy-test on: - # Triggers the workflow on push or pull request events but only for the main branch + # TBD -- needs to be triggered on all branches, keep one for dev purposes for now push: branches: [ maxim-ci ] pull_request: @@ -18,11 +18,12 @@ jobs: container: lusee/lusee-night-unity-luseepy:1.2 steps: - uses: actions/checkout@v4 + - run: pwd - run: wget "https://drive.google.com/uc?export=download&id=1cdKZpq81DmLBy_gbGy-DpNYXbvnQAJG9" -O drive.tgz - run: tar zxvf drive.tgz - run: ls -l - run: python tests/LunarCalendarTest.py -v -# - run: python tests/CoordTest.py -# - run: python tests/SimTest.py + - run: python tests/CoordTest.py + - run: python tests/SimTest.py # - run: cd simulation; ln -s ../Drive .; mkdir output; python driver/run_sim.py config/example.yaml; ls -l output # - run: python tests/SimReadTest.py simulation/output/sim_example.fits From 1712c2a3233bc24ab294f0a36f637b38e62a5a78 Mon Sep 17 00:00:00 2001 From: buddhasystem Date: Fri, 19 Apr 2024 16:48:20 -0400 Subject: [PATCH 3/5] Added the two remaining entries in CI --- .github/workflows/luseepy-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/luseepy-test.yml b/.github/workflows/luseepy-test.yml index db369e2..b181e5e 100644 --- a/.github/workflows/luseepy-test.yml +++ b/.github/workflows/luseepy-test.yml @@ -25,5 +25,5 @@ jobs: - run: python tests/LunarCalendarTest.py -v - run: python tests/CoordTest.py - run: python tests/SimTest.py -# - run: cd simulation; ln -s ../Drive .; mkdir output; python driver/run_sim.py config/example.yaml; ls -l output -# - run: python tests/SimReadTest.py simulation/output/sim_example.fits + - run: cd simulation; ln -s ../Drive .; mkdir output; python driver/run_sim.py config/example.yaml; ls -l output + - run: python tests/SimReadTest.py simulation/output/sim_example.fits From 050d7b355724e53e14ea58f135f04b6a17443e01 Mon Sep 17 00:00:00 2001 From: buddhasystem Date: Thu, 25 Apr 2024 09:42:08 +0200 Subject: [PATCH 4/5] Corrected the link for the CI data file d/l, to point to an updated version --- .github/workflows/luseepy-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/luseepy-test.yml b/.github/workflows/luseepy-test.yml index b181e5e..fb25dff 100644 --- a/.github/workflows/luseepy-test.yml +++ b/.github/workflows/luseepy-test.yml @@ -19,7 +19,7 @@ jobs: steps: - uses: actions/checkout@v4 - run: pwd - - run: wget "https://drive.google.com/uc?export=download&id=1cdKZpq81DmLBy_gbGy-DpNYXbvnQAJG9" -O drive.tgz + - run: wget "https://drive.google.com/uc?export=download&id=1PbU432IYAFSzOjWRrKMoGFR6F1M3dmaV" -O drive.tgz - run: tar zxvf drive.tgz - run: ls -l - run: python tests/LunarCalendarTest.py -v From 662b877fa1deac21481171a74f28e35f77eeb2e7 Mon Sep 17 00:00:00 2001 From: buddhasystem Date: Thu, 25 Apr 2024 09:53:13 +0200 Subject: [PATCH 5/5] Added the link to RTD to the top of README. --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index fc10c6d..b60f776 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,9 @@ ## About A set of python utilities for performing various LuSEE-Night related calculations. +## Documentation + +This software is documented on the ["Read the Docs" pages](https://luseepy.readthedocs.io/en/latest/) ## Cached Data