Skip to content

Commit a114ce1

Browse files
authored
Deprecate Python 3.6 and add support for Python 3.10. (#31)
1 parent 9cf1402 commit a114ce1

20 files changed

+54
-66
lines changed

.conda/meta.yaml

-49
This file was deleted.

.github/workflows/continuous-integration-workflow.yml

+3-8
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
fail-fast: false
2525
matrix:
2626
os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
27-
python-version: ['3.7', '3.8', '3.9']
27+
python-version: ['3.7', '3.8', '3.9', '3.10']
2828

2929
steps:
3030
- uses: actions/checkout@v2
@@ -46,7 +46,7 @@ jobs:
4646
run: tox -e pytest -- -m "unit or (not integration and not end_to_end)" --cov=./ --cov-report=xml -n auto
4747

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

@@ -55,11 +55,6 @@ jobs:
5555
run: tox -e pytest -- -m end_to_end --cov=./ --cov-report=xml -n auto
5656

5757
- name: Upload coverage reports of end-to-end tests.
58-
if: runner.os == 'Linux' && matrix.python-version == '3.8'
58+
if: runner.os == 'Linux' && matrix.python-version == '3.9'
5959
shell: bash -l {0}
6060
run: bash <(curl -s https://codecov.io/bash) -F end_to_end -c
61-
62-
- name: Validate codecov.yml
63-
if: runner.os == 'Linux' && matrix.python-version == '3.8'
64-
shell: bash -l {0}
65-
run: cat codecov.yml | curl --data-binary @- https://codecov.io/validate

.pre-commit-config.yaml

+10-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,16 @@ repos:
66
args: ['--maxkb=100']
77
- id: check-merge-conflict
88
- id: check-yaml
9-
exclude: meta.yaml
109
- id: debug-statements
1110
- id: end-of-file-fixer
11+
- id: check-case-conflict
12+
- id: check-vcs-permalinks
13+
- id: check-yaml
14+
- id: fix-byte-order-marker
15+
- id: mixed-line-ending
16+
- id: no-commit-to-branch
17+
args: [--branch, main]
18+
- id: trailing-whitespace
1219
- repo: https://github.com/pre-commit/pygrep-hooks
1320
rev: v1.9.0 # Use the ref you want to point at
1421
hooks:
@@ -25,11 +32,12 @@ repos:
2532
rev: v2.31.0
2633
hooks:
2734
- id: pyupgrade
28-
args: [--py36-plus]
35+
args: [--py37-plus]
2936
- repo: https://github.com/asottile/reorder_python_imports
3037
rev: v2.7.1
3138
hooks:
3239
- id: reorder-python-imports
40+
args: [--py37-plus, --add-import, 'from __future__ import annotations']
3341
- repo: https://github.com/asottile/setup-cfg-fmt
3442
rev: v1.20.0
3543
hooks:

CHANGES.rst

+7
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@ all releases are available on `Anaconda.org
77
<https://anaconda.org/conda-forge/pytask-latex>`_.
88

99

10+
0.1.1 - 2022-02-08
11+
------------------
12+
13+
- :gh:`30` skips concurrent CI builds.
14+
- :gh:`31` deprecates Python 3.6 and add support for Python 3.10.
15+
16+
1017
0.1.0 - 2021-07-21
1118
------------------
1219

setup.cfg

+3-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ classifiers =
1515
Operating System :: OS Independent
1616
Programming Language :: Python :: 3
1717
Programming Language :: Python :: 3 :: Only
18-
Programming Language :: Python :: 3.6
1918
Programming Language :: Python :: 3.7
2019
Programming Language :: Python :: 3.8
2120
Programming Language :: Python :: 3.9
@@ -30,9 +29,9 @@ project_urls =
3029
packages = find:
3130
install_requires =
3231
click
33-
latex-dependency-scanner
34-
pytask>=0.1.0
35-
python_requires = >=3.6
32+
latex-dependency-scanner>=0.1.1
33+
pytask>=0.1.7
34+
python_requires = >=3.7
3635
include_package_data = True
3736
package_dir = =src
3837
zip_safe = False

setup.py

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
from __future__ import annotations
2+
13
from setuptools import setup
24

35

src/pytask_latex/__init__.py

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
from __future__ import annotations
2+
13
try:
24
from ._version import version as __version__
35
except ImportError:

src/pytask_latex/collect.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
"""Collect tasks."""
2+
from __future__ import annotations
3+
24
import copy
35
import functools
46
import os
57
import subprocess
68
from pathlib import Path
79
from typing import Iterable
8-
from typing import Optional
910
from typing import Sequence
10-
from typing import Union
1111

1212
from _pytask.config import hookimpl
1313
from _pytask.mark import Mark
@@ -23,7 +23,7 @@
2323
DEFAULT_OPTIONS = ["--pdf", "--interaction=nonstopmode", "--synctex=1", "--cd"]
2424

2525

26-
def latex(options: Optional[Union[str, Iterable[str]]] = None):
26+
def latex(options: str | Iterable[str] | None = None):
2727
"""Specify command line options for latexmk.
2828
2929
Parameters

src/pytask_latex/config.py

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
"""Configure pytask."""
2+
from __future__ import annotations
3+
24
from _pytask.config import hookimpl
35
from _pytask.shared import convert_truthy_or_falsy_to_bool
46
from _pytask.shared import get_first_non_none_value

src/pytask_latex/execute.py

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
"""Execute tasks."""
2+
from __future__ import annotations
3+
24
import shutil
35

46
from _pytask.config import hookimpl

src/pytask_latex/parametrize.py

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
"""Parametrize tasks."""
2+
from __future__ import annotations
3+
24
from _pytask.config import hookimpl
35
from _pytask.mark import MARK_GEN as mark # noqa: N811
46

src/pytask_latex/plugin.py

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
"""Entry-point for the plugin."""
2+
from __future__ import annotations
3+
24
from _pytask.config import hookimpl
35
from pytask_latex import collect
46
from pytask_latex import config

tests/conftest.py

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
"""Configuration file for pytest."""
2+
from __future__ import annotations
3+
24
import os
35
import shutil
46
import sys

tests/test_collect.py

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
from __future__ import annotations
2+
13
from contextlib import ExitStack as does_not_raise # noqa: N813
24
from pathlib import Path
35

tests/test_config.py

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
from __future__ import annotations
2+
13
import pytest
24
from pytask import main
35

tests/test_execute.py

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
from __future__ import annotations
2+
13
import textwrap
24
from contextlib import ExitStack as does_not_raise # noqa: N813
35
from subprocess import CalledProcessError

tests/test_latex_dependency_scanner.py

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
from __future__ import annotations
2+
13
import textwrap
24

35
import pytest

tests/test_normal_execution_w_plugin.py

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
"""Contains tests which do not require the plugin and ensure normal execution."""
2+
from __future__ import annotations
3+
24
import textwrap
35

46
import pytest

tests/test_parallel.py

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
"""Contains test which ensure that the plugin works with pytask-parallel."""
2+
from __future__ import annotations
3+
24
import textwrap
35
import time
46

tests/test_parametrize.py

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
from __future__ import annotations
2+
13
import textwrap
24

35
import pytest

0 commit comments

Comments
 (0)