diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index ed63e3b30..32fa3e337 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -12,7 +12,7 @@ jobs: strategy: max-parallel: 5 matrix: - python-version: ["3.8"] + python-version: ["3.8", "3.9", "3.10", "3.11"] # Skip `pull_request` runs on local PRs for which `push` runs are already triggered # yamllint disable-line rule:line-length @@ -44,6 +44,8 @@ jobs: - name: Set up Conda environment uses: mamba-org/setup-micromamba@v1 with: + create-args: >- + python=${{ matrix.python-version }} micromamba-version: "latest" environment-file: conda-environment.yml cache-environment: true diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index da8833bcf..1a16da959 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,8 +1,4 @@ --- - -default_language_version: - python: python3.8 # This should be set to the lowest Python version that we support. - repos: - repo: https://github.com/adrienverge/yamllint diff --git a/poetry.lock b/poetry.lock index 06530eb00..0d819669e 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand. [[package]] name = "alabaster" @@ -1749,13 +1749,13 @@ websockets = ">=10.4,<11.0" [[package]] name = "mxcubecore" -version = "1.154.0" +version = "1.156.0" description = "Core libraries for the MXCuBE application" optional = false python-versions = "<3.12,>=3.8" files = [ - {file = "mxcubecore-1.154.0-py3-none-any.whl", hash = "sha256:9408a5f14dd4a66701a69c486197c5c450944871666d609725c61260cb839712"}, - {file = "mxcubecore-1.154.0.tar.gz", hash = "sha256:d4c99057d4b3f7e72536e7337f93a1d4275b37350ff61b7ae6afe8c71e304b38"}, + {file = "mxcubecore-1.156.0-py3-none-any.whl", hash = "sha256:dce62033d9ec1137d3b971b27e743994b487ca816f03d6ff5d00d309d3f85eb8"}, + {file = "mxcubecore-1.156.0.tar.gz", hash = "sha256:49d34b747a36aba0fd7deb4841c5d3e295ac075f4e35fea41f36c71178e57918"}, ] [package.dependencies] @@ -3505,4 +3505,4 @@ testing = ["coverage (>=5.0.3)", "zope.event", "zope.testing"] [metadata] lock-version = "2.0" python-versions = ">=3.8,<3.12" -content-hash = "a28b760f5faf62a637acc8097839f4791f732f677acc5cfaebcdb6b351b68b03" +content-hash = "35fe6d1eab09b98829e2e42d97d88db2377c234cab961fb45173fc7bf045bc90" diff --git a/pyproject.toml b/pyproject.toml index 0d04fdd81..6f1a5583c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,7 +41,7 @@ pydantic = "^1.10.18" PyDispatcher = "^2.0.6" pytz = "^2022.6" tzlocal = "^4.2" -mxcubecore = ">=1.154.0" +mxcubecore = ">=1.156.0" mxcube-video-streamer = ">=1.4.0" [tool.poetry.group.dev.dependencies] diff --git a/requirements.txt b/requirements.txt index f3cddbf05..917874c9e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -793,9 +793,9 @@ mock==4.0.3 ; python_version >= "3.8" and python_version < "3.12" \ mxcube-video-streamer==1.4.0 ; python_version >= "3.8" and python_version < "3.12" \ --hash=sha256:78a8e5fd917c4407e50d9c92f4717854ec88b33ee5edb32426f1ec5d7f78d219 \ --hash=sha256:905f78208224b890c5e0f442a5da661f8ec1e0b63f95a0e42a79f5f026d61c22 -mxcubecore==1.154.0 ; python_version >= "3.8" and python_version < "3.12" \ - --hash=sha256:9408a5f14dd4a66701a69c486197c5c450944871666d609725c61260cb839712 \ - --hash=sha256:d4c99057d4b3f7e72536e7337f93a1d4275b37350ff61b7ae6afe8c71e304b38 +mxcubecore==1.156.0 ; python_version >= "3.8" and python_version < "3.12" \ + --hash=sha256:49d34b747a36aba0fd7deb4841c5d3e295ac075f4e35fea41f36c71178e57918 \ + --hash=sha256:dce62033d9ec1137d3b971b27e743994b487ca816f03d6ff5d00d309d3f85eb8 numpy==1.24.4 ; python_version >= "3.8" and python_version < "3.12" \ --hash=sha256:04640dab83f7c6c85abf9cd729c5b65f1ebd0ccf9de90b270cd61935eef0197f \ --hash=sha256:1452241c290f3e2a312c137a9999cdbf63f78864d63c79039bda65ee86943f61 \