Skip to content

Commit

Permalink
fix tests
Browse files Browse the repository at this point in the history
Signed-off-by: Frost Ming <[email protected]>
  • Loading branch information
frostming committed Jan 4, 2024
1 parent eea19ab commit 66194c1
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,15 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.7, 3.8, 3.9, "3.10", "3.11"]
python-version: [3.7, 3.8, 3.9, "3.10", "3.11", "3.12"]

steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: pdm-project/setup-pdm@v3
with:
python-version: ${{ matrix.python-version }}
cache: true
- name: Install dependencies
run: |
python -m pip install --upgrade tox .
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,14 @@ jobs:

steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: "3.10"
architecture: "x64"

- name: Build artifacts
run: |
python3 -m pip install build
python3 -m build
pipx run build
- name: Upload to Pypi
run: |
pip install twine
Expand Down
6 changes: 3 additions & 3 deletions tox_pdm/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,16 @@ def tox_register_tox_env(register: ToxEnvRegister) -> t.Optional[bool]:
class PdmRunner(VirtualEnvRunner):
def _setup_env(self) -> None:
super()._setup_env()
pdm = self.options.pdm
if pdm not in self.conf["allowlist_externals"]:
self.conf["allowlist_externals"].append(pdm)
if self.conf["skip_install"]:
return
groups = self.conf["groups"]
pdm = self.options.pdm
op = "sync" if self.conf["pdm_sync"] else "install"
cmd = [pdm, op, "--no-self"]
for group in groups:
cmd.extend(("--group", group))
if pdm not in self.conf["allowlist_externals"]:
self.conf["allowlist_externals"].append(pdm)
set_env: SetEnv = self.conf["setenv"]
if "VIRTUAL_ENV" not in set_env:
set_env.update({"VIRTUAL_ENV": str(self.env_dir)})
Expand Down

0 comments on commit 66194c1

Please sign in to comment.