diff --git a/CHANGELOG.md b/CHANGELOG.md index bbb2427..059337e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.0.1] - 2022-10-25 + +### Updated + +- popcorn.sif container (``md5sum: 4a0fce687b62d06540ce2d315f413ba9``) + updated from https://github.com/ofrei/Popcorn/tree/fa1326c318859dee0f3ec884a25a2639c9311bd7 +- pysnptools dependency updated from 0.5.4 to 0.5.7 + ## [1.0.0] - 2022-10-21 ### Added diff --git a/README.md b/README.md index 45e623d..050583b 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,8 @@ Please keep up to date (and update the main `/README.md` when pushing n | ----------------------- | ------------------- | ---------------------------------------- | popcorn.sif | ubuntu | 20.04 | popcorn.sif | python3 | python 3.10.6 - | popcorn.sif | popcorn | https://github.com/brielin/Popcorn ef4455a + | popcorn.sif | popcorn | https://github.com/ofrei/Popcorn @ fa1326c + | | | (minor fix on top of the original https://github.com/brielin/Popcorn @ ef4455a) ## Building/rebuilding containers diff --git a/containers/popcorn.sif b/containers/popcorn.sif index 2f55321..e7c4de4 100644 --- a/containers/popcorn.sif +++ b/containers/popcorn.sif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bdc34d77fa3c2960d0047223e9031dfeeb39da6e9e47f7e6369d6a28db923333 -size 491761664 +oid sha256:6bc9bf917063b7143d1bb710c262702183f29cfbca937918bdb9a8982e43ffe9 +size 491769856 diff --git a/src/dockerfiles/popcorn/Dockerfile b/src/dockerfiles/popcorn/Dockerfile index 614d307..bea08ef 100644 --- a/src/dockerfiles/popcorn/Dockerfile +++ b/src/dockerfiles/popcorn/Dockerfile @@ -42,12 +42,12 @@ RUN yes | pip install bed-reader==0.2.24 #bed-reader>=0.2.5 #more-itertools>=8.7.0 -RUN yes | pip install pysnptools==0.5.4 --no-dependencies +RUN yes | pip install pysnptools==0.5.7 WORKDIR /tools/popcorn -RUN git clone https://github.com/brielin/Popcorn.git . && \ - git reset --hard ef4455a970d4104832cca02510c555d9220b1414 && \ - pip install . --no-dependencies +RUN git clone https://github.com/ofrei/Popcorn.git . && \ + git reset --hard fa1326c318859dee0f3ec884a25a2639c9311bd7 && \ + pip install . # cleanup for smaller image size RUN mamba clean -a -y diff --git a/version/version.py b/version/version.py index 265fbec..06a2a01 100644 --- a/version/version.py +++ b/version/version.py @@ -2,7 +2,7 @@ _MINOR = "0" # On main and in a nightly release the patch should be one ahead of the last # released build. -_PATCH = "0" +_PATCH = "1" # This is mainly for nightly builds which have the suffix ".dev$DATE". See # https://semver.org/#is-v123-a-semantic-version for the semantics. _SUFFIX = ""