From f8ea7cfc2bd9fb6906251ee077b0a5f015426246 Mon Sep 17 00:00:00 2001 From: Jonathan Sick Date: Tue, 4 Jul 2023 12:45:14 -0400 Subject: [PATCH 1/4] Pin Pydantic<2 --- CHANGELOG.rst | 5 +++++ setup.cfg | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 492e9ca..747ea23 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,11 @@ Change Log ########## +1.0.6 (2023-07-04) +================== + +- Pin ``pydantic<2.0.0``. + 1.0.1 (2021-05-11) ================== diff --git a/setup.cfg b/setup.cfg index e87e4da..9d8a396 100644 --- a/setup.cfg +++ b/setup.cfg @@ -41,7 +41,7 @@ install_requires = structlog ltd-conveyor requests - pydantic + pydantic<2.0.0 click pypandoc panflute From 31b154d34aade82a826491a47b9fc16c33d106ea Mon Sep 17 00:00:00 2001 From: Jonathan Sick Date: Tue, 4 Jul 2023 13:01:15 -0400 Subject: [PATCH 2/4] Update pre-commit hooks --- .pre-commit-config.yaml | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9b79b5b..61f4619 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.3.0 + rev: v4.4.0 hooks: - id: check-yaml - id: check-toml @@ -8,37 +8,30 @@ repos: - id: trailing-whitespace - repo: https://github.com/Lucas-C/pre-commit-hooks-markup - rev: v1.0.0 + rev: v1.0.1 hooks: - id: rst-linter files: (README\.rst)|(CHANGELOG\.rst) - repo: https://github.com/PyCQA/isort - rev: 5.10.1 + rev: 5.12.0 hooks: - id: isort args: [toml] -- repo: https://github.com/timothycrosley/isort - rev: 5.10.1 - hooks: - - id: isort - additional_dependencies: - - toml - - repo: https://github.com/psf/black - rev: 22.6.0 + rev: 23.3.0 hooks: - id: black - repo: https://github.com/asottile/blacken-docs - rev: v1.12.1 + rev: 1.14.0 hooks: - id: blacken-docs - additional_dependencies: [black==22.6.0] + additional_dependencies: [black==23.3.0] args: [-l, "79", -t, py37] -- repo: https://gitlab.com/pycqa/flake8 - rev: 5.0.2 +- repo: https://github.com/pycqa/flake8 + rev: 6.0.0 hooks: - id: flake8 From 294ceac9928272f6c523213fc1ddd1edc336c46b Mon Sep 17 00:00:00 2001 From: Jonathan Sick Date: Tue, 4 Jul 2023 13:05:38 -0400 Subject: [PATCH 3/4] Require Python >= 3.8 (drop 3.7) --- .github/workflows/ci.yaml | 2 +- CHANGELOG.rst | 1 + setup.cfg | 7 ++++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d7b1766..b168c7f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -8,7 +8,7 @@ jobs: strategy: matrix: - python-version: ["3.7", "3.8", "3.9", "3.10"] + python-version: ["3.8", "3.9", "3.10", "3.11"] steps: - uses: actions/checkout@v2 diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 747ea23..af53e60 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,6 +6,7 @@ Change Log ================== - Pin ``pydantic<2.0.0``. +- Drop support for Python 3.7. 1.0.1 (2021-05-11) ================== diff --git a/setup.cfg b/setup.cfg index 9d8a396..85696f8 100644 --- a/setup.cfg +++ b/setup.cfg @@ -15,9 +15,10 @@ classifiers = License :: OSI Approved :: MIT License Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.6 - Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 + Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 + Programming Language :: Python :: 3.11 Intended Audience :: Developers Natural Language :: English Operating System :: POSIX @@ -30,7 +31,7 @@ include_package_data = True package_dir = = src packages = find: -python_requires = >=3.6 +python_requires = >=3.8 setup_requires = setuptools_scm install_requires = From df5ef99d1a64985cd0d2c51ddf0aec961d3a3135 Mon Sep 17 00:00:00 2001 From: Jonathan Sick Date: Tue, 4 Jul 2023 13:09:36 -0400 Subject: [PATCH 4/4] Reformat with black --- src/lander/config.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lander/config.py b/src/lander/config.py index 7e5db59..cf30f52 100644 --- a/src/lander/config.py +++ b/src/lander/config.py @@ -172,7 +172,6 @@ class EncodedString(BaseModel): class GitRefType(str, Enum): - tag = "tag" branch = "branch"