Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitattributes

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/continuous-integration-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
fail-fast: false
matrix:
os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
python-version: ['3.6', '3.7', '3.8', '3.9']
python-version: ['3.7', '3.8', '3.9']
r-version: ['3.6.3']

steps:
Expand Down
5 changes: 3 additions & 2 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@ all releases are available on `PyPI <https://pypi.org/project/pytask-r>`_ and
`Anaconda.org <https://anaconda.org/conda-forge/pytask-r>`_.


0.0.10 - 2021-xx-xx
-------------------
0.1.0 - 2021-07-22
------------------

- :gh:`15` fixes the tests related to changes in pytask.
- :gh:`16` replaces versioneer with setuptools-scm.
- :gh:`18` aligns pytask-r with pytask v0.1.0.


0.0.9 - 2021-03-05
Expand Down
5 changes: 2 additions & 3 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ dependencies:
- conda-verify

# Package dependencies
- pytask >=0.0.9
- pytask-parallel >=0.0.4
- pytask >=0.1.0
- pytask-parallel >=0.1.0
- r-base

# Misc
Expand All @@ -27,5 +27,4 @@ dependencies:
- pre-commit
- pytest-cov
- pytest-xdist
- versioneer
- black
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ project_urls =
packages = find:
install_requires =
click
pytask>=0.0.9
pytask>=0.1.0
python_requires = >=3.6
include_package_data = True
package_dir = =src
Expand Down
4 changes: 2 additions & 2 deletions src/pytask_r/collect.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
from typing import Union

from _pytask.config import hookimpl
from _pytask.mark import get_specific_markers_from_task
from _pytask.mark import has_marker
from _pytask.mark_utils import get_specific_markers_from_task
from _pytask.mark_utils import has_marker
from _pytask.nodes import FilePathNode
from _pytask.nodes import PythonFunctionTask
from _pytask.parametrize import _copy_func
Expand Down
2 changes: 1 addition & 1 deletion src/pytask_r/execute.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import shutil

from _pytask.config import hookimpl
from _pytask.mark import get_specific_markers_from_task
from _pytask.mark_utils import get_specific_markers_from_task


@hookimpl
Expand Down
5 changes: 2 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,11 @@ basepython = python

[testenv:pytest]
conda_deps =
pytask >=0.0.9
pytask-parallel >=0.0.4
pytask >=0.1.0
pytask-parallel >=0.1.0
pytest
pytest-cov
pytest-xdist
networkx >=2.4
conda_channels =
conda-forge
nodefaults
Expand Down