Skip to content

Commit d6ab0db

Browse files
committed
Switch to normal python tox.
1 parent 9e69a27 commit d6ab0db

File tree

4 files changed

+17
-35
lines changed

4 files changed

+17
-35
lines changed

.github/workflows/main.yml

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,16 @@ jobs:
2727
fail-fast: false
2828
matrix:
2929
os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
30-
python-version: ['3.8', '3.9', '3.10', '3.11']
30+
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
3131

3232
steps:
3333
- uses: actions/checkout@v4
34-
- uses: mamba-org/setup-micromamba@v1
34+
- uses: actions/setup-python@v4
3535
with:
36-
environment-name: gha-testing
37-
condarc: |
38-
channels:
39-
- nodefaults
40-
- conda-forge
41-
create-args: >-
42-
python=${{ matrix.python-version }}
43-
mamba
44-
tox-conda
45-
cache-environment: true
36+
python-version: ${{ matrix.python-version }}
37+
cache: pip
38+
allow-prereleases: true
39+
- run: pip install tox
4640

4741
- name: Install core dependencies.
4842
shell: bash -l {0}
@@ -55,24 +49,15 @@ jobs:
5549
run: tox -e pytest -- tests -m "unit or (not integration and not end_to_end)" --cov=./ --cov-report=xml -n auto
5650

5751
- name: Upload coverage report for unit tests and doctests.
58-
if: runner.os == 'Linux' && matrix.python-version == '3.9'
52+
if: runner.os == 'Linux' && matrix.python-version == '3.10'
5953
shell: bash -l {0}
6054
run: bash <(curl -s https://codecov.io/bash) -F unit -c
6155

62-
# - name: Run integration tests.
63-
# shell: bash -l {0}
64-
# run: tox -e pytest -- tests -m integration --cov=./ --cov-report=xml -n auto
65-
66-
# - name: Upload coverage reports of integration tests.
67-
# if: runner.os == 'Linux' && matrix.python-version == '3.9'
68-
# shell: bash -l {0}
69-
# run: bash <(curl -s https://codecov.io/bash) -F integration -c
70-
7156
- name: Run end-to-end tests.
7257
shell: bash -l {0}
7358
run: tox -e pytest -- tests -m end_to_end --cov=./ --cov-report=xml -n auto
7459

7560
- name: Upload coverage reports of end-to-end tests.
76-
if: runner.os == 'Linux' && matrix.python-version == '3.9'
61+
if: runner.os == 'Linux' && matrix.python-version == '3.10'
7762
shell: bash -l {0}
7863
run: bash <(curl -s https://codecov.io/bash) -F end_to_end -c

.pre-commit-config.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,9 @@ repos:
7171
--ignore-missing-imports,
7272
]
7373
additional_dependencies: [
74+
attrs,
7475
cloudpickle,
75-
optree,
76+
loky,
7677
pytask==0.4.0,
7778
rich,
7879
types-attrs,

setup.cfg

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ install_requires =
2828
click
2929
cloudpickle
3030
loky
31-
optree>=0.9.0
3231
pluggy>=1.0.0
3332
pytask>=0.4.0
3433
rich

tox.ini

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,17 @@ envlist = pytest
55
usedevelop = true
66

77
[testenv:pytest]
8-
conda_channels =
9-
conda-forge/label/pytask_rc
10-
conda-forge
11-
nodefaults
12-
conda_deps =
8+
deps =
9+
# pytest
10+
pytest
11+
pytest-cov
12+
pytest-xdist
1313
setuptools_scm
1414
toml
1515

16+
# Package
17+
pytask >=0.4.0
1618
cloudpickle
1719
loky
18-
pytask >=0.4.0
19-
pytest
20-
pytest-cov
21-
pytest-xdist
2220
commands =
23-
pip install --no-deps -e .
2421
pytest {posargs}

0 commit comments

Comments
 (0)