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
5 changes: 5 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[report]
exclude_lines =
pragma: no cover
if TYPE_CHECKING.*:
\.\.\.
19 changes: 8 additions & 11 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,24 +1,21 @@
---
______________________________________________________________________

name: Bug Report
about: Create a bug report to help us improve pytask-r
title: "BUG:"
name: Bug Report about: Create a bug report to help us improve pytask-r title: "BUG:"
labels: "bug"

---
______________________________________________________________________

- [ ] I have checked that this issue has not already been reported.

- [ ] I have confirmed this bug exists on the latest version of pytask-r.

- [ ] (optional) I have confirmed this bug exists on the `main` branch of
pytask-r.
- [ ] (optional) I have confirmed this bug exists on the `main` branch of pytask-r.

---
______________________________________________________________________

**Note**: Please read [this
guide](https://matthewrocklin.com/blog/work/2018/02/28/minimal-bug-reports) detailing
how to provide the necessary information for us to reproduce your bug.
**Note**: Please read
[this guide](https://matthewrocklin.com/blog/work/2018/02/28/minimal-bug-reports)
detailing how to provide the necessary information for us to reproduce your bug.

#### Code Sample, a copy-pastable example

Expand Down
10 changes: 4 additions & 6 deletions .github/ISSUE_TEMPLATE/documentation.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
---
______________________________________________________________________

name: Documentation Improvement
about: Report wrong or missing documentation
title: "DOC:"
labels: "documentation"
name: Documentation Improvement about: Report wrong or missing documentation title:
"DOC:" labels: "documentation"

---
______________________________________________________________________

#### Location of the documentation

Expand Down
14 changes: 6 additions & 8 deletions .github/ISSUE_TEMPLATE/enhancement.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
---
______________________________________________________________________

name: Enhancement
about: Suggest an idea for pytask-r
title: "ENH:"
labels: "enhancement"
name: Enhancement about: Suggest an idea for pytask-r title: "ENH:" labels:
"enhancement"

---
______________________________________________________________________

#### Is your feature request related to a problem?

Provide a description of what the problem is, e.g. "I wish I could use pytask-r
to do [...]".
Provide a description of what the problem is, e.g. "I wish I could use pytask-r to do
\[...\]".

#### Describe the solution you'd like

Expand Down
16 changes: 7 additions & 9 deletions .github/ISSUE_TEMPLATE/question.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
---
______________________________________________________________________

name: Submit Question
about: Ask a general question about pytask-r
title: "QST:"
labels: "question"
name: Submit Question about: Ask a general question about pytask-r title: "QST:" labels:
"question"

---
______________________________________________________________________

#### Question about pytask-r

**Note**: If you'd still like to submit a question, please read [this guide](
https://matthewrocklin.com/blog/work/2018/02/28/minimal-bug-reports) detailing how to
provide the necessary information for us to reproduce your question.
**Note**: If you'd still like to submit a question, please read
[this guide](https://matthewrocklin.com/blog/work/2018/02/28/minimal-bug-reports)
detailing how to provide the necessary information for us to reproduce your question.

```python
# Your code here, if applicable
Expand Down
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ Provide a description and/or bullet points to describe the changes in this PR.

- [ ] Reference issues which can be closed due to this PR with "Closes #x".
- [ ] Review whether the documentation needs to be updated.
- [ ] Document PR in docs/changes.rst.
- [ ] Document PR in CHANGES.md.
21 changes: 3 additions & 18 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,14 @@ jobs:

run-tests:

name: Run tests for ${{ matrix.os }} on ${{ matrix.python-version }} and ${{ matrix.r-version }}
name: Run tests for ${{ matrix.os }} on ${{ matrix.python-version }}
runs-on: ${{ matrix.os }}

strategy:
fail-fast: false
matrix:
os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
python-version: ['3.7', '3.8', '3.9', '3.10']
r-version: ['3.6.3']

steps:
- uses: actions/checkout@v2
Expand All @@ -45,29 +44,15 @@ jobs:
run: tox -e pytest -- -m "unit or (not integration and not end_to_end)" --cov=./ --cov-report=xml -n auto

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

# - name: Run integration tests.
# shell: bash -l {0}
# run: tox -e pytest -- -m integration --cov=./ --cov-report=xml -n auto

# - name: Upload coverage reports of integration tests.
# if: runner.os == 'Linux' && matrix.python-version == '3.9' && matrix.r-version == '3.6.3'
# shell: bash -l {0}
# run: bash <(curl -s https://codecov.io/bash) -F integration -c

- name: Run end-to-end tests.
shell: bash -l {0}
run: tox -e pytest -- -m end_to_end --cov=./ --cov-report=xml -n auto

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

- name: Validate codecov.yml
if: runner.os == 'Linux' && matrix.python-version == '3.9' && matrix.r-version == '3.6.3'
shell: bash -l {0}
run: cat codecov.yml | curl --data-binary @- https://codecov.io/validate
24 changes: 11 additions & 13 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ repos:
- id: python-no-eval
- id: python-no-log-warn
- id: python-use-type-annotations
- id: rst-backticks
- id: rst-directive-colons
- id: rst-inline-touching-normal
- id: text-unicode-replacement-char
- repo: https://github.com/asottile/pyupgrade
rev: v2.32.0
Expand All @@ -38,11 +35,6 @@ repos:
rev: 22.3.0
hooks:
- id: black
- repo: https://github.com/asottile/blacken-docs
rev: v1.12.1
hooks:
- id: blacken-docs
additional_dependencies: [black]
- repo: https://github.com/PyCQA/flake8
rev: 4.0.1
hooks:
Expand All @@ -64,24 +56,30 @@ repos:
pydocstyle,
Pygments,
]
- repo: https://github.com/PyCQA/doc8
rev: 0.11.1
hooks:
- id: doc8
- repo: https://github.com/econchick/interrogate
rev: 1.5.0
hooks:
- id: interrogate
args: [-v, --fail-under=40, src, tests]
- repo: https://github.com/executablebooks/mdformat
rev: 0.7.14
hooks:
- id: mdformat
additional_dependencies: [
mdformat-gfm,
mdformat-black,
]
args: [--wrap, "88"]
- repo: https://github.com/codespell-project/codespell
rev: v2.1.0
hooks:
- id: codespell
args: [-L unparseable]
- repo: https://github.com/mgedmin/check-manifest
rev: "0.48"
hooks:
- id: check-manifest
args: [--no-build-isolation]
additional_dependencies: [setuptools-scm, toml]
- repo: meta
hooks:
- id: check-hooks-apply
Expand Down
61 changes: 61 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
# Changes

This is a record of all past pytask-r releases and what went into them in reverse
chronological order. Releases follow [semantic versioning](https://semver.org/) and all
releases are available on [PyPI](https://pypi.org/project/pytask-r) and
[Anaconda.org](https://anaconda.org/conda-forge/pytask-r).

## 0.2.0 - 2022-xx-xx

- {pull}`24` removes an unnecessary hook implementation.

## 0.1.1 - 2022-02-08

- {pull}`22` skips concurrent CI builds.
- {pull}`23` deprecate Python 3.6 and add support for Python 3.10.

## 0.1.0 - 2021-07-22

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

## 0.0.9 - 2021-03-05

- {pull}`13` fixes the version number in the release.

## 0.0.8 - 2021-03-03

- {pull}`10` fixes some post-release issues.
- {pull}`12` add dependencies to `setup.py`.

## 0.0.7 - 2021-02-25

- {pull} `9` publishes pytask-r on PyPI, adds versioneer, and more.

## 0.0.6 - 2021-01-16

- {pull} `7` converts command line arguments automatically to string and removes the
`--vanilla` option as the default.

## 0.0.5 - 2020-10-30

- {pull} `5` makes pytask-r work with pytask v0.0.9.

## 0.0.4 - 2020-10-14

- {pull} `4` fixes `pytask_collect_task_teardown` with non-R tasks and releases 0.0.4.

## 0.0.3 - 2020-10-04

- {pull} `2` fixes marker description and adds some changes to the readme.
- {pull} `3` check for exit code equal to 0, preparation for pytask v0.0.7, and releases
v0.0.3.

## 0.0.2 - 2020-08-14

- {pull} `1` includes some minor changes like fixing the missing version variable.

## 0.0.1 - 2020-07-22

- Release v0.0.1.
86 changes: 0 additions & 86 deletions CHANGES.rst

This file was deleted.

2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2020-2021 Tobias Raabe
Copyright 2020 Tobias Raabe

Permission is hereby granted, free of charge, to any person obtaining a copy of this
software and associated documentation files (the "Software"), to deal in the Software
Expand Down
8 changes: 3 additions & 5 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
prune .conda
prune tests

exclude *.rst
exclude .coveragerc
exclude *.md
exclude *.yml
exclude *.yaml
exclude tox.ini

include LICENSE
include README.rst
include versioneer.py
include src/pytask_r/_version.py
include README.md
Loading