Skip to content

Deprecate Python 3.6 and add support for Python 3.10. #31

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 4 commits into from
Feb 7, 2022
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
49 changes: 0 additions & 49 deletions .conda/meta.yaml

This file was deleted.

11 changes: 3 additions & 8 deletions .github/workflows/continuous-integration-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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']

steps:
- uses: actions/checkout@v2
Expand All @@ -46,7 +46,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'
if: runner.os == 'Linux' && matrix.python-version == '3.9'
shell: bash -l {0}
run: bash <(curl -s https://codecov.io/bash) -F unit -c

Expand All @@ -55,11 +55,6 @@ 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'
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.8'
shell: bash -l {0}
run: cat codecov.yml | curl --data-binary @- https://codecov.io/validate
12 changes: 10 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,16 @@ repos:
args: ['--maxkb=100']
- id: check-merge-conflict
- id: check-yaml
exclude: meta.yaml
- id: debug-statements
- id: end-of-file-fixer
- id: check-case-conflict
- id: check-vcs-permalinks
- id: check-yaml
- id: fix-byte-order-marker
- id: mixed-line-ending
- id: no-commit-to-branch
args: [--branch, main]
- id: trailing-whitespace
- repo: https://github.com/pre-commit/pygrep-hooks
rev: v1.9.0 # Use the ref you want to point at
hooks:
Expand All @@ -25,11 +32,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:
Expand Down
7 changes: 7 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ all releases are available on `Anaconda.org
<https://anaconda.org/conda-forge/pytask-latex>`_.


0.1.1 - 2022-02-08
------------------

- :gh:`30` skips concurrent CI builds.
- :gh:`31` deprecates Python 3.6 and add support for Python 3.10.


0.1.0 - 2021-07-21
------------------

Expand Down
7 changes: 3 additions & 4 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -30,9 +29,9 @@ project_urls =
packages = find:
install_requires =
click
latex-dependency-scanner
pytask>=0.1.0
python_requires = >=3.6
latex-dependency-scanner>=0.1.1
pytask>=0.1.7
python_requires = >=3.7
include_package_data = True
package_dir = =src
zip_safe = False
Expand Down
2 changes: 2 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import annotations

from setuptools import setup


Expand Down
2 changes: 2 additions & 0 deletions src/pytask_latex/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import annotations

try:
from ._version import version as __version__
except ImportError:
Expand Down
6 changes: 3 additions & 3 deletions src/pytask_latex/collect.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
"""Collect tasks."""
from __future__ import annotations

import copy
import functools
import os
import subprocess
from pathlib import Path
from typing import Iterable
from typing import Optional
from typing import Sequence
from typing import Union

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


def latex(options: Optional[Union[str, Iterable[str]]] = None):
def latex(options: str | Iterable[str] | None = None):
"""Specify command line options for latexmk.

Parameters
Expand Down
2 changes: 2 additions & 0 deletions src/pytask_latex/config.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
"""Configure pytask."""
from __future__ import annotations

from _pytask.config import hookimpl
from _pytask.shared import convert_truthy_or_falsy_to_bool
from _pytask.shared import get_first_non_none_value
Expand Down
2 changes: 2 additions & 0 deletions src/pytask_latex/execute.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
"""Execute tasks."""
from __future__ import annotations

import shutil

from _pytask.config import hookimpl
Expand Down
2 changes: 2 additions & 0 deletions src/pytask_latex/parametrize.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 2 additions & 0 deletions src/pytask_latex/plugin.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
"""Entry-point for the plugin."""
from __future__ import annotations

from _pytask.config import hookimpl
from pytask_latex import collect
from pytask_latex import config
Expand Down
2 changes: 2 additions & 0 deletions tests/conftest.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
"""Configuration file for pytest."""
from __future__ import annotations

import os
import shutil
import sys
Expand Down
2 changes: 2 additions & 0 deletions tests/test_collect.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import annotations

from contextlib import ExitStack as does_not_raise # noqa: N813
from pathlib import Path

Expand Down
2 changes: 2 additions & 0 deletions tests/test_config.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import annotations

import pytest
from pytask import main

Expand Down
2 changes: 2 additions & 0 deletions tests/test_execute.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import annotations

import textwrap
from contextlib import ExitStack as does_not_raise # noqa: N813
from subprocess import CalledProcessError
Expand Down
2 changes: 2 additions & 0 deletions tests/test_latex_dependency_scanner.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import annotations

import textwrap

import pytest
Expand Down
2 changes: 2 additions & 0 deletions tests/test_normal_execution_w_plugin.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
"""Contains tests which do not require the plugin and ensure normal execution."""
from __future__ import annotations

import textwrap

import pytest
Expand Down
2 changes: 2 additions & 0 deletions tests/test_parallel.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
"""Contains test which ensure that the plugin works with pytask-parallel."""
from __future__ import annotations

import textwrap
import time

Expand Down
2 changes: 2 additions & 0 deletions tests/test_parametrize.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import annotations

import textwrap

import pytest
Expand Down