Skip to content

Commit

Permalink
Merge branch 'main' into python313
Browse files Browse the repository at this point in the history
  • Loading branch information
jan-janssen authored Feb 3, 2025
2 parents 1275c27 + b970171 commit 506c0d5
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .ci_support/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ channels:
- conda-forge
dependencies:
- coverage
- conda =25.1.0
- executorlib =0.0.8
- conda =25.1.1
- executorlib =0.0.10
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
run: |
pip install versioneer[toml]==0.29
pip install . --no-deps --no-build-isolation
conda create -y -n py312 python=3.12.1 conda=25.1.0 executorlib=0.0.8
conda create -y -n py312 python=3.12.1 conda=25.1.1 executorlib=0.0.10
conda activate py312
pip install versioneer[toml]==0.29
pip install . --no-deps --no-build-isolation
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unittests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
run: |
pip install versioneer[toml]==0.29
pip install . --no-deps --no-build-isolation
conda create -y -n py312 python=3.12.1 conda=25.1.0 executorlib=0.0.8
conda create -y -n py312 python=3.12.1 conda=25.1.1 executorlib=0.0.10
conda activate py312
pip install versioneer[toml]==0.29
pip install . --no-deps --no-build-isolation
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.9.2
rev: v0.9.3
hooks:
- id: ruff
name: ruff lint
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ classifiers = [
"Programming Language :: Python :: 3.12",
]
dependencies = [
"conda==25.1.0",
"conda==25.1.1",
]
dynamic = ["version"]

Expand All @@ -33,7 +33,7 @@ Repository = "https://github.com/pyiron/conda_subprocess"

[project.optional-dependencies]
executorlib = [
"executorlib==0.0.8",
"executorlib==0.0.10",
]

[tool.setuptools.packages.find]
Expand Down

0 comments on commit 506c0d5

Please sign in to comment.