Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Passing python version from "interpreter matrix" to mamba #1417

Merged
merged 3 commits into from
Sep 27, 2024
Merged

Passing python version from "interpreter matrix" to mamba #1417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
34dd336
Passing python version from "interpreter matrix" to mamba
marcus-oscarsson Sep 25, 2024
f8cf03f
Bumped mxcubecore
marcus-oscarsson Sep 26, 2024
6589a1d
Update .github/workflows/build_and_test.yml
marcus-oscarsson Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/build_and_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
max-parallel: 5
matrix:
python-version: ["3.8"]
python-version: ["3.8", "3.9", "3.10", "3.11"]
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So I added python "3.9", "3.10", "3.11" so that we are certain that we are not introducing some incompatibility somewhere


# Skip `pull_request` runs on local PRs for which `push` runs are already triggered
# yamllint disable-line rule:line-length
Expand Down Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
---

default_language_version:
python: python3.8 # This should be set to the lowest Python version that we support.
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed the default language so that we are using the python version of the virtual environment. This will make creation of the development environment and the management of the CI easier.

We will still run pre-commit with the lowest supported python version, currently python 3.8, in the CI

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not convinced by this. Feels like there would be discrepancy between behaviour locally and on the CI, it might alienate people (I know I would be annoyed if tests pass locally but not on the CI).


repos:

- repo: https://github.com/adrienverge/yamllint
Expand Down
10 changes: 5 additions & 5 deletions poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
fabcor-maxiv marked this conversation as resolved.
Show resolved Hide resolved
mxcube-video-streamer = ">=1.4.0"

[tool.poetry.group.dev.dependencies]
Expand Down
6 changes: 3 additions & 3 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
Loading