From a89544c953dbbbddfb43e96734cc4c8f0a6ca4a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89loi=20Rivard?= Date: Sat, 3 Jun 2023 15:37:24 +0200 Subject: [PATCH] Stop support for python<3.8 --- .github/workflows/tests.yaml | 1 - .gitlab-ci.yml | 5 ----- .pre-commit-config.yaml | 2 +- CHANGES.rst | 5 +++++ doc/conf.py | 5 +---- poetry.lock | 31 ++----------------------------- pyproject.toml | 3 +-- 7 files changed, 10 insertions(+), 42 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index b9968250..daf7e413 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -21,7 +21,6 @@ jobs: - '3.10' - '3.9' - '3.8' - - '3.7' steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v2 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6b22cb41..42f987eb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,11 +20,6 @@ style: stage: test script: tox -e style -python37: - image: python:3.7 - stage: test - script: tox -e py37 - python38: image: python:3.8 stage: test diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ca889199..abf9d217 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -21,7 +21,7 @@ repos: rev: v3.4.0 hooks: - id: pyupgrade - args: ["--py37-plus"] + args: ["--py38-plus"] - repo: https://github.com/psf/black rev: 23.3.0 hooks: diff --git a/CHANGES.rst b/CHANGES.rst index 67caaadc..e6a67d35 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file. The format is based on `Keep a Changelog `_, and this project adheres to `Semantic Versioning `_. +Removed +******* + +- Stop support for python 3.7 :pr:`131` + [0.0.26] - 2023-06-03 ===================== diff --git a/doc/conf.py b/doc/conf.py index ac628db8..63b1ca57 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -2,15 +2,12 @@ import datetime import os import sys +from importlib import metadata from unittest import mock sys.path.insert(0, os.path.abspath("..")) sys.path.insert(0, os.path.abspath("../canaille")) -if sys.version_info[:2] >= (3, 8): - from importlib import metadata -else: - import importlib_metadata as metadata # Readthedocs does not support C modules, so # we have to mock them. diff --git a/poetry.lock b/poetry.lock index 4791966d..9e12dde9 100644 --- a/poetry.lock +++ b/poetry.lock @@ -14,7 +14,6 @@ files = [ [package.dependencies] atpublic = "*" attrs = "*" -typing-extensions = {version = "*", markers = "python_version < \"3.8\""} [[package]] name = "alabaster" @@ -49,9 +48,6 @@ files = [ {file = "attrs-23.1.0.tar.gz", hash = "sha256:6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015"}, ] -[package.dependencies] -importlib-metadata = {version = "*", markers = "python_version < \"3.8\""} - [package.extras] cov = ["attrs[tests]", "coverage[toml] (>=5.3)"] dev = ["attrs[docs,tests]", "pre-commit"] @@ -311,7 +307,6 @@ files = [ [package.dependencies] colorama = {version = "*", markers = "platform_system == \"Windows\""} -importlib-metadata = {version = "*", markers = "python_version < \"3.8\""} [[package]] name = "colorama" @@ -580,7 +575,6 @@ files = [ [package.dependencies] python-dateutil = ">=2.4" -typing-extensions = {version = ">=3.10.0.1", markers = "python_version < \"3.8\""} [[package]] name = "fancycompleter" @@ -782,7 +776,6 @@ files = [ ] [package.dependencies] -typing-extensions = {version = ">=3.6.4", markers = "python_version < \"3.8\""} zipp = ">=0.5" [package.extras] @@ -1052,9 +1045,6 @@ files = [ {file = "platformdirs-3.5.1.tar.gz", hash = "sha256:412dae91f52a6f84830f39a8078cecd0e866cb72294a5c66808e74d5e88d251f"}, ] -[package.dependencies] -typing-extensions = {version = ">=4.5", markers = "python_version < \"3.8\""} - [package.extras] docs = ["furo (>=2023.3.27)", "proselint (>=0.13)", "sphinx (>=6.2.1)", "sphinx-autodoc-typehints (>=1.23,!=1.23.4)"] test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.3.1)", "pytest-cov (>=4)", "pytest-mock (>=3.10)"] @@ -1070,9 +1060,6 @@ files = [ {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"}, ] -[package.dependencies] -importlib-metadata = {version = ">=0.12", markers = "python_version < \"3.8\""} - [package.extras] dev = ["pre-commit", "tox"] testing = ["pytest", "pytest-benchmark"] @@ -1105,7 +1092,6 @@ files = [ [package.dependencies] cfgv = ">=2.0.0" identify = ">=1.0.0" -importlib-metadata = {version = "*", markers = "python_version < \"3.8\""} nodeenv = ">=0.11.1" pyyaml = ">=5.1" virtualenv = ">=20.10.0" @@ -1264,7 +1250,6 @@ files = [ [package.dependencies] colorama = {version = "*", markers = "sys_platform == \"win32\""} exceptiongroup = {version = ">=1.0.0rc8", markers = "python_version < \"3.11\""} -importlib-metadata = {version = ">=0.12", markers = "python_version < \"3.8\""} iniconfig = "*" packaging = "*" pluggy = ">=0.12,<2.0" @@ -1788,17 +1773,6 @@ files = [ {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"}, ] -[[package]] -name = "typing-extensions" -version = "4.6.3" -description = "Backported and Experimental Type Hints for Python 3.7+" -optional = false -python-versions = ">=3.7" -files = [ - {file = "typing_extensions-4.6.3-py3-none-any.whl", hash = "sha256:88a4153d8505aabbb4e13aacb7c486c2b4a33ca3b3f807914a9b4c844c471c26"}, - {file = "typing_extensions-4.6.3.tar.gz", hash = "sha256:d91d5919357fe7f681a9f2b5b4cb2a5f1ef0a1e9f59c4d8ff0d3491e05c0ffd5"}, -] - [[package]] name = "urllib3" version = "2.0.2" @@ -1830,7 +1804,6 @@ files = [ [package.dependencies] distlib = ">=0.3.6,<1" filelock = ">=3.11,<4" -importlib-metadata = {version = ">=6.4.1", markers = "python_version < \"3.8\""} platformdirs = ">=3.2,<4" [package.extras] @@ -1951,5 +1924,5 @@ sentry = ["sentry-sdk"] [metadata] lock-version = "2.0" -python-versions = ">=3.7, <4" -content-hash = "32d6537f3fe1c010fba20f1bff7f04e05df486aac5d7088074c447dec8ec090e" +python-versions = ">=3.8, <4" +content-hash = "06c9386f1765bba769c90e910bbf15fab3cf57f0e59b0bc3a784c2f64886710f" diff --git a/pyproject.toml b/pyproject.toml index d10d7d93..12c31045 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -36,7 +36,7 @@ readme = "README.md" include = ["canaille/translations/*/LC_MESSAGES/*.mo"] [tool.poetry.dependencies] -python = ">=3.7, <4" +python = ">=3.8, <4" authlib = ">1,<2" click = "<9" email_validator = "<3" @@ -122,7 +122,6 @@ isolated_build = true skipsdist = true envlist = style - py37 py38 py39 py310