diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml index 68d8bdfe..cedeb64e 100644 --- a/.github/workflows/dockerhub.yml +++ b/.github/workflows/dockerhub.yml @@ -53,7 +53,7 @@ jobs: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} tags: | type=semver,pattern={{version}} - type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/master') }} + type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/') && endsWith(github.ref, 'master') }} - name: Set up QEMU uses: docker/setup-qemu-action@v2 diff --git a/Dockerfile b/Dockerfile index 033fb546..64d2b39f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,9 +19,6 @@ RUN conda config --quiet --add channels conda-forge \ && sed -i "s/^python 3.*//" /opt/conda/conda-meta/pinned \ && mamba install --quiet --yes python=${PYTHON_VERSION} \ && mamba env update --quiet --name=base --file="${HOME}/environment.yaml" \ - # && mamba install --file "${HOME}/mamba_install.txt" \ - # && python3 -m pip install -r "${HOME}/pip_install.txt" \ - #&& mamba env update --name base --file "${ENVIRONMENT_FILE}" \ && mamba clean --quiet --all --force-pkgs-dirs --yes \ && R -e "devtools::install_github('babessell1/zFPKM')" \ # Install jupyter extensions diff --git a/main/py/tests/environment.yaml b/main/py/tests/environment.yaml index c1f40d5e..f29926b9 100644 --- a/main/py/tests/environment.yaml +++ b/main/py/tests/environment.yaml @@ -17,3 +17,4 @@ dependencies: - tqdm==4.64.1 - pip: - bioservices==1.10.1 + - GEOparse==2.0.3 diff --git a/main/py/tests/requirements.txt b/main/py/tests/requirements.txt deleted file mode 100644 index 7f1b03c6..00000000 --- a/main/py/tests/requirements.txt +++ /dev/null @@ -1,9 +0,0 @@ -pandas==1.4.4 -bioservices==1.10.1 -pytest==7.1.3 -flake8==5.0.4 -tqdm==4.64.1 -pytest==7.1.3 -pytest-mock==3.8.2 -pytest-localftpserver==1.1.3 -rpy2==3.4.5