Skip to content

Commit

Permalink
Merge branch 'pre-0.2.4' into 'master'
Browse files Browse the repository at this point in the history
pre-0.2.4

See merge request minknow/pod5-file-format!283
  • Loading branch information
HalfPhoton committed Jul 13, 2023
2 parents 28ab43a + 8396513 commit 56bc9f7
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
8 changes: 8 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ build-standalone-ubu20:
stage: build
needs:
- "prepare_version"
retry: 1
before_script:
- /opt/python/cp310-cp310/bin/pip install -U pip 'conan<2' auditwheel build
- ln -n /opt/python/cp310-cp310/bin/auditwheel /usr/bin/auditwheel
Expand Down Expand Up @@ -273,6 +274,7 @@ linux-aarch64-gcc9-release-build:
stage: build
needs:
- "prepare_version"
retry: 1
before_script:
- conan config install --verify-ssl=no "${CONAN_CONFIG_URL}"
- ci/setup_python_osx.sh ${PYTHON_VERSION} ./python
Expand Down Expand Up @@ -356,6 +358,7 @@ osx-arm64-clang13-release-build:
stage: build
needs:
- "prepare_version"
retry: 1
before_script:
- conan config install --verify-ssl=no "${CONAN_CONFIG_URL}"
- export PYENV="${HOME}/.pyenv/pyenv-win"
Expand Down Expand Up @@ -417,6 +420,7 @@ build-python-api:
image: ${CI_REGISTRY}/traque/ont-docker-base/ont-base-python:3.10
tags:
- linux
retry: 1
script:
- git tag -d $(git tag -l "*a*")
- git tag -d $(git tag -l "*b*")
Expand Down Expand Up @@ -459,6 +463,7 @@ tools-linux-x64:
image: ${CI_REGISTRY}/traque/ont-docker-base/ont-base-python:3.${PY_MINOR_VER}
tags:
- linux
retry: 1
before_script:
- python3.${PY_MINOR_VER} -m venv .venv/
- source .venv/bin/activate
Expand Down Expand Up @@ -487,6 +492,7 @@ tools-linux-x64:

.pytest:
stage: test
retry: 1
before_script:
- python3 -m venv .venv/
- source .venv/bin/activate
Expand Down Expand Up @@ -626,6 +632,7 @@ conda_pytest:

.benchmark:
stage: test
retry: 1
before_script:
- python3 -m venv .venv/
- source .venv/bin/activate
Expand Down Expand Up @@ -668,6 +675,7 @@ benchmark-linux-aarch64:


.conan-build-common:
retry: 1
stage: build-conan
dependencies:
- "prepare_version"
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ All notable changes, updates, and fixes to pod5 will be documented here
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [0.2.4] 2023-07-12
## [0.2.4] 2023-07-13

### Changed

Expand Down
2 changes: 1 addition & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ sphinx-rtd-theme
sphinx==v5.3.0
myst-parser
# Paths are relative to project root for ReadTheDocs and docs/Makefile
pod5==0.2.3
pod5==0.2.4

0 comments on commit 56bc9f7

Please sign in to comment.