Skip to content

Commit fb0175e

Browse files
committed
fix.
1 parent 46be650 commit fb0175e

File tree

6 files changed

+24
-32
lines changed

6 files changed

+24
-32
lines changed

.github/workflows/main.yml

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,26 +27,22 @@ 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: r-lib/actions/setup-r@v2
35+
- uses: r-lib/actions/setup-r-dependencies@v2
3536
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
46-
47-
- name: Install core dependencies.
48-
shell: bash -l {0}
49-
run: mamba install -c conda-forge tox-conda coverage mamba
37+
extra-packages: |
38+
any::jsonlite
39+
any::yaml
40+
- uses: actions/setup-python@v4
41+
with:
42+
python-version: ${{ matrix.python-version }}
43+
cache: pip
44+
allow-prereleases: true
45+
- run: pip install tox
5046

5147
# Unit, integration, and end-to-end tests.
5248

.pre-commit-config.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@ repos:
6464
additional_dependencies: [
6565
attrs>=21.3.0,
6666
click,
67-
optree,
68-
pytask>=0.4.0rc4,
67+
pytask>=0.4.0,
6968
types-PyYAML,
7069
types-setuptools
7170
]

CHANGES.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ chronological order. Releases follow [semantic versioning](https://semver.org/)
55
releases are available on [PyPI](https://pypi.org/project/pytask-r) and
66
[Anaconda.org](https://anaconda.org/conda-forge/pytask-r).
77

8+
## 0.4.0 - 2023-10-07
9+
10+
- {pull}`42` makes the package compatible with pytask v0.4.0.
11+
812
## 0.3.0 - 2023-xx-xx
913

1014
- {pull}`33` deprecates INI configurations and aligns the plugin with pytask v0.3.

environment.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ dependencies:
1313
- toml
1414

1515
# Package dependencies
16-
- pytask >=0.4.0rc4
17-
- pytask-parallel >=0.4.0rc1
16+
- pytask >=0.4.0
17+
- pytask-parallel >=0.4.0
1818

1919
- r-base >4
2020
- r-jsonlite

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ packages = find:
2727
install_requires =
2828
click
2929
pluggy>=1.0.0
30-
pytask>=0.4.0rc4
30+
pytask>=0.4.0
3131
python_requires = >=3.8
3232
include_package_data = True
3333
package_dir = =src

tox.ini

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,14 @@ envlist = pytest
55
usedevelop = true
66

77
[testenv:pytest]
8-
conda_channels =
9-
conda-forge
10-
conda-forge/label/pytask_rc
11-
conda-forge/label/pytask_parallel_rc
12-
nodefaults
13-
conda_deps =
14-
pytask >=0.4.0rc4
15-
pytask-parallel >=0.4.0rc1
8+
deps =
9+
pytask >=0.4.0
10+
pytask-parallel >=0.4.0
1611

1712
# Optional dependencies.
1813
pyyaml
19-
r-base =4.1
20-
r-jsonlite
21-
r-yaml
2214

15+
# pytest
2316
pytest
2417
pytest-cov
2518
pytest-xdist

0 commit comments

Comments
 (0)