Deprecate Python 3.6 and add support for Python 3.10. (#23)

tobiasraabe · web-flow · commit 238e002dc2d3 · 2022-02-08T00:27:36.000+01:00
diff --git a/.conda/meta.yaml b/.conda/meta.yaml
diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml
@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
-        python-version: ['3.7', '3.8', '3.9']
+        python-version: ['3.7', '3.8', '3.9', '3.10']
         r-version: ['3.6.3']
 
     steps:
@@ -45,7 +45,7 @@ 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.8' && matrix.r-version == '3.6.3'
+        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 unit -c
 
@@ -54,7 +54,7 @@ jobs:
       #   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.8' && matrix.r-version == '3.6.3'
+      #   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
 
@@ -63,11 +63,11 @@ jobs:
         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.8' && matrix.r-version == '3.6.3'
+        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 end_to_end -c
 
       - name: Validate codecov.yml
-        if: runner.os == 'Linux' && matrix.python-version == '3.8' && matrix.r-version == '3.6.3'
+        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
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -6,7 +6,6 @@ repos:
         args: ['--maxkb=100']
     -   id: check-merge-conflict
     -   id: check-yaml
-        exclude: meta.yaml
     -   id: debug-statements
     -   id: end-of-file-fixer
 -   repo: https://github.com/pre-commit/pygrep-hooks
@@ -25,11 +24,12 @@ repos:
     rev: v2.31.0
     hooks:
     -   id: pyupgrade
-        args: [--py36-plus]
+        args: [--py37-plus]
 -   repo: https://github.com/asottile/reorder_python_imports
     rev: v2.7.1
     hooks:
     -   id: reorder-python-imports
+        args: [--py37-plus, --add-import, 'from __future__ import annotations']
 -   repo: https://github.com/asottile/setup-cfg-fmt
     rev: v1.20.0
     hooks:
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -7,6 +7,13 @@ all releases are available on `PyPI <https://pypi.org/project/pytask-r>`_ and
 `Anaconda.org <https://anaconda.org/conda-forge/pytask-r>`_.
 
 
+0.1.1 - 2022-02-08
+------------------
+
+- :gh:`22` skips concurrent CI builds.
+- :gh:`23` deprecate Python 3.6 and add support for Python 3.10.
+
+
 0.1.0 - 2021-07-22
 ------------------
 
diff --git a/setup.cfg b/setup.cfg
@@ -15,7 +15,6 @@ classifiers =
     Operating System :: OS Independent
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
@@ -31,8 +30,8 @@ project_urls =
 packages = find:
 install_requires =
     click
-    pytask>=0.1.0
-python_requires = >=3.6
+    pytask>=0.1.7
+python_requires = >=3.7
 include_package_data = True
 package_dir = =src
 zip_safe = False
diff --git a/setup.py b/setup.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from setuptools import setup
 
 
diff --git a/src/pytask_r/__init__.py b/src/pytask_r/__init__.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 try:
     from ._version import version as __version__
 except ImportError:
diff --git a/src/pytask_r/collect.py b/src/pytask_r/collect.py
@@ -1,11 +1,11 @@
 """Collect tasks."""
+from __future__ import annotations
+
 import copy
 import functools
 import subprocess
 from typing import Iterable
-from typing import Optional
 from typing import Sequence
-from typing import Union
 
 from _pytask.config import hookimpl
 from _pytask.mark_utils import get_specific_markers_from_task
@@ -15,7 +15,7 @@
 from _pytask.parametrize import _copy_func
 
 
-def r(options: Optional[Union[str, Iterable[str]]] = None):
+def r(options: str | Iterable[str] | None = None):
     """Specify command line options for Rscript.
 
     Parameters
diff --git a/src/pytask_r/config.py b/src/pytask_r/config.py
@@ -1,4 +1,6 @@
 """Configure pytask."""
+from __future__ import annotations
+
 from _pytask.config import hookimpl
 
 
diff --git a/src/pytask_r/execute.py b/src/pytask_r/execute.py
@@ -1,4 +1,6 @@
 """Execute tasks."""
+from __future__ import annotations
+
 import shutil
 
 from _pytask.config import hookimpl
diff --git a/src/pytask_r/parametrize.py b/src/pytask_r/parametrize.py
@@ -1,4 +1,6 @@
 """Parametrize tasks."""
+from __future__ import annotations
+
 from _pytask.config import hookimpl
 from _pytask.mark import MARK_GEN as mark  # noqa: N811
 
diff --git a/src/pytask_r/plugin.py b/src/pytask_r/plugin.py
@@ -1,4 +1,6 @@
 """Register hook specifications and implementations."""
+from __future__ import annotations
+
 from _pytask.config import hookimpl
 from pytask_r import collect
 from pytask_r import config
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import shutil
 
 import pytest
diff --git a/tests/test_collect.py b/tests/test_collect.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from contextlib import ExitStack as does_not_raise  # noqa: N813
 from pathlib import Path
 
diff --git a/tests/test_config.py b/tests/test_config.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pytest
 from pytask import main
 
diff --git a/tests/test_execute.py b/tests/test_execute.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 import textwrap
 from contextlib import ExitStack as does_not_raise  # noqa: N813
diff --git a/tests/test_normal_execution_w_plugin.py b/tests/test_normal_execution_w_plugin.py
@@ -1,4 +1,6 @@
 """Contains tests which do not require the plugin and ensure normal execution."""
+from __future__ import annotations
+
 import textwrap
 
 import pytest
diff --git a/tests/test_parallel.py b/tests/test_parallel.py
@@ -1,4 +1,6 @@
 """Contains test which ensure that the plugin works with pytask-parallel."""
+from __future__ import annotations
+
 import os
 import textwrap
 import time
diff --git a/tests/test_parametrize.py b/tests/test_parametrize.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 import textwrap
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+from __future__ import annotations`
	`2`	`+`
`1`	`3`	`from setuptools import setup`
`2`	`4`
`3`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+from __future__ import annotations`
	`2`	`+`
`1`	`3`	`try:`
`2`	`4`	`from ._version import version as __version__`
`3`	`5`	`except ImportError:`