Skip to content

Commit b36aeb1

Browse files
Update Python to 3.14 (#13)
Drop support for Python 3.9.
1 parent 3775ace commit b36aeb1

File tree

8 files changed

+1129
-763
lines changed

8 files changed

+1129
-763
lines changed

.github/workflows/main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ jobs:
2121
run:
2222
shell: bash -el {0}
2323
steps:
24-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@v5
2525

2626
- name: Install Pixi
27-
uses: prefix-dev/setup-pixi@v0.8.1
27+
uses: prefix-dev/setup-pixi@v0.9.2
2828
with:
29-
pixi-version: v0.40.2
29+
pixi-version: v0.59.0
3030
run-install: false
3131

3232
- name: Install Python
@@ -35,7 +35,7 @@ jobs:
3535
- name: Install Poetry
3636
uses: abatilo/actions-poetry@v4
3737
with:
38-
poetry-version: 2.0.1
38+
poetry-version: 2.2.1
3939

4040
- name: Configure poetry
4141
run: poetry config virtualenvs.in-project true

.github/workflows/release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ jobs:
1414
id-token: write
1515
steps:
1616
- name: Checkout code
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v5
1818

19-
- name: Set up Python 3.12
20-
uses: actions/setup-python@v5
19+
- name: Set up Python 3.14
20+
uses: actions/setup-python@v6
2121
with:
22-
python-version: 3.13
22+
python-version: 3.14
2323

2424
- name: Install Poetry
25-
run: curl -sSL https://install.python-poetry.org | POETRY_VERSION=2.0.1 python -
25+
run: curl -sSL https://install.python-poetry.org | POETRY_VERSION=2.2.1 python -
2626

2727
- name: Update PATH
2828
run: echo "$HOME/.local/bin" >> $GITHUB_PATH

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
This plugin allows the installation of Poetry into Conda environments other than `base` and enables it to create
44
virtual environments for your projects without polluting the Conda environment where it is installed.
55

6-
It works with any combination of Python 3.9+ and Poetry 1.5+.
6+
It works with any combination of Python 3.10+ and Poetry 1.5+.
77

88
## Installation
99

poetry.lock

Lines changed: 1103 additions & 740 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "poetry-conda"
3-
version = "0.1.4"
3+
version = "0.1.5"
44
description = "Poetry plugin that allows for the creation of virtual environments using Poetry, without interfering with the Conda environment in which Poetry is installed"
55
authors = ["Renan Santos <renan.engmec@gmail.com>"]
66
license = "MIT"
@@ -15,25 +15,25 @@ classifiers = [
1515
"Programming Language :: Python",
1616
"Programming Language :: Python :: 3",
1717
"Programming Language :: Python :: 3 :: Only",
18-
"Programming Language :: Python :: 3.9",
1918
"Programming Language :: Python :: 3.10",
2019
"Programming Language :: Python :: 3.11",
2120
"Programming Language :: Python :: 3.12",
2221
"Programming Language :: Python :: 3.13",
22+
"Programming Language :: Python :: 3.14",
2323
"Typing :: Typed",
2424
]
2525

2626
packages = [{ include = "poetry_conda", from = "src" }]
2727

2828
[tool.poetry.dependencies]
29-
python = ">=3.9,<4"
29+
python = ">=3.10,<4"
3030
poetry = ">=1.5.0,<3"
3131

3232
[tool.poetry.group.dev.dependencies]
33-
mypy = ">=1,<2"
34-
pytest = ">=8,<9"
35-
ruff = ">=0.9,<0.10"
36-
nox_poetry = ">=1,<2"
33+
mypy = ">=1"
34+
pytest = ">=8"
35+
ruff = ">=0.9"
36+
nox_poetry = ">=1"
3737

3838
[tool.poetry.plugins."poetry.application.plugin"]
3939
poetry-conda = "poetry_conda.plugin:PoetryCondaPlugin"
@@ -50,7 +50,7 @@ strict = true
5050
[tool.ruff]
5151
src = ["src"]
5252
line-length = 120
53-
target-version = "py39"
53+
target-version = "py310"
5454

5555
[tool.ruff.lint]
5656
extend-select = [

tests/conftest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ def _use_poetry_env_var_config() -> None:
1717
@pytest.fixture(
1818
scope="session",
1919
params=[
20-
{"python": "3.9", "poetry": "1.5.0"},
2120
{"python": "3.10", "poetry": "1.5.0"},
2221
{"python": "3.11", "poetry": "1.5.1"},
2322
{"python": "3.12", "poetry": "1.8.5"},
2423
{"python": "3.13", "poetry": "1.8.5"},
25-
{"python": "3.13", "poetry": "2.0.1"},
24+
{"python": "3.13", "poetry": "2.2.1"},
25+
{"python": "3.14", "poetry": "2.2.1"},
2626
],
2727
ids=lambda param: f"python-{param['python']}-poetry-{param['poetry']}",
2828
)

tests/test_config.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,14 @@ class TestConfig:
1212
def _env(self, pixi_environment: str) -> None:
1313
self._pixi_environment = pixi_environment
1414

15-
def _run_command(self, command: str, check: bool = True) -> CompletedProcess[str]:
15+
def _run_command(
16+
self, command: str, check: bool = True, env: dict[str, str] | None = None
17+
) -> CompletedProcess[str]:
1618
return subprocess.run(
1719
["pixi", "run", "--manifest-path", f"{self._pixi_environment}/pixi.toml", *command.split()],
1820
capture_output=True,
1921
check=check,
22+
env=os.environ.copy() if env is None else {**os.environ, **env},
2023
text=True,
2124
)
2225

@@ -34,7 +37,7 @@ def test_change_setting_using_environment_variable(self) -> None:
3437
assert result.stdout.strip() == "true"
3538

3639
result = self._run_command(
37-
"POETRY_VIRTUALENVS_IGNORE_CONDA_ENV=false poetry config virtualenvs.ignore-conda-env"
40+
"poetry config virtualenvs.ignore-conda-env", env={"POETRY_VIRTUALENVS_IGNORE_CONDA_ENV": "false"}
3841
)
3942
assert result.stdout.strip() == "false"
4043

tests/test_project/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description = ""
55
authors = []
66

77
[tool.poetry.dependencies]
8-
python = "^3.9"
8+
python = "^3.10"
99

1010
[build-system]
1111
requires = ["poetry-core"]

0 commit comments

Comments
 (0)