Skip to content

Fix marker description and readme. #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 13, 2020
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
17 changes: 11 additions & 6 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.1.0
rev: v3.2.0
hooks:
- id: check-added-large-files
args: ['--maxkb=100']
Expand All @@ -10,20 +10,20 @@ repos:
- id: debug-statements
- id: end-of-file-fixer
- repo: https://github.com/asottile/pyupgrade
rev: v2.7.1
rev: v2.7.2
hooks:
- id: pyupgrade
args: [--py36-plus]
- repo: https://github.com/asottile/reorder_python_imports
rev: v2.3.0
rev: v2.3.5
hooks:
- id: reorder-python-imports
- repo: https://github.com/psf/black
rev: 19.10b0
rev: 20.8b1
hooks:
- id: black
- repo: https://github.com/asottile/blacken-docs
rev: v1.7.0
rev: v1.8.0
hooks:
- id: blacken-docs
additional_dependencies: [black]
Expand All @@ -48,9 +48,14 @@ repos:
Pygments,
]
- repo: https://github.com/PyCQA/doc8
rev: 0.8.1rc3
rev: 0.9.0a1
hooks:
- id: doc8
- repo: https://github.com/econchick/interrogate
rev: 1.3.1
hooks:
- id: interrogate
args: [-v, --fail-under=40, src, tests]
- repo: https://github.com/codespell-project/codespell
rev: v1.17.1
hooks:
Expand Down
8 changes: 7 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,13 @@ chronological order. Releases follow `semantic versioning <https://semver.org/>`
all releases are available on `Anaconda.org <https://anaconda.org/pytask/pytask-r>`_.


0.0.2 - 2020-xx-xx
0.0.3 - 2020-xx-xx
------------------

:gh:`2` fixes marker description and adds some changes to the readme.


0.0.2 - 2020-08-14
------------------

- :gh:`1` includes some minor changes like fixing the missing version variable.
Expand Down
6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ Installation

Install the plugin with

.. code-block:: bash
.. code-block:: console

$ conda config --add channels conda-forge --add channels pytask
$ conda install pytask-r

You also need to have R installed and ``Rscript`` on your command line. To test
whether it is installed, type the following on the command line

.. code-block:: bash
.. code-block:: console

$ Rscript --help

Expand All @@ -43,7 +43,7 @@ choosing either the normal R or Microsoft R Open (MRO). The command is one of th
following commands. (See `here <https://docs.anaconda.com/anaconda/user-guide/tasks/
using-r-language>`_ for further explanation on Anaconda, R, and MRO.)

.. code-block:: bash
.. code-block:: console

$ conda install -c r r-base # For normal R.
$ conda install -c r mro-base # For MRO.
Expand Down
2 changes: 1 addition & 1 deletion src/pytask_r/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@

@hookimpl
def pytask_parse_config(config):
config["markers"]["r"] = "r: Tasks which are executed with Rscript."
config["markers"]["r"] = "Tasks which are executed with Rscript."