From c6149483864ec060dc97822775c3622fe0fe8d06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Greinhofer?= Date: Thu, 2 Nov 2023 10:31:32 -0500 Subject: [PATCH] Update to Python 3.12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Updates the Python version to the latest(3.12). Fixes PeopleForBikes/brokenspoke-analyzer#414 Signed-off-by: Rémy Greinhofer --- .github/workflows/ci.yaml | 4 +- .github/workflows/e2e.yaml | 2 +- .github/workflows/release.yaml | 2 +- poetry.lock | 72 ++-------------------------------- pyproject.toml | 19 +++++---- 5 files changed, 19 insertions(+), 80 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 29b4019f..336bb3ab 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -17,7 +17,7 @@ jobs: - uses: Gr1N/setup-poetry@v8 - uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version: "3.12" cache: "poetry" - name: Setup the project run: poetry install @@ -36,7 +36,7 @@ jobs: - uses: Gr1N/setup-poetry@v8 - uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version: "3.12" cache: "poetry" - name: Setup host run: poetry install diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 6fa81215..424a06ff 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -35,7 +35,7 @@ jobs: - uses: Gr1N/setup-poetry@v8 - uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version: "3.12" cache: "poetry" - name: install dependencies run: | diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index d03110a1..8b5f598d 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -28,7 +28,7 @@ jobs: - uses: Gr1N/setup-poetry@v8 - uses: actions/setup-python@v4 with: - python-version: "3.11" + python-version: "3.12" cache: "poetry" - name: Setup the project run: poetry install diff --git a/poetry.lock b/poetry.lock index 611f452b..6de4e67c 100644 --- a/poetry.lock +++ b/poetry.lock @@ -87,7 +87,6 @@ files = [ [package.dependencies] aiosignal = ">=1.1.2" -async-timeout = {version = ">=4.0,<5.0", markers = "python_version < \"3.11\""} attrs = ">=17.3.0" frozenlist = ">=1.1.1" multidict = ">=4.5,<7.0" @@ -144,10 +143,8 @@ files = [ ] [package.dependencies] -exceptiongroup = {version = ">=1.0.2", markers = "python_version < \"3.11\""} idna = ">=2.8" sniffio = ">=1.1" -typing-extensions = {version = ">=4.1", markers = "python_version < \"3.11\""} [package.extras] doc = ["Sphinx (>=7)", "packaging", "sphinx-autodoc-typehints (>=1.2.0)", "sphinx-rtd-theme"] @@ -281,20 +278,6 @@ files = [ {file = "async_lru-2.0.4-py3-none-any.whl", hash = "sha256:ff02944ce3c288c5be660c42dbcca0742b32c3b279d6dceda655190240b99224"}, ] -[package.dependencies] -typing-extensions = {version = ">=4.0.0", markers = "python_version < \"3.11\""} - -[[package]] -name = "async-timeout" -version = "4.0.3" -description = "Timeout context manager for asyncio programs" -optional = false -python-versions = ">=3.7" -files = [ - {file = "async-timeout-4.0.3.tar.gz", hash = "sha256:4640d96be84d82d02ed59ea2b7105a0f7b33abe8703703cd0ab0bf87c427522f"}, - {file = "async_timeout-4.0.3-py3-none-any.whl", hash = "sha256:7405140ff1230c310e51dc27b3145b9092d659ce68ff733fb0cefe3ee42be028"}, -] - [[package]] name = "attrs" version = "23.2.0" @@ -768,9 +751,6 @@ files = [ {file = "coverage-7.4.1.tar.gz", hash = "sha256:1ed4b95480952b1a26d863e546fa5094564aa0065e1e5f0d4d0041f293251d04"}, ] -[package.dependencies] -tomli = {version = "*", optional = true, markers = "python_full_version <= \"3.11.0a6\" and extra == \"toml\""} - [package.extras] toml = ["tomli"] @@ -914,20 +894,6 @@ files = [ {file = "docutils-0.20.1.tar.gz", hash = "sha256:f08a4e276c3a1583a86dce3e34aba3fe04d02bba2dd51ed16106244e8a923e3b"}, ] -[[package]] -name = "exceptiongroup" -version = "1.2.0" -description = "Backport of PEP 654 (exception groups)" -optional = false -python-versions = ">=3.7" -files = [ - {file = "exceptiongroup-1.2.0-py3-none-any.whl", hash = "sha256:4bfd3996ac73b41e9b9628b04e079f193850720ea5945fc96a08633c66912f14"}, - {file = "exceptiongroup-1.2.0.tar.gz", hash = "sha256:91f5c769735f051a4290d52edd0858999b57e5876e9f85937691bd4c9fa3ed68"}, -] - -[package.extras] -test = ["pytest (>=6)"] - [[package]] name = "execnet" version = "2.0.2" @@ -1301,7 +1267,6 @@ files = [ [package.dependencies] colorama = {version = "*", markers = "sys_platform == \"win32\""} decorator = "*" -exceptiongroup = {version = "*", markers = "python_version < \"3.11\""} jedi = ">=0.16" matplotlib-inline = "*" pexpect = {version = ">4.3", markers = "sys_platform != \"win32\""} @@ -1703,7 +1668,6 @@ jupyter-server = ">=2.4.0,<3" jupyterlab-server = ">=2.19.0,<3" notebook-shim = ">=0.2" packaging = "*" -tomli = {version = "*", markers = "python_version < \"3.11\""} tornado = ">=6.2.0" traitlets = "*" @@ -2067,7 +2031,6 @@ files = [ [package.dependencies] mypy-extensions = ">=1.0.0" -tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""} typing-extensions = ">=4.1.0" [package.extras] @@ -2370,11 +2333,7 @@ files = [ ] [package.dependencies] -numpy = [ - {version = ">=1.22.4,<2", markers = "python_version < \"3.11\""}, - {version = ">=1.23.2,<2", markers = "python_version == \"3.11\""}, - {version = ">=1.26.0,<2", markers = "python_version >= \"3.12\""}, -] +numpy = {version = ">=1.26.0,<2", markers = "python_version >= \"3.12\""} python-dateutil = ">=2.8.2" pytz = ">=2020.1" tzdata = ">=2022.7" @@ -2681,11 +2640,9 @@ files = [ [package.dependencies] colorama = {version = "*", markers = "sys_platform == \"win32\""} -exceptiongroup = {version = ">=1.0.0rc8", markers = "python_version < \"3.11\""} iniconfig = "*" packaging = "*" pluggy = ">=1.3.0,<2.0" -tomli = {version = ">=1.0.0", markers = "python_version < \"3.11\""} [package.extras] testing = ["argcomplete", "attrs (>=19.2.0)", "hypothesis (>=3.56)", "mock", "nose", "pygments (>=2.7.2)", "requests", "setuptools", "xmlschema"] @@ -3831,7 +3788,6 @@ pytest = "*" pyyaml = ">=5.1" regex = "*" tblib = "*" -toml = {version = "*", markers = "python_version < \"3.11\""} tqdm = "*" typing-extensions = "*" @@ -3929,28 +3885,6 @@ webencodings = ">=0.4" doc = ["sphinx", "sphinx_rtd_theme"] test = ["flake8", "isort", "pytest"] -[[package]] -name = "toml" -version = "0.10.2" -description = "Python Library for Tom's Obvious, Minimal Language" -optional = false -python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" -files = [ - {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"}, - {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"}, -] - -[[package]] -name = "tomli" -version = "2.0.1" -description = "A lil' TOML parser" -optional = false -python-versions = ">=3.7" -files = [ - {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"}, - {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"}, -] - [[package]] name = "tornado" version = "6.4" @@ -4405,5 +4339,5 @@ multidict = ">=4.0" [metadata] lock-version = "2.0" -python-versions = "^3.10" -content-hash = "5199893ec6686c6ef026b9960bbbfbb5b05713e640ebdd0e99ef91866e9c66ed" +python-versions = "^3.12" +content-hash = "c67d7dcb1772d8146e135b9a1b214208dd671f73ad1451da604f444b68baf6e4" diff --git a/pyproject.toml b/pyproject.toml index f4884cb9..c70f98d7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ authors = [ license = "MIT" [tool.poetry.dependencies] -python = "^3.10" +python = "^3.12" aiohttp = "^3.9.3" boto3 = "^1.34.30" geopandas = "^0.14.2" @@ -106,15 +106,20 @@ select = ["D"] convention = "pep257" [tool.mypy] -strict = "true" +strict = true [[tool.mypy.overrides]] -module = ["brokenspoke_analyzer.pyrosm.*"] -ignore_errors = "true" +module = [ + "brokenspoke_analyzer.pyrosm.*", + "boto3", + "geopandas", + "osmnx", + "shapely", + "us", +] +ignore_errors = true +ignore_missing_imports = true -[[tool.mypy.overrides]] -module = ["boto3", "geopandas", "osmnx", "shapely", "us"] -ignore_missing_imports = "true" [tool.sqlfluff.core] dialect = "postgres"