diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 090ef2a..1b4e131 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,11 +41,11 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set up python #on ${{ matrix.runs-on }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version}} @@ -67,7 +67,7 @@ jobs: - 3.11 steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 @@ -76,7 +76,7 @@ jobs: sudo apt-get install -y graphviz - name: Set up python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/publish_to_pypi.yml b/.github/workflows/publish_to_pypi.yml index b9cba15..7e632cc 100644 --- a/.github/workflows/publish_to_pypi.yml +++ b/.github/workflows/publish_to_pypi.yml @@ -23,11 +23,11 @@ jobs: build_artifacts: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 name: Install Python with: python-version: '3.11' diff --git a/.github/workflows/tag_and_release.yml b/.github/workflows/tag_and_release.yml index 153478a..3dc4d10 100644 --- a/.github/workflows/tag_and_release.yml +++ b/.github/workflows/tag_and_release.yml @@ -36,7 +36,7 @@ jobs: CHANGELOG: ${{ needs.changelog_entry.outputs.changes }} steps: - name: Checkout repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: main fetch-depth: 0 diff --git a/.github/workflows/verify_changelog.yml b/.github/workflows/verify_changelog.yml index 35b86b1..5f9b4b7 100644 --- a/.github/workflows/verify_changelog.yml +++ b/.github/workflows/verify_changelog.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 submodules: true diff --git a/docker/images/dashboard_image/.env-template b/docker/images/dashboard_image/.env-template index d5582b7..e9e932f 100644 --- a/docker/images/dashboard_image/.env-template +++ b/docker/images/dashboard_image/.env-template @@ -1,9 +1,9 @@ APP="cal" VERSION="test" TAG="dash-${APP}-${VERSION}" -DOCKER_REPO="spacetelescope/spacekit" +DOCKER_REPO="alphasentaurii/spacekit" DOCKER_IMAGE="${DOCKER_REPO}:${TAG}" -SPACEKIT_VERSION="1.0.0" +SPACEKIT_VERSION="1.0.1" SRC="web" # pkg, s3, web, file COLLECTION="calcloud" # bucketname, repo url, or local path DATASETS="2022-02-14,2021-11-04,2021-10-28" diff --git a/docker/images/dashboard_image/Dockerfile b/docker/images/dashboard_image/Dockerfile index b0709c9..fb4f07b 100644 --- a/docker/images/dashboard_image/Dockerfile +++ b/docker/images/dashboard_image/Dockerfile @@ -19,15 +19,16 @@ RUN apt update && \ apt clean && \ useradd --create-home --shell /bin/bash developer && \ chown -R developer:developer /home/developer +COPY ./docker/images/dashboard_image/.env /home/developer/.env USER developer ENV PATH=/home/developer/venv/bin:${PATH} ENV LD_LIBRARY_PATH=/home/developer/venv/LD_LIBRARY_PATH -ENV SPACEKIT_DATA=/home/developer +ENV SPACEKIT_DATA=data ENV TF_CPP_MIN_LOG_LEVEL=2 ARG PFX=archive ENV PFX=${PFX} -ARG SPACEKIT_VERSION=1.0.0 +ARG SPACEKIT_VERSION=1.0.1 ENV SPACEKIT_VERSION=${SPACEKIT_VERSION} ARG SRC ARG COLLECTION @@ -37,16 +38,11 @@ RUN python3 -m venv /home/developer/venv && \ pip install --upgrade pip && \ pip install \ spacekit[x] \ - dash~=2.0.0 \ + dash \ dash-cytoscape \ dash-daq && \ - mkdir /home/developer/data && \ + mkdir $SPACEKIT_DATA && \ python -m spacekit.datasets.beam -s="${SRC}:${COLLECTION}" -d=$DATASETS -o=$SPACEKIT_DATA -# Import data -USER developer -WORKDIR /home/developer -COPY ./docker/images/dashboard_image/.env /home/developer/.env -RUN python -m spacekit.datasets.beam -s="${SRC}:${COLLECTION}" -d=$DATASETS -o=$SPACEKIT_DATA EXPOSE 8050 CMD /bin/bash diff --git a/docker/images/dashboard_image/templates/aws/.env b/docker/images/dashboard_image/templates/aws/.env index fea46c6..cdc1c24 100644 --- a/docker/images/dashboard_image/templates/aws/.env +++ b/docker/images/dashboard_image/templates/aws/.env @@ -1,9 +1,9 @@ APP="cal" VERSION="aws" TAG="dash-${APP}-${VERSION}" -DOCKER_REPO="spacetelescope/spacekit" +DOCKER_REPO="alphasentaurii/spacekit" DOCKER_IMAGE="${DOCKER_REPO}:${TAG}" -SPACEKIT_VERSION="1.0.0" +SPACEKIT_VERSION="1.0.1" SRC="s3" # pkg, s3, git, file COLLECTION="" # bucketname, repo url, or local path DATASETS="2022-02-14-1644848448,2021-11-04-1636048291,2021-10-28-1635457222" diff --git a/docker/images/dashboard_image/templates/dev/.env b/docker/images/dashboard_image/templates/dev/.env index 98eefe1..72eb8e2 100644 --- a/docker/images/dashboard_image/templates/dev/.env +++ b/docker/images/dashboard_image/templates/dev/.env @@ -1,9 +1,9 @@ APP="cal" VERSION="dev" TAG="dash-${APP}-${VERSION}" -DOCKER_REPO="spacetelescope/spacekit" +DOCKER_REPO="alphasentaurii/spacekit" DOCKER_IMAGE="${DOCKER_REPO}:${TAG}" -SPACEKIT_VERSION="1.0.0" +SPACEKIT_VERSION="1.0.1" SRC="web" # pkg, s3, web, file COLLECTION="calcloud" # bucketname, repo url, or local path DATASETS="2022-02-14,2021-11-04,2021-10-28" diff --git a/docker/images/dashboard_image/templates/latest/.env b/docker/images/dashboard_image/templates/latest/.env index ec4b665..f93a2eb 100644 --- a/docker/images/dashboard_image/templates/latest/.env +++ b/docker/images/dashboard_image/templates/latest/.env @@ -1,9 +1,9 @@ APP="cal" VERSION="latest" TAG="dash-${APP}-${VERSION}" -DOCKER_REPO="spacetelescope/spacekit" +DOCKER_REPO="alphasentaurii/spacekit" DOCKER_IMAGE="${DOCKER_REPO}:${TAG}" -SPACEKIT_VERSION="1.0.0" +SPACEKIT_VERSION="1.0.1" SRC="web" # pkg, s3, web, file COLLECTION="calcloud" # bucketname, repo url, or local path DATASETS="2022-02-14,2021-11-04,2021-10-28" diff --git a/setup.cfg b/setup.cfg index a0b200a..1cf9b26 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = spacekit -version = 1.0.1rc1 +version = 1.0.1 author = Ru Keïn author_email = rkein@stsci.edu license = MIT @@ -20,8 +20,6 @@ classifiers= License :: OSI Approved :: MIT License Operating System :: OS Independent Development Status :: 3 - Alpha - Programming Language :: Python :: 3.7 - Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11