From 778203869ef34502afdfc8330a2f9fce92626748 Mon Sep 17 00:00:00 2001 From: kyle-cochran Date: Wed, 14 Feb 2024 11:51:49 -0800 Subject: [PATCH] chore: bump ostk physics to 5.1 (#347) * chore: bump ostk physics to 5.1 * fix: make seed data use API v1 --- bindings/python/requirements.txt | 2 +- docker/development/Dockerfile | 4 ++-- docker/jupyter/Dockerfile | 2 +- docker/release/Dockerfile | 11 +++-------- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/bindings/python/requirements.txt b/bindings/python/requirements.txt index e9ce0b6fd..d6a37ed0c 100644 --- a/bindings/python/requirements.txt +++ b/bindings/python/requirements.txt @@ -1,3 +1,3 @@ # Apache License 2.0 -open-space-toolkit-physics~=5.0.1 +open-space-toolkit-physics~=5.1.0 diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile index 25f79a996..030acf396 100644 --- a/docker/development/Dockerfile +++ b/docker/development/Dockerfile @@ -144,7 +144,7 @@ RUN mkdir -p /tmp/open-space-toolkit-mathematics \ ## Open Space Toolkit ▸ Physics ARG OSTK_PHYSICS_MAJOR="5" -ARG OSTK_PHYSICS_MINOR="0" +ARG OSTK_PHYSICS_MINOR="1" ## Force an image rebuild when new Physics patch versions are detected ADD https://api.github.com/repos/open-space-collective/open-space-toolkit-physics/git/matching-refs/tags/${OSTK_PHYSICS_MAJOR}.${OSTK_PHYSICS_MINOR} /tmp/open-space-toolkit-physics/versions.json @@ -159,7 +159,7 @@ RUN mkdir -p /tmp/open-space-toolkit-physics \ # Install seed data -RUN git clone --branch main --single-branch --depth=1 https://github.com/open-space-collective/open-space-toolkit-data.git /var/cache/open-space-toolkit-data +RUN git clone --branch v1 --single-branch --depth=1 https://github.com/open-space-collective/open-space-toolkit-data.git /var/cache/open-space-toolkit-data ENV OSTK_PHYSICS_DATA_LOCAL_REPOSITORY="/var/cache/open-space-toolkit-data/data" diff --git a/docker/jupyter/Dockerfile b/docker/jupyter/Dockerfile index c69106135..dc23df49b 100644 --- a/docker/jupyter/Dockerfile +++ b/docker/jupyter/Dockerfile @@ -29,7 +29,7 @@ RUN chown -R ${NB_UID}:${NB_GID} /home/jovyan # Install seed data -RUN git clone --branch main --single-branch --depth=1 https://github.com/open-space-collective/open-space-toolkit-data.git /var/cache/open-space-toolkit-data +RUN git clone --branch v1 --single-branch --depth=1 https://github.com/open-space-collective/open-space-toolkit-data.git /var/cache/open-space-toolkit-data ENV OSTK_PHYSICS_DATA_LOCAL_REPOSITORY="/var/cache/open-space-toolkit-data/data" diff --git a/docker/release/Dockerfile b/docker/release/Dockerfile index 9f0ee951f..1ddba4be0 100644 --- a/docker/release/Dockerfile +++ b/docker/release/Dockerfile @@ -31,14 +31,9 @@ ENV LD_LIBRARY_PATH="/usr/local/lib" # Install seed data -RUN git clone --branch main --single-branch --depth=1 https://github.com/open-space-collective/open-space-toolkit-data.git /var/cache/open-space-toolkit-data +RUN git clone --branch v1 --single-branch --depth=1 https://github.com/open-space-collective/open-space-toolkit-data.git /var/cache/open-space-toolkit-data -ENV OSTK_PHYSICS_COORDINATE_FRAME_PROVIDERS_IERS_MANAGER_LOCAL_REPOSITORY="/var/cache/open-space-toolkit-data/data/coordinate/frame/providers/iers" -ENV OSTK_PHYSICS_ENVIRONMENT_EPHEMERIDES_SPICE_MANAGER_LOCAL_REPOSITORY="/var/cache/open-space-toolkit-data/data/environment/ephemerides/spice" -ENV OSTK_PHYSICS_ENVIRONMENT_GRAVITATIONAL_EARTH_MANAGER_LOCAL_REPOSITORY="/var/cache/open-space-toolkit-data/data/environment/gravitational/earth" -ENV OSTK_PHYSICS_ENVIRONMENT_MAGNETIC_EARTH_MANAGER_LOCAL_REPOSITORY="/var/cache/open-space-toolkit-data/data/environment/magnetic/earth" -ENV OSTK_PHYSICS_ENVIRONMENT_ATMOSPHERIC_EARTH_MANAGER_LOCAL_REPOSITORY="/var/cache/open-space-toolkit-data/data/environment/atmospheric/earth" -ENV OSTK_PHYSICS_DATA_MANIFEST_LOCAL_REPOSITORY="/var/cache/open-space-toolkit-data/data" +ENV OSTK_PHYSICS_DATA_LOCAL_REPOSITORY="/var/cache/open-space-toolkit-data/data" COPY --from=cpp-builder /usr/local/include/OpenSpaceToolkit /usr/local/include/OpenSpaceToolkit COPY --from=cpp-builder /usr/local/lib/libopen-space-toolkit-astrodynamics.* /usr/local/lib/ @@ -65,7 +60,7 @@ RUN pip install ipython numpy # Install seed data -RUN git clone --branch main --single-branch --depth=1 https://github.com/open-space-collective/open-space-toolkit-data.git /var/cache/open-space-toolkit-data +RUN git clone --branch v1 --single-branch --depth=1 https://github.com/open-space-collective/open-space-toolkit-data.git /var/cache/open-space-toolkit-data ENV OSTK_PHYSICS_DATA_LOCAL_REPOSITORY="/var/cache/open-space-toolkit-data/data"