From 3f3af1d833e2c8dedab5036851dffae02d057dd5 Mon Sep 17 00:00:00 2001 From: Tobias Raabe Date: Mon, 7 Feb 2022 17:40:46 +0100 Subject: [PATCH 1/3] Deprecate Python 3.6. Committed via https://github.com/asottile/all-repos --- .pre-commit-config.yaml | 3 ++- setup.cfg | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 441eaf9..0763e00 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -24,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.6.0 hooks: - id: reorder-python-imports + args: [--py37-plus, --add-import, 'from __future__ import annotations'] - repo: https://github.com/psf/black rev: 21.12b0 hooks: diff --git a/setup.cfg b/setup.cfg index c4ca642..249d78a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -32,7 +32,7 @@ install_requires = click pony pytask>=0.0.7 -python_requires = >=3.6 +python_requires = >=3.7 include_package_data = True package_dir = =src zip_safe = False From 30cdfd70176dcb356e3d867bcf777a3c9a371dcb Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 7 Feb 2022 16:41:38 +0000 Subject: [PATCH 2/3] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- setup.cfg | 2 +- setup.py | 2 ++ src/pytask_environment/__init__.py | 2 ++ src/pytask_environment/config.py | 2 ++ src/pytask_environment/database.py | 2 ++ src/pytask_environment/logging.py | 2 ++ src/pytask_environment/plugin.py | 2 ++ tests/conftest.py | 2 ++ tests/test_logging.py | 2 ++ 9 files changed, 17 insertions(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 249d78a..c4ca642 100644 --- a/setup.cfg +++ b/setup.cfg @@ -32,7 +32,7 @@ install_requires = click pony pytask>=0.0.7 -python_requires = >=3.7 +python_requires = >=3.6 include_package_data = True package_dir = =src zip_safe = False diff --git a/setup.py b/setup.py index 26e08e4..c21a9ee 100644 --- a/setup.py +++ b/setup.py @@ -1,3 +1,5 @@ +from __future__ import annotations + from setuptools import setup diff --git a/src/pytask_environment/__init__.py b/src/pytask_environment/__init__.py index 165802c..f493641 100644 --- a/src/pytask_environment/__init__.py +++ b/src/pytask_environment/__init__.py @@ -1,3 +1,5 @@ +from __future__ import annotations + try: from ._version import version as __version__ except ImportError: diff --git a/src/pytask_environment/config.py b/src/pytask_environment/config.py index 37b7c90..70fa747 100644 --- a/src/pytask_environment/config.py +++ b/src/pytask_environment/config.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import click from _pytask.config import hookimpl from _pytask.shared import convert_truthy_or_falsy_to_bool diff --git a/src/pytask_environment/database.py b/src/pytask_environment/database.py index bb69b2c..cc0c1a4 100644 --- a/src/pytask_environment/database.py +++ b/src/pytask_environment/database.py @@ -1,3 +1,5 @@ +from __future__ import annotations + from _pytask.database import db from pony import orm diff --git a/src/pytask_environment/logging.py b/src/pytask_environment/logging.py index 98dbc44..7076839 100644 --- a/src/pytask_environment/logging.py +++ b/src/pytask_environment/logging.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import sys from _pytask.config import hookimpl diff --git a/src/pytask_environment/plugin.py b/src/pytask_environment/plugin.py index 9fa319e..3ab9081 100644 --- a/src/pytask_environment/plugin.py +++ b/src/pytask_environment/plugin.py @@ -1,4 +1,6 @@ """Entry-point for the plugin.""" +from __future__ import annotations + from _pytask.config import hookimpl from pytask_environment import config from pytask_environment import database diff --git a/tests/conftest.py b/tests/conftest.py index 3a17662..541f8d3 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import pytest from click.testing import CliRunner diff --git a/tests/test_logging.py b/tests/test_logging.py index b160884..913412f 100644 --- a/tests/test_logging.py +++ b/tests/test_logging.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import sys import textwrap From 3c20347fdc8136c87c619cb581ba255f0851890f Mon Sep 17 00:00:00 2001 From: Tobias Raabe Date: Tue, 8 Feb 2022 01:04:43 +0100 Subject: [PATCH 3/3] Fix changes. --- .github/workflows/continuous-integration-workflow.yml | 9 ++------- .pre-commit-config.yaml | 8 ++++++++ CHANGES.rst | 6 ++++++ setup.cfg | 5 ++--- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index 422f4c1..60a90e2 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -22,7 +22,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 @@ -41,11 +41,6 @@ jobs: run: tox -e pytest -- -m end_to_end --cov=./ --cov-report=xml - 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 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0763e00..6a2ce2f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,6 +8,14 @@ repos: - id: check-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: diff --git a/CHANGES.rst b/CHANGES.rst index e7bd584..484ff0e 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -7,6 +7,12 @@ reverse chronological order. Releases follow `semantic versioning `_. +0.1.1 - 2022-02-08 +------------------ + +- :gh:`13` deprecates Python 3.6 and adds support for Python 3.10. + + 0.1.0 - 2022-01-25 ------------------ diff --git a/setup.cfg b/setup.cfg index c4ca642..0f11477 100644 --- 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 @@ packages = find: install_requires = click pony - pytask>=0.0.7 -python_requires = >=3.6 + pytask>=0.1.7 +python_requires = >=3.7 include_package_data = True package_dir = =src zip_safe = False