From da69a5680ac763b82705f7d7c554d77afb8bcdb5 Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 6 Dec 2023 13:49:00 -0600 Subject: [PATCH 01/12] Add config file for controlling lab components --- .github/workflows/docker.yml | 32 +++++++++++++++++++++++++++++++- CHANGELOG.md | 3 +++ Dockerfile.lab | 11 ++++++----- config.yml | 8 ++++++++ 4 files changed, 48 insertions(+), 6 deletions(-) create mode 100644 config.yml diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 792fd07..000f427 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -36,7 +36,21 @@ jobs: # checkout source code - uses: actions/checkout@v3 - # calculate some variables that are used later + # calculate component version information + - name: component version information + run: | + INCORE_VERSION=$(cat config.yml | grep "IN-CORE" | head -1 | awk -F= "{print $2 }" | sed "s/[[:alpha:]|,|-|\"|:|#|[:space:]]//g" | sed "s/-//g") + PYINCORE_VERSION=$(cat config.yml | grep "PyIncore" | head -1 | awk -F= "{print $2 }" | sed "s/[[:alpha:]|,|-|\"|:|#|[:space:]]//g" | sed "s/-//g") + PYINCORE_VIZ_VERSION=$(cat config.yml | grep "PyIncore-Viz" | head -1 | awk -F= "{print $2 }" | sed "s/[[:alpha:]|,|-|\"|:|#|[:space:]]//g" | sed "s/-//g") + PYINCORE_DATA_VERSION=$(cat config.yml | grep "PyIncore-Data" | head -1 | awk -F= "{print $2 }" | sed "s/[[:alpha:]|,|-|\"|:|#|[:space:]]//g" | sed "s/-//g") + CHANNEL=$(cat config.yml | grep "Channel" | head -1 | awk -F= "{print $2 }" | sed "s/[[:alpha:]|,|-|\"|:|#|[:space:]]//g" | sed "s/-//g") + echo "INCORE_VERSION=${INCORE_VERSION}" >> $GITHUB_ENV + echo "PYINCORE_VERSION=${PYINCORE_VERSION}" >> $GITHUB_ENV + echo "PYINCORE_VIZ_VERSION=${PYINCORE_VIZ_VERSION}" >> $GITHUB_ENV + echo "PYINCORE_DATA_VERSION=${PYINCORE_DATA_VERSION}" >> $GITHUB_ENV + echo "CHANNEL=${CHANNEL}" >> $GITHUB_ENV + + # calculate branch version information - name: version information run: | echo ${GITHUB_REF_NAME} @@ -118,6 +132,16 @@ jobs: echo "VERSION=${version}" >> $GITHUB_ENV echo "TAGS=${push_tags}" >> $GITHUB_ENV + # print version information + - name: Print Version information + run: | + echo "${{ env.TAGS }}" + echo "${{ env.INCORE_VERSION }}" + echo "${{ env.PYINCORE_VERSION }}" + echo "${{ env.PYINCORE_VIZ_VERSION }}" + echo "${{ env.PYINCORE_DATA_VERSION }}" + echo "${{ env.CHANNEL }}" + # setup docker build - name: Set up QEMU uses: docker/setup-qemu-action@v2 @@ -168,6 +192,12 @@ jobs: cache-from: type=gha,scope=${{ env.BRANCH }}-${{ matrix.name }} cache-to: type=gha,scope=${{ env.BRANCH }}-${{ matrix.name }},mode=max tags: ${{ env.TAGS }} + build-args: | + INCORE_VERSION=${{ env.INCORE_VERSION }} + PYINCORE_VERSION=${{ env.PYINCORE_VERSION }} + PYINCORE_VIZ_VERSION=${{ env.PYINCORE_VIZ_VERSION }} + PYINCORE_DATA_VERSION=${{ env.PYINCORE_DATA_VERSION }} + CHANNEL=${{ env.CHANNEL }} # update README at DockerHub # - name: Docker Hub Description diff --git a/CHANGELOG.md b/CHANGELOG.md index eb13b6c..81920b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] - +### Added +- Config file for controlling component versions and github action [#86](https://github.com/IN-CORE/incore-lab/issues/86) + ### Changed - DockerFile now uses libmamba installation to install python dependencies and github workflow is not run on ARM architecture [#75](https://github.com/IN-CORE/incore-lab/issues/75) diff --git a/Dockerfile.lab b/Dockerfile.lab index e33f7ae..e48e2a5 100644 --- a/Dockerfile.lab +++ b/Dockerfile.lab @@ -17,16 +17,17 @@ USER $NB_USER # IN-CORE variables, set these to control versions to be installed # use --build-arg CHANNEL=in-core/label/rc to install a RC version ARG CHANNEL="in-core" -ARG PYINCORE="1.14.0" -ARG PYINCORE_VIZ="1.8.4" -ARG PYINCORE_DATA="0.6.0" -ARG INCORE="4.7.0" +ARG PYINCORE="latest" +ARG PYINCORE_VIZ="latest" +ARG PYINCORE_DATA="latest" +ARG INCORE="latest" # store versions installed as environment variables ENV INCORE=${INCORE} \ PYINCORE=${PYINCORE} \ PYINCORE_VIZ=${PYINCORE_VIZ} \ - PYINCORE_DATA=${PYINCORE_DATA} + PYINCORE_DATA=${PYINCORE_DATA} \ + CHANNEL=${CHANNEL} # Set conda channels and solver RUN conda config --add channels conda-forge && \ diff --git a/config.yml b/config.yml new file mode 100644 index 0000000..9a16481 --- /dev/null +++ b/config.yml @@ -0,0 +1,8 @@ +title: "IN-CORE Lab component version information" +project: "IN-CORE Lab" +author: "Yong Wook Kim" +IN-CORE: "4.7.0" # Version form must be "x.x.x" +PyIncore: "1.14.0" +PyIncore-Viz: "1.8.4" +PyIncore-Data: "1.6.0" +Channel: "in-core" \ No newline at end of file From 99ffebf2272ebcde60e606fe3d336ae344eff363 Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 6 Dec 2023 13:53:57 -0600 Subject: [PATCH 02/12] added test echo line --- Dockerfile.lab | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Dockerfile.lab b/Dockerfile.lab index e48e2a5..c1a7610 100644 --- a/Dockerfile.lab +++ b/Dockerfile.lab @@ -35,6 +35,12 @@ RUN conda config --add channels conda-forge && \ conda install -c conda-forge conda-libmamba-solver && \ conda config --set solver libmamba +RUN echo ${CHANNEL} && \ + echo ${PYINCORE} && \ + echo ${PYINCORE_VIZ} && \ + echo ${PYINCORE_DATA} && \ + echo ${INCORE} + # install pyincore, pyincore-viz and other conda packages # mamba files installed will now have rw for others. Use find to collect # names of files installed and chane permissions. From c4e2f61f84d6459f365f5bf8a93709c884c995d6 Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 6 Dec 2023 13:59:25 -0600 Subject: [PATCH 03/12] modified env variable --- Dockerfile.lab | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile.lab b/Dockerfile.lab index c1a7610..97ab80e 100644 --- a/Dockerfile.lab +++ b/Dockerfile.lab @@ -23,11 +23,11 @@ ARG PYINCORE_DATA="latest" ARG INCORE="latest" # store versions installed as environment variables -ENV INCORE=${INCORE} \ - PYINCORE=${PYINCORE} \ - PYINCORE_VIZ=${PYINCORE_VIZ} \ - PYINCORE_DATA=${PYINCORE_DATA} \ - CHANNEL=${CHANNEL} +ENV INCORE=$INCORE \ + PYINCORE=$PYINCORE \ + PYINCORE_VIZ=$PYINCORE_VIZ \ + PYINCORE_DATA=$PYINCORE_DATA \ + CHANNEL=$CHANNEL # Set conda channels and solver RUN conda config --add channels conda-forge && \ From 3dce979f8b39e1c4ce8645890f3bfcbb781478f6 Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 6 Dec 2023 14:15:23 -0600 Subject: [PATCH 04/12] modified config file --- .github/workflows/docker.yml | 14 +++++++------- config.yml | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 000f427..515473c 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -39,16 +39,16 @@ jobs: # calculate component version information - name: component version information run: | + CHANNEL=$(cat config.yml | grep "Channel" | head -1 | awk -F= "{print $2 }" | sed "s/[[:alpha:]|,|-|\"|:|#|[:space:]]//g" | sed "s/-//g") INCORE_VERSION=$(cat config.yml | grep "IN-CORE" | head -1 | awk -F= "{print $2 }" | sed "s/[[:alpha:]|,|-|\"|:|#|[:space:]]//g" | sed "s/-//g") PYINCORE_VERSION=$(cat config.yml | grep "PyIncore" | head -1 | awk -F= "{print $2 }" | sed "s/[[:alpha:]|,|-|\"|:|#|[:space:]]//g" | sed "s/-//g") PYINCORE_VIZ_VERSION=$(cat config.yml | grep "PyIncore-Viz" | head -1 | awk -F= "{print $2 }" | sed "s/[[:alpha:]|,|-|\"|:|#|[:space:]]//g" | sed "s/-//g") PYINCORE_DATA_VERSION=$(cat config.yml | grep "PyIncore-Data" | head -1 | awk -F= "{print $2 }" | sed "s/[[:alpha:]|,|-|\"|:|#|[:space:]]//g" | sed "s/-//g") - CHANNEL=$(cat config.yml | grep "Channel" | head -1 | awk -F= "{print $2 }" | sed "s/[[:alpha:]|,|-|\"|:|#|[:space:]]//g" | sed "s/-//g") + echo "CHANNEL=${CHANNEL}" >> $GITHUB_ENV echo "INCORE_VERSION=${INCORE_VERSION}" >> $GITHUB_ENV echo "PYINCORE_VERSION=${PYINCORE_VERSION}" >> $GITHUB_ENV echo "PYINCORE_VIZ_VERSION=${PYINCORE_VIZ_VERSION}" >> $GITHUB_ENV echo "PYINCORE_DATA_VERSION=${PYINCORE_DATA_VERSION}" >> $GITHUB_ENV - echo "CHANNEL=${CHANNEL}" >> $GITHUB_ENV # calculate branch version information - name: version information @@ -136,11 +136,11 @@ jobs: - name: Print Version information run: | echo "${{ env.TAGS }}" + echo "${{ env.CHANNEL }}" echo "${{ env.INCORE_VERSION }}" echo "${{ env.PYINCORE_VERSION }}" echo "${{ env.PYINCORE_VIZ_VERSION }}" echo "${{ env.PYINCORE_DATA_VERSION }}" - echo "${{ env.CHANNEL }}" # setup docker build - name: Set up QEMU @@ -193,10 +193,10 @@ jobs: cache-to: type=gha,scope=${{ env.BRANCH }}-${{ matrix.name }},mode=max tags: ${{ env.TAGS }} build-args: | - INCORE_VERSION=${{ env.INCORE_VERSION }} - PYINCORE_VERSION=${{ env.PYINCORE_VERSION }} - PYINCORE_VIZ_VERSION=${{ env.PYINCORE_VIZ_VERSION }} - PYINCORE_DATA_VERSION=${{ env.PYINCORE_DATA_VERSION }} + INCORE=${{ env.INCORE_VERSION }} + PYINCORE=${{ env.PYINCORE_VERSION }} + PYINCORE_VIZ=${{ env.PYINCORE_VIZ_VERSION }} + PYINCORE_DATA=${{ env.PYINCORE_DATA_VERSION }} CHANNEL=${{ env.CHANNEL }} # update README at DockerHub diff --git a/config.yml b/config.yml index 9a16481..7507ab0 100644 --- a/config.yml +++ b/config.yml @@ -1,8 +1,8 @@ title: "IN-CORE Lab component version information" project: "IN-CORE Lab" author: "Yong Wook Kim" +Channel: "in-core" IN-CORE: "4.7.0" # Version form must be "x.x.x" PyIncore: "1.14.0" PyIncore-Viz: "1.8.4" -PyIncore-Data: "1.6.0" -Channel: "in-core" \ No newline at end of file +PyIncore-Data: "1.6.0" \ No newline at end of file From 80a3e06d72bbf90324419a9ab575fc273cdd43e3 Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 6 Dec 2023 14:19:26 -0600 Subject: [PATCH 05/12] changed grab command for channel --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 515473c..16c0150 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -39,7 +39,7 @@ jobs: # calculate component version information - name: component version information run: | - CHANNEL=$(cat config.yml | grep "Channel" | head -1 | awk -F= "{print $2 }" | sed "s/[[:alpha:]|,|-|\"|:|#|[:space:]]//g" | sed "s/-//g") + CHANNEL=$(cat config.yml | grep "Channel" | head -1 | awk -F ": " '{print $2}' | sed 's/["[:space:]]//g') INCORE_VERSION=$(cat config.yml | grep "IN-CORE" | head -1 | awk -F= "{print $2 }" | sed "s/[[:alpha:]|,|-|\"|:|#|[:space:]]//g" | sed "s/-//g") PYINCORE_VERSION=$(cat config.yml | grep "PyIncore" | head -1 | awk -F= "{print $2 }" | sed "s/[[:alpha:]|,|-|\"|:|#|[:space:]]//g" | sed "s/-//g") PYINCORE_VIZ_VERSION=$(cat config.yml | grep "PyIncore-Viz" | head -1 | awk -F= "{print $2 }" | sed "s/[[:alpha:]|,|-|\"|:|#|[:space:]]//g" | sed "s/-//g") From 3904cc1890fb8992580c7f59b04003062c03852c Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 6 Dec 2023 14:26:11 -0600 Subject: [PATCH 06/12] added version explanation --- config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config.yml b/config.yml index 7507ab0..65f64c5 100644 --- a/config.yml +++ b/config.yml @@ -2,7 +2,8 @@ title: "IN-CORE Lab component version information" project: "IN-CORE Lab" author: "Yong Wook Kim" Channel: "in-core" -IN-CORE: "4.7.0" # Version form must be "x.x.x" +# version form must be "x.x.x" +IN-CORE: "4.7.0" PyIncore: "1.14.0" PyIncore-Viz: "1.8.4" PyIncore-Data: "1.6.0" \ No newline at end of file From 3b3aa66121fea0628d6e63397136db68391a82e3 Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 6 Dec 2023 14:29:36 -0600 Subject: [PATCH 07/12] modified incore version grab command --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 16c0150..405328c 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -40,7 +40,7 @@ jobs: - name: component version information run: | CHANNEL=$(cat config.yml | grep "Channel" | head -1 | awk -F ": " '{print $2}' | sed 's/["[:space:]]//g') - INCORE_VERSION=$(cat config.yml | grep "IN-CORE" | head -1 | awk -F= "{print $2 }" | sed "s/[[:alpha:]|,|-|\"|:|#|[:space:]]//g" | sed "s/-//g") + INCORE_VERSION=$(cat config.yml | grep "IN-CORE" | head -1 | awk -F: '{print $2}' | sed 's/["[:space:]]//g') PYINCORE_VERSION=$(cat config.yml | grep "PyIncore" | head -1 | awk -F= "{print $2 }" | sed "s/[[:alpha:]|,|-|\"|:|#|[:space:]]//g" | sed "s/-//g") PYINCORE_VIZ_VERSION=$(cat config.yml | grep "PyIncore-Viz" | head -1 | awk -F= "{print $2 }" | sed "s/[[:alpha:]|,|-|\"|:|#|[:space:]]//g" | sed "s/-//g") PYINCORE_DATA_VERSION=$(cat config.yml | grep "PyIncore-Data" | head -1 | awk -F= "{print $2 }" | sed "s/[[:alpha:]|,|-|\"|:|#|[:space:]]//g" | sed "s/-//g") From 680020a5e8cd70e99075b8b34416486e17cdb936 Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 6 Dec 2023 14:31:46 -0600 Subject: [PATCH 08/12] fixed Incore version grab --- .github/workflows/docker.yml | 2 +- config.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 405328c..1c84635 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -40,7 +40,7 @@ jobs: - name: component version information run: | CHANNEL=$(cat config.yml | grep "Channel" | head -1 | awk -F ": " '{print $2}' | sed 's/["[:space:]]//g') - INCORE_VERSION=$(cat config.yml | grep "IN-CORE" | head -1 | awk -F: '{print $2}' | sed 's/["[:space:]]//g') + INCORE_VERSION=$(cat config.yml | grep "INCORE_VERSION" | head -1 | awk -F= "{print $2 }" | sed "s/[[:alpha:]|,|-|\"|:|#|[:space:]]//g" | sed "s/-//g") PYINCORE_VERSION=$(cat config.yml | grep "PyIncore" | head -1 | awk -F= "{print $2 }" | sed "s/[[:alpha:]|,|-|\"|:|#|[:space:]]//g" | sed "s/-//g") PYINCORE_VIZ_VERSION=$(cat config.yml | grep "PyIncore-Viz" | head -1 | awk -F= "{print $2 }" | sed "s/[[:alpha:]|,|-|\"|:|#|[:space:]]//g" | sed "s/-//g") PYINCORE_DATA_VERSION=$(cat config.yml | grep "PyIncore-Data" | head -1 | awk -F= "{print $2 }" | sed "s/[[:alpha:]|,|-|\"|:|#|[:space:]]//g" | sed "s/-//g") diff --git a/config.yml b/config.yml index 65f64c5..e5144a1 100644 --- a/config.yml +++ b/config.yml @@ -3,7 +3,7 @@ project: "IN-CORE Lab" author: "Yong Wook Kim" Channel: "in-core" # version form must be "x.x.x" -IN-CORE: "4.7.0" +INCORE_VERSION: "4.7.0" PyIncore: "1.14.0" PyIncore-Viz: "1.8.4" PyIncore-Data: "1.6.0" \ No newline at end of file From cb7803005373894b1958b5ab4897854661f93866 Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 6 Dec 2023 14:38:07 -0600 Subject: [PATCH 09/12] merged to mamba install PR --- Dockerfile.lab | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/Dockerfile.lab b/Dockerfile.lab index 97ab80e..433d04d 100644 --- a/Dockerfile.lab +++ b/Dockerfile.lab @@ -29,28 +29,21 @@ ENV INCORE=$INCORE \ PYINCORE_DATA=$PYINCORE_DATA \ CHANNEL=$CHANNEL -# Set conda channels and solver -RUN conda config --add channels conda-forge && \ - conda config --add channels in-core && \ - conda install -c conda-forge conda-libmamba-solver && \ - conda config --set solver libmamba +# Install Mamba from Conda-Forge +RUN conda install -c conda-forge mamba -RUN echo ${CHANNEL} && \ - echo ${PYINCORE} && \ - echo ${PYINCORE_VIZ} && \ - echo ${PYINCORE_DATA} && \ - echo ${INCORE} +# Set mamba channels +RUN mamba config --add channels conda-forge && \ + mamba config --add channels in-core -# install pyincore, pyincore-viz and other conda packages -# mamba files installed will now have rw for others. Use find to collect -# names of files installed and chane permissions. +# Install pyincore, pyincore-viz and other mamba packages RUN umask 0 && \ find /opt/conda ! -perm -o=w -print | sort > /tmp/oldfiles && \ - conda install -c ${CHANNEL} -y \ + mamba install -c ${CHANNEL} -y \ pyincore=${PYINCORE} \ pyincore-viz=${PYINCORE_VIZ} \ pyincore-data=${PYINCORE_DATA} && \ - conda clean --yes --all --force-pkgs-dirs && \ + mamba clean --yes --all --force-pkgs-dirs && \ find /opt/conda ! -perm -o=w -print | sort > /tmp/newfiles && \ - comm -13 /tmp/oldfiles /tmp/newfiles | xargs -d '\n' -n 100 chmod a+w && \ + comm -13 /tmp/oldfiles /tmp/newfiles | xargs -d '\n' -n 100 chmod a+w && \ rm -f /tmp/oldfiles /tmp/newfiles \ No newline at end of file From b00e12256d303e7ff548bd8982c1410a4f98170a Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 6 Dec 2023 14:42:12 -0600 Subject: [PATCH 10/12] removed underscore from incore version --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 1c84635..9b85400 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -40,7 +40,7 @@ jobs: - name: component version information run: | CHANNEL=$(cat config.yml | grep "Channel" | head -1 | awk -F ": " '{print $2}' | sed 's/["[:space:]]//g') - INCORE_VERSION=$(cat config.yml | grep "INCORE_VERSION" | head -1 | awk -F= "{print $2 }" | sed "s/[[:alpha:]|,|-|\"|:|#|[:space:]]//g" | sed "s/-//g") + INCORE_VERSION=$(cat config.yml | grep "INCORE_VERSION" | head -1 | awk -F= "{print $2 }" | sed "s/[[:alpha:]|,|-|\"|:|#|[:space:]_]//g" | sed "s/-//g") PYINCORE_VERSION=$(cat config.yml | grep "PyIncore" | head -1 | awk -F= "{print $2 }" | sed "s/[[:alpha:]|,|-|\"|:|#|[:space:]]//g" | sed "s/-//g") PYINCORE_VIZ_VERSION=$(cat config.yml | grep "PyIncore-Viz" | head -1 | awk -F= "{print $2 }" | sed "s/[[:alpha:]|,|-|\"|:|#|[:space:]]//g" | sed "s/-//g") PYINCORE_DATA_VERSION=$(cat config.yml | grep "PyIncore-Data" | head -1 | awk -F= "{print $2 }" | sed "s/[[:alpha:]|,|-|\"|:|#|[:space:]]//g" | sed "s/-//g") From bdf7ed9bea7c965eda2e885d05e6bda2ea36131a Mon Sep 17 00:00:00 2001 From: YONG WOOK KIM Date: Wed, 6 Dec 2023 14:45:05 -0600 Subject: [PATCH 11/12] update component versions --- config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.yml b/config.yml index e5144a1..62dcb1a 100644 --- a/config.yml +++ b/config.yml @@ -6,4 +6,4 @@ Channel: "in-core" INCORE_VERSION: "4.7.0" PyIncore: "1.14.0" PyIncore-Viz: "1.8.4" -PyIncore-Data: "1.6.0" \ No newline at end of file +PyIncore-Data: "0.6.0" \ No newline at end of file From 85ff1ae46a87bce0255c435c90a2c1fbf66596cd Mon Sep 17 00:00:00 2001 From: Vismayak Mohanarajan Date: Wed, 6 Dec 2023 15:48:54 -0600 Subject: [PATCH 12/12] Update CHANGELOG.md --- CHANGELOG.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81920b6..c9d75d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,14 +8,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] - ### Added + - Config file for controlling component versions and github action [#86](https://github.com/IN-CORE/incore-lab/issues/86) ### Changed -- DockerFile now uses libmamba installation to install python dependencies and github workflow is not run on ARM architecture [#75](https://github.com/IN-CORE/incore-lab/issues/75) + +- DockerFile now uses mamba to install python dependencies [#84](https://github.com/IN-CORE/incore-lab/issues/84) +- Github Action workflow is no longer run on ARM architecture [#75](https://github.com/IN-CORE/incore-lab/issues/75) ## [1.1.0] - 2023-11-08 ### Changed + - INCORE-Lab now uses Pyincore version 1.14.0 [#76](https://github.com/IN-CORE/incore-lab/issues/76) - INCORE-Lab now uses Pyincore-viz version 1.8.4 [#76](https://github.com/IN-CORE/incore-lab/issues/76) @@ -24,7 +28,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ### Changed - Dockerfile for hub to use version 3.0.2 [#57](https://github.com/IN-CORE/incore-lab/issues/57) -- Dockerfile for lab to use version 4.0.2 respectively [#56]( https://github.com/IN-CORE/incore-lab/issues/56) +- Dockerfile for lab to use version 4.0.2 respectively [#56](https://github.com/IN-CORE/incore-lab/issues/56) ### Added