Merge pull request #8 from renan-r-santos/fix-recursion-bug

fix recursion error

Author: renan-r-santos

.github/workflows/main.yml

@@ -21,10 +21,10 @@ jobs:
       run:
         shell: bash -el {0}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Miniforge on ${{ matrix.os }}
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         with:
           activate-environment: ""
           auto-activate-base: true
@@ -33,22 +33,16 @@ jobs:
           miniforge-version: latest
 
       - name: Install poetry
-        run: conda install poetry=1.8.2
+        run: conda install poetry=1.8.3
 
       - name: Configure poetry
         run: poetry config virtualenvs.in-project true
 
       - name: Install dependencies
         run: poetry install --no-interaction --no-ansi
 
-      - name: Run mypy
-        run: poetry run mypy
-
-      - name: Run black
-        run: poetry run black --check .
-
       - name: Run ruff
-        run: poetry run ruff check .
+        run: poetry run nox -s lint mypy
 
       - name: Run pytest
         run: poetry run pytest

.github/workflows/release.yml

@@ -3,31 +3,30 @@ name: Release
 on:
   push:
     tags:
-      - '*.*.*'
+      - "*.*.*"
 
 jobs:
   release:
     name: Release
     runs-on: ubuntu-latest
+    environment: release
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - name: Set up Python 3.11
-        uses: actions/setup-python@v4
+      - name: Set up Python 3.12
+        uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
+          python-version: 3.12
 
       - name: Install Poetry
-        run: curl -sSL https://install.python-poetry.org | POETRY_VERSION=1.4.0 python -
+        run: curl -sSL https://install.python-poetry.org | POETRY_VERSION=1.8.3 python -
 
       - name: Update PATH
         run: echo "$HOME/.local/bin" >> $GITHUB_PATH
 
       - name: Build project for distribution
         run: poetry build
 
-      - name: Publish to PyPI
-        env:
-          POETRY_PYPI_TOKEN_PYPI: ${{ secrets.PYPI_TOKEN }}
-        run: poetry publish
+      - name: Upload distribution to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1

noxfile.py

@@ -0,0 +1,21 @@
+from nox import options, parametrize
+from nox_poetry import Session, session
+
+options.sessions = ["lint", "mypy"]
+
+
+@session(venv_backend="none")
+@parametrize("command", [["ruff", "check", "."], ["ruff", "format", "--check", "."]])
+def lint(s: Session, command: list[str]):
+    s.run(*command)
+
+
+@session(venv_backend="none")
+def format(s: Session) -> None:
+    s.run("ruff", "check", ".", "--select", "I", "--fix")
+    s.run("ruff", "format", ".")
+
+
+@session(venv_backend="none")
+def mypy(s: Session) -> None:
+    s.run("mypy")

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "poetry-conda"
-version = "0.1.1"
+version = "0.1.2"
 description = "Poetry plugin that allows for the creation of virtual environments using Poetry, without interfering with the Conda environment in which Poetry is installed"
 authors = ["Renan Santos <renan.engmec@gmail.com>"]
 license = "MIT"
@@ -23,20 +23,17 @@ classifiers = [
     "Typing :: Typed",
 ]
 
-packages = [
-    { include = "poetry_conda", from = "src" }
-]
+packages = [{ include = "poetry_conda", from = "src" }]
 
 [tool.poetry.dependencies]
 python = "^3.8"
 poetry = "^1.3.0"
 
 [tool.poetry.group.dev.dependencies]
-black = "~23.1"
-mypy = "~1.1"
-pre-commit = "~3.1"
-pytest = "~7.2"
-ruff = "0.0.255"
+mypy = "~1.11"
+pytest = "~8.3"
+ruff = "~0.5"
+nox_poetry = "^1.0.3"
 
 [tool.poetry.plugins."poetry.application.plugin"]
 poetry-conda = "poetry_conda.plugin:PoetryCondaPlugin"
@@ -45,28 +42,25 @@ poetry-conda = "poetry_conda.plugin:PoetryCondaPlugin"
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
-[tool.black]
-color = true
-line-length = 120
-target-version = ['py38']
-
 [tool.mypy]
 files = ["src", "tests"]
 show_error_codes = true
 strict = true
 
 [tool.ruff]
+src = ["src"]
 line-length = 120
-select = [
-    "E",  # pycodestyle errors
-    "W",  # pycodestyle warnings
-    "F",  # pyflakes
-    "I",  # isort
-    "C",  # flake8-comprehensions
-]
-ignore = [
-    "E501",  # line too long, handled by black
-]
 
-[tool.ruff.isort]
-known-third-party = ["poetry"]
+[tool.ruff.lint]
+extend-select = [
+    "I",   # isort
+    "N",   # pep8-naming
+    "RUF", # ruff
+    "B",   # flake8-bugbear
+    "N",   # flake8-broken-line
+    "C4",  # flake8-comprehensions
+    "PIE", # flake8-pie
+    "PT",  # flake8-pytest-style
+    "PTH", # flake8-use-pathlib
+    "ERA", # flake8-eradicate
+]

pyproject.toml

@@ -32,11 +32,11 @@ def __init__(self, use_environment: bool = True, base_dir: Optional[Path] = None
         Config.default_config["virtualenvs"]["ignore-conda-env"] = True
         super().__init__(use_environment, base_dir)
 
-    @staticmethod
-    def _get_normalizer(name: str) -> Callable[[str], Any]:
+    @classmethod
+    def _get_normalizer(cls, name: str) -> Callable[[str], Any]:
         if name == "virtualenvs.ignore-conda-env":
             return boolean_normalizer
-        return config.Config._get_normalizer(name)
+        return super()._get_normalizer(name)
 
 
 class ConfigCommand(config_command.ConfigCommand):
@@ -54,6 +54,6 @@ def unique_config_values(self) -> Dict[str, Tuple[Any, Any]]:
 
 class PoetryCondaPlugin(ApplicationPlugin):
     def activate(self, application: Application) -> None:
-        setattr(config, "Config", Config)
-        setattr(config_command, "ConfigCommand", ConfigCommand)
-        setattr(env, "EnvManager", EnvManager)
+        config.Config = Config  # type: ignore
+        config_command.ConfigCommand = ConfigCommand  # type: ignore
+        env.EnvManager = EnvManager  # type: ignore

src/poetry_conda/plugin.py

@@ -6,7 +6,12 @@
 from typing import Iterator
 
 import pytest
-from pytest import FixtureRequest
+
+
+@pytest.fixture(scope="session", autouse=True)
+def _use_poetry_env_var_config() -> None:
+    # Triggers https://github.com/renan-r-santos/poetry-conda/issues/7
+    os.environ["POETRY_VIRTUALENVS_PROMPT"] = "{project_name}-py{python_version}"
 
 
 @pytest.fixture(
@@ -15,16 +20,12 @@
         {"python": "3.8", "poetry": "1.3.0"},
         {"python": "3.9", "poetry": "1.3.0"},
         {"python": "3.10", "poetry": "1.3.0"},
-        {"python": "3.11", "poetry": "1.3.0"},
-        {"python": "3.11", "poetry": "1.4.0"},
         {"python": "3.11", "poetry": "1.5.1"},
-        {"python": "3.12", "poetry": "1.6.1"},
-        {"python": "3.12", "poetry": "1.7.1"},
-        {"python": "3.12", "poetry": "1.8.2"},
+        {"python": "3.12", "poetry": "1.8.3"},
     ],
     ids=lambda param: f"python-{param['python']}-poetry-{param['poetry']}",
 )
-def conda_environment(request: FixtureRequest) -> Iterator[str]:
+def conda_environment(request: pytest.FixtureRequest) -> Iterator[str]:
     python_version = request.param.get("python")
     poetry_version = request.param.get("poetry")
     random_string = "".join(random.choices(ascii_letters + digits, k=8))
@@ -54,8 +55,8 @@ def conda_environment(request: FixtureRequest) -> Iterator[str]:
     subprocess.run(["conda", "remove", "--prefix", environment_path, "--all", "--quiet", "--yes"], check=True)
 
 
-@pytest.fixture
-def remove_poetry_conda_plugin(conda_environment: str) -> Iterator[None]:
+@pytest.fixture()
+def _remove_poetry_conda_plugin(conda_environment: str) -> Iterator[None]:
     subprocess.run(
         ["conda", "run", "--prefix", conda_environment, "pip", "uninstall", "poetry-conda", "--yes"], check=True
     )
@@ -66,7 +67,7 @@ def remove_poetry_conda_plugin(conda_environment: str) -> Iterator[None]:
     subprocess.run(["conda", "run", "--prefix", conda_environment, "pip", "install", "--no-deps", root_dir], check=True)
 
 
-@pytest.fixture
+@pytest.fixture()
 def test_project_dir() -> Iterator[Path]:
     test_project_dir = Path(__file__).parent / "test_project"
     current_cwd = Path.cwd()

tests/conftest.py

@@ -9,7 +9,7 @@
 @pytest.mark.usefixtures("conda_environment")
 class TestConfig:
     @pytest.fixture(autouse=True)
-    def env(self, conda_environment: str) -> None:
+    def _env(self, conda_environment: str) -> None:
         self._conda_environment = conda_environment
 
     def _run_command(self, command: str, check: bool = True) -> CompletedProcess[str]:
@@ -20,7 +20,8 @@ def _run_command(self, command: str, check: bool = True) -> CompletedProcess[str
             text=True,
         )
 
-    def test_setting_not_available_if_plugin_not_installed(self, remove_poetry_conda_plugin: None) -> None:
+    @pytest.mark.usefixtures("_remove_poetry_conda_plugin")
+    def test_setting_not_available_if_plugin_not_installed(self) -> None:
         result = self._run_command("poetry config virtualenvs.ignore-conda-env", check=False)
         assert result.stderr.strip().splitlines()[0] == "There is no virtualenvs.ignore-conda-env setting."
 

tests/test_config.py

@@ -9,7 +9,7 @@
 @pytest.mark.usefixtures("conda_environment")
 class TestEnv:
     @pytest.fixture(autouse=True)
-    def env(self, conda_environment: str) -> None:
+    def _env(self, conda_environment: str) -> None:
         self._conda_environment = conda_environment
 
     def _run_command(self, command: str, check: bool = True) -> CompletedProcess[str]: