fix: update package metadata

Signed-off-by: Frost Ming <me@frostming.com>

Author: frostming

.github/workflows/ci.yml

@@ -17,9 +17,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
-        uses: pdm-project/setup-pdm@main
+        uses: pdm-project/setup-pdm@v3
         with:
           python-version: ${{ matrix.python-version }}
+          cache: true
       - name: Install Dependencies
         run: |
           pdm install -dGtest

.gitignore

@@ -1,6 +1,6 @@
 *.py[cod]
 __pycache__/
-.pdm.toml
+.pdm-python
 dist/
 build/
 *.egg-info/

__pypackages__/.gitignore

@@ -40,5 +40,5 @@ test = [
 ]
 
 [build-system]
-requires = ["pdm-pep517>=0.12.0"]
-build-backend = "pdm.pep517.api"
+requires = ["pdm-backend"]
+build-backend = "pdm.backend"

pyproject.toml

@@ -9,13 +9,13 @@ class Pip(PackageManager):
     name = "pip"
 
     def _ensure_virtualenv(self) -> str:
-        if "VIRTUAL_ENV" in os.environ:
-            return os.environ["VIRTUAL_ENV"]
         this_venv = os.path.abspath(".venv")
         if os.path.exists(this_venv) and os.path.exists(
             os.path.join(this_venv, "pyvenv.cfg")
         ):
             return this_venv
+        if "VIRTUAL_ENV" in os.environ:
+            return os.environ["VIRTUAL_ENV"]
 
         try:
             import venv

src/onepm/pip.py

@@ -2,7 +2,7 @@
 import sys
 
 import pytest
-from onepm import pi, pr, pa, pu, pun
+from onepm import pa, pi, pr, pu, pun
 from onepm.pip import Pip
 
 pytestmark = pytest.mark.usefixtures("pip")
@@ -13,7 +13,7 @@ def venv(monkeypatch):
     monkeypatch.setenv("VIRTUAL_ENV", "foo")
 
 
-def test_pip_detect_activated_venv(venv):
+def test_pip_detect_activated_venv(venv, project):
     pm = Pip()
     if sys.platform == "win32":
         assert pm.command == ["foo\\Scripts\\python.exe", "-m", "pip"]
@@ -39,13 +39,6 @@ def test_pip_detect_dot_venv(project):
         ]
 
 
-def test_pip_no_venv_error(project):
-    with pytest.raises(
-        Exception, match="To use pip, you must activate a virtualenv or create one"
-    ):
-        pi([])
-
-
 def test_install_without_args_error(project, venv):
     with pytest.raises(
         Exception, match="No requirements.txt or setup.py/pyproject.toml is found"