From b2641b5351a1fbd52e0d60dc44ae47b285c3a458 Mon Sep 17 00:00:00 2001 From: Alexandre Teles Date: Sun, 27 Nov 2022 00:40:55 -0300 Subject: [PATCH] chore: bump libs and python version --- .devcontainer/Dockerfile | 2 +- .devcontainer/devcontainer.json | 2 +- .github/workflows/codeql_analysis.yml | 2 +- .github/workflows/mypy.yml | 2 +- Dockerfile | 2 +- app/controllers/Releases.py | 14 +-- config.toml | 2 +- poetry.lock | 17 +--- pyproject.toml | 4 +- requirements.txt | 126 +++++++++++++------------- 10 files changed, 80 insertions(+), 93 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 529221b..496dcc1 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -ARG VARIANT="3.10-bullseye" +ARG VARIANT="3.11-bullseye" FROM mcr.microsoft.com/vscode/devcontainers/python:0-${VARIANT} ARG NODE_VERSION="none" diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 2f471a1..87d1b0d 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -9,7 +9,7 @@ // Update 'VARIANT' to pick a Python version: 3, 3.10, 3.9, 3.8, 3.7, 3.6 // Append -bullseye or -buster to pin to an OS version. // Use -bullseye variants on local on arm64/Apple Silicon. - "VARIANT": "3.10-bullseye", + "VARIANT": "3.11-bullseye", // Options "NODE_VERSION": "lts/*" } diff --git a/.github/workflows/codeql_analysis.yml b/.github/workflows/codeql_analysis.yml index ffe8eb7..2a65e6b 100644 --- a/.github/workflows/codeql_analysis.yml +++ b/.github/workflows/codeql_analysis.yml @@ -35,7 +35,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: '3.10.7' + python-version: '3.11.0' - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index e56f370..c45352d 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -12,7 +12,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v4 with: - python-version: 3.10.8 + python-version: 3.11.0 architecture: x64 - name: Checkout uses: actions/checkout@v3 diff --git a/Dockerfile b/Dockerfile index 0e9ce1a..6a600ae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-slim +FROM python:3.11-slim ARG GITHUB_TOKEN ENV GITHUB_TOKEN $GITHUB_TOKEN diff --git a/app/controllers/Releases.py b/app/controllers/Releases.py index 03d438c..df0606a 100644 --- a/app/controllers/Releases.py +++ b/app/controllers/Releases.py @@ -42,16 +42,16 @@ class Releases: 'content_type': asset['content_type'] } - no_release_assets_data: dict = {'repository': repository, - 'version': release_version, - 'timestamp': release_timestamp, - 'name': f"{repository.split('/')[1]}-{release_version}.tar.gz", - 'browser_download_url': release_tarball, - 'content_type': 'application/gzip' - } if release_assets: assets = [get_asset_data(asset) for asset in release_assets] else: + no_release_assets_data: dict = {'repository': repository, + 'version': release_version, + 'timestamp': release_timestamp, + 'name': f"{repository.split('/')[1]}-{release_version}.tar.gz", + 'browser_download_url': release_tarball, + 'content_type': 'application/gzip' + } assets.append(no_release_assets_data) return assets diff --git a/config.toml b/config.toml index aed964a..2a79f9e 100644 --- a/config.toml +++ b/config.toml @@ -22,7 +22,7 @@ description = """ 3. Abuse of the API will result in IP blocks """ -version = "1.0.0" +version = "1.1.0" [license] diff --git a/poetry.lock b/poetry.lock index 9698064..3c9734e 100644 --- a/poetry.lock +++ b/poetry.lock @@ -428,7 +428,6 @@ python-versions = ">=3.7" [package.dependencies] mypy-extensions = ">=0.4.3" -tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""} typing-extensions = ">=3.10" [package.extras] @@ -704,14 +703,6 @@ category = "main" optional = false python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" -[[package]] -name = "tomli" -version = "2.0.1" -description = "A lil' TOML parser" -category = "dev" -optional = false -python-versions = ">=3.7" - [[package]] name = "toolz" version = "0.12.0" @@ -817,8 +808,8 @@ h11 = ">=0.9.0,<1" [metadata] lock-version = "1.1" -python-versions = "^3.10" -content-hash = "b51dfff4fc7cd2e7d12e9f5418b1d9e5e3a4565e252319ebf5bc500622209d28" +python-versions = "^3.11" +content-hash = "3521fa317a1f3f0e22c399103630ff6a9389da385248b9c0e482e61744c4ace3" [metadata.files] aiofiles = [ @@ -1469,10 +1460,6 @@ toml = [ {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"}, {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"}, ] -tomli = [ - {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"}, - {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"}, -] toolz = [ {file = "toolz-0.12.0-py3-none-any.whl", hash = "sha256:2059bd4148deb1884bb0eb770a3cde70e7f954cfbbdc2285f1f2de01fd21eb6f"}, {file = "toolz-0.12.0.tar.gz", hash = "sha256:88c570861c440ee3f2f6037c4654613228ff40c93a6c25e0eba70d17282c6194"}, diff --git a/pyproject.toml b/pyproject.toml index 11773f4..a7c737b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,12 +1,12 @@ [tool.poetry] name = "revanced-releases-api" -version = "0.1.0" +version = "1.1.0" description = "JSON API for ReVanced Releases" authors = ["Alexandre Teles "] license = "AGPLv3" [tool.poetry.dependencies] -python = "^3.10" +python = "^3.11" fastapi = ">=0.85.0" httpx = {version = ">=0.23.0", extras = ["http2"]} httpx-cache = ">=0.6.0" diff --git a/requirements.txt b/requirements.txt index bc7262f..74b3b59 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,63 +1,63 @@ -aiofiles==22.1.0 ; python_version >= "3.10" and python_version < "4.0" -aiorwlock==1.3.0 ; python_version >= "3.10" and python_version < "4.0" -anyio==3.6.2 ; python_version >= "3.10" and python_version < "4.0" -argon2-cffi-bindings==21.2.0 ; python_version >= "3.10" and python_version < "4.0" -argon2-cffi==21.3.0 ; python_version >= "3.10" and python_version < "4.0" -async-timeout==4.0.2 ; python_version >= "3.10" and python_version < "4.0" -asyncstdlib==3.10.5 ; python_version >= "3.10" and python_version < "4.0" -attrs==21.4.0 ; python_version >= "3.10" and python_version < "4.0" -certifi==2022.9.24 ; python_version >= "3.10" and python_version < "4.0" -cffi==1.15.1 ; python_version >= "3.10" and python_version < "4.0" -click==8.1.3 ; python_version >= "3.10" and python_version < "4.0" -colorama==0.4.6 ; python_version >= "3.10" and python_version < "4.0" and sys_platform == "win32" or python_version >= "3.10" and python_version < "4.0" and platform_system == "Windows" -cryptography==37.0.4 ; python_version >= "3.10" and python_version < "4.0" -cytoolz==0.12.0 ; python_version >= "3.10" and python_version < "4.0" -fastapi-cache2==0.1.9 ; python_version >= "3.10" and python_version < "4.0" -fastapi-paseto-auth==0.6.0 ; python_version >= "3.10" and python_version < "4.0" -fastapi==0.85.0 ; python_version >= "3.10" and python_version < "4.0" -fasteners==0.17.3 ; python_version >= "3.10" and python_version < "4.0" -gunicorn==20.1.0 ; python_version >= "3.10" and python_version < "4.0" -h11==0.14.0 ; python_version >= "3.10" and python_version < "4.0" -h2==4.1.0 ; python_version >= "3.10" and python_version < "4.0" -hiredis==2.0.0 ; python_version >= "3.10" and python_version < "4.0" -hpack==4.0.0 ; python_version >= "3.10" and python_version < "4.0" -httpcore==0.16.2 ; python_version >= "3.10" and python_version < "4.0" -httpx-cache==0.6.1 ; python_version >= "3.10" and python_version < "4.0" -httpx==0.23.1 ; python_version >= "3.10" and python_version < "4.0" -httpx[http2]==0.23.1 ; python_version >= "3.10" and python_version < "4.0" -hypercorn[uvloop]==0.14.3 ; python_version >= "3.10" and python_version < "4.0" -hyperframe==6.0.1 ; python_version >= "3.10" and python_version < "4.0" -idna==3.4 ; python_version >= "3.10" and python_version < "4.0" -iso8601==1.1.0 ; python_version >= "3.10" and python_version < "4.0" -limits==1.6 ; python_version >= "3.10" and python_version < "4.0" -loguru==0.6.0 ; python_version >= "3.10" and python_version < "4.0" -msgpack==1.0.4 ; python_version >= "3.10" and python_version < "4.0" -orjson==3.8.2 ; python_version >= "3.10" and python_version < "4.0" -packaging==21.3 ; python_version >= "3.10" and python_version < "4.0" -passlib[argon2]==1.7.4 ; python_version >= "3.10" and python_version < "4.0" -pendulum==2.1.2 ; python_version >= "3.10" and python_version < "4.0" -priority==2.0.0 ; python_version >= "3.10" and python_version < "4.0" -pycparser==2.21 ; python_version >= "3.10" and python_version < "4.0" -pycryptodomex==3.16.0 ; python_version >= "3.10" and python_version < "4.0" -pydantic==1.10.2 ; python_version >= "3.10" and python_version < "4.0" -pyparsing==3.0.9 ; python_version >= "3.10" and python_version < "4.0" -pyseto==1.6.10 ; python_version >= "3.10" and python_version < "4.0" -python-dateutil==2.8.2 ; python_version >= "3.10" and python_version < "4.0" -pytzdata==2020.1 ; python_version >= "3.10" and python_version < "4.0" -redis==4.3.5 ; python_version >= "3.10" and python_version < "4.0" -rfc3986[idna2008]==1.5.0 ; python_version >= "3.10" and python_version < "4.0" -sentry-sdk==1.11.1 ; python_version >= "3.10" and python_version < "4.0" -setuptools==65.6.3 ; python_version >= "3.10" and python_version < "4.0" -six==1.16.0 ; python_version >= "3.10" and python_version < "4.0" -slowapi==0.1.6 ; python_version >= "3.10" and python_version < "4.0" -sniffio==1.3.0 ; python_version >= "3.10" and python_version < "4.0" -starlette==0.20.4 ; python_version >= "3.10" and python_version < "4.0" -toml==0.10.2 ; python_version >= "3.10" and python_version < "4.0" -toolz==0.12.0 ; python_version >= "3.10" and python_version < "4.0" -typing-extensions==4.4.0 ; python_version >= "3.10" and python_version < "4.0" -ujson==5.5.0 ; python_version >= "3.10" and python_version < "4.0" -urllib3==1.26.13 ; python_version >= "3.10" and python_version < "4.0" -uvicorn==0.20.0 ; python_version >= "3.10" and python_version < "4.0" -uvloop==0.17.0 ; platform_system != "Windows" and python_version >= "3.10" and python_version < "4.0" -win32-setctime==1.1.0 ; python_version >= "3.10" and python_version < "4.0" and sys_platform == "win32" -wsproto==1.2.0 ; python_version >= "3.10" and python_version < "4.0" +aiofiles==22.1.0 ; python_version >= "3.11" and python_version < "4.0" +aiorwlock==1.3.0 ; python_version >= "3.11" and python_version < "4.0" +anyio==3.6.2 ; python_version >= "3.11" and python_version < "4.0" +argon2-cffi-bindings==21.2.0 ; python_version >= "3.11" and python_version < "4.0" +argon2-cffi==21.3.0 ; python_version >= "3.11" and python_version < "4.0" +async-timeout==4.0.2 ; python_version >= "3.11" and python_version < "4.0" +asyncstdlib==3.10.5 ; python_version >= "3.11" and python_version < "4.0" +attrs==21.4.0 ; python_version >= "3.11" and python_version < "4.0" +certifi==2022.9.24 ; python_version >= "3.11" and python_version < "4.0" +cffi==1.15.1 ; python_version >= "3.11" and python_version < "4.0" +click==8.1.3 ; python_version >= "3.11" and python_version < "4.0" +colorama==0.4.6 ; python_version >= "3.11" and python_version < "4.0" and sys_platform == "win32" or python_version >= "3.11" and python_version < "4.0" and platform_system == "Windows" +cryptography==37.0.4 ; python_version >= "3.11" and python_version < "4.0" +cytoolz==0.12.0 ; python_version >= "3.11" and python_version < "4.0" +fastapi-cache2==0.1.9 ; python_version >= "3.11" and python_version < "4.0" +fastapi-paseto-auth==0.6.0 ; python_version >= "3.11" and python_version < "4.0" +fastapi==0.85.0 ; python_version >= "3.11" and python_version < "4.0" +fasteners==0.17.3 ; python_version >= "3.11" and python_version < "4.0" +gunicorn==20.1.0 ; python_version >= "3.11" and python_version < "4.0" +h11==0.14.0 ; python_version >= "3.11" and python_version < "4.0" +h2==4.1.0 ; python_version >= "3.11" and python_version < "4.0" +hiredis==2.0.0 ; python_version >= "3.11" and python_version < "4.0" +hpack==4.0.0 ; python_version >= "3.11" and python_version < "4.0" +httpcore==0.16.2 ; python_version >= "3.11" and python_version < "4.0" +httpx-cache==0.6.1 ; python_version >= "3.11" and python_version < "4.0" +httpx==0.23.1 ; python_version >= "3.11" and python_version < "4.0" +httpx[http2]==0.23.1 ; python_version >= "3.11" and python_version < "4.0" +hypercorn[uvloop]==0.14.3 ; python_version >= "3.11" and python_version < "4.0" +hyperframe==6.0.1 ; python_version >= "3.11" and python_version < "4.0" +idna==3.4 ; python_version >= "3.11" and python_version < "4.0" +iso8601==1.1.0 ; python_version >= "3.11" and python_version < "4.0" +limits==1.6 ; python_version >= "3.11" and python_version < "4.0" +loguru==0.6.0 ; python_version >= "3.11" and python_version < "4.0" +msgpack==1.0.4 ; python_version >= "3.11" and python_version < "4.0" +orjson==3.8.2 ; python_version >= "3.11" and python_version < "4.0" +packaging==21.3 ; python_version >= "3.11" and python_version < "4.0" +passlib[argon2]==1.7.4 ; python_version >= "3.11" and python_version < "4.0" +pendulum==2.1.2 ; python_version >= "3.11" and python_version < "4.0" +priority==2.0.0 ; python_version >= "3.11" and python_version < "4.0" +pycparser==2.21 ; python_version >= "3.11" and python_version < "4.0" +pycryptodomex==3.16.0 ; python_version >= "3.11" and python_version < "4.0" +pydantic==1.10.2 ; python_version >= "3.11" and python_version < "4.0" +pyparsing==3.0.9 ; python_version >= "3.11" and python_version < "4.0" +pyseto==1.6.10 ; python_version >= "3.11" and python_version < "4.0" +python-dateutil==2.8.2 ; python_version >= "3.11" and python_version < "4.0" +pytzdata==2020.1 ; python_version >= "3.11" and python_version < "4.0" +redis==4.3.5 ; python_version >= "3.11" and python_version < "4.0" +rfc3986[idna2008]==1.5.0 ; python_version >= "3.11" and python_version < "4.0" +sentry-sdk==1.11.1 ; python_version >= "3.11" and python_version < "4.0" +setuptools==65.6.3 ; python_version >= "3.11" and python_version < "4.0" +six==1.16.0 ; python_version >= "3.11" and python_version < "4.0" +slowapi==0.1.6 ; python_version >= "3.11" and python_version < "4.0" +sniffio==1.3.0 ; python_version >= "3.11" and python_version < "4.0" +starlette==0.20.4 ; python_version >= "3.11" and python_version < "4.0" +toml==0.10.2 ; python_version >= "3.11" and python_version < "4.0" +toolz==0.12.0 ; python_version >= "3.11" and python_version < "4.0" +typing-extensions==4.4.0 ; python_version >= "3.11" and python_version < "4.0" +ujson==5.5.0 ; python_version >= "3.11" and python_version < "4.0" +urllib3==1.26.13 ; python_version >= "3.11" and python_version < "4.0" +uvicorn==0.20.0 ; python_version >= "3.11" and python_version < "4.0" +uvloop==0.17.0 ; platform_system != "Windows" and python_version >= "3.11" and python_version < "4.0" +win32-setctime==1.1.0 ; python_version >= "3.11" and python_version < "4.0" and sys_platform == "win32" +wsproto==1.2.0 ; python_version >= "3.11" and python_version < "4.0"