From aaec3da9d3dee4202ea10e04e9b320f932b42160 Mon Sep 17 00:00:00 2001 From: "adam.watkins" Date: Wed, 30 Nov 2022 22:14:50 -0800 Subject: [PATCH 1/7] feat: Add official support for python 3.11 --- .github/workflows/pytest.yml | 2 +- setup.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index c874f770..cec7f0a9 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [ "3.6", "3.7", "3.8", "3.9", "3.10" ] + python-version: [ "3.6", "3.7", "3.8", "3.9", "3.10", "3.11" ] services: postgres: image: postgres diff --git a/setup.py b/setup.py index ddb1e615..5f064429 100644 --- a/setup.py +++ b/setup.py @@ -49,6 +49,7 @@ def get_version(): "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", "Topic :: Internet :: WWW/HTTP :: HTTP Servers", "Topic :: Internet :: WWW/HTTP", ], From 2fc979bb112a438c5a26e10f2a295cf8a8433c76 Mon Sep 17 00:00:00 2001 From: "adam.watkins" Date: Fri, 16 Dec 2022 13:42:18 -0800 Subject: [PATCH 2/7] feat: update version and remove py 3.6 support --- README.md | 2 +- fastapi_crudrouter/_version.py | 2 +- setup.py | 3 +-- tests/dev.requirements.txt | 4 +--- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index a1322c12..8a87c8b6 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ A dynamic FastAPI router that automatically creates CRUD routes for your models

-Tests +Tests Downloads Package version diff --git a/fastapi_crudrouter/_version.py b/fastapi_crudrouter/_version.py index af46754d..3e2f46a3 100644 --- a/fastapi_crudrouter/_version.py +++ b/fastapi_crudrouter/_version.py @@ -1 +1 @@ -__version__ = "0.8.5" +__version__ = "0.9.0" diff --git a/setup.py b/setup.py index 2447f71e..1ab8da6e 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ def get_version(): long_description=open("README.md").read(), long_description_content_type="text/markdown", install_requires=["fastapi"], - python_requires=">=3.6", + python_requires=">=3.7", keywords=["fastapi", "crud", "restful", "routing", "generator", "crudrouter"], classifiers=[ "Operating System :: OS Independent", @@ -44,7 +44,6 @@ def get_version(): "Intended Audience :: System Administrators", "License :: OSI Approved :: MIT License", "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", diff --git a/tests/dev.requirements.txt b/tests/dev.requirements.txt index f4dc82e2..c9f34eb7 100644 --- a/tests/dev.requirements.txt +++ b/tests/dev.requirements.txt @@ -1,10 +1,8 @@ fastapi -async-generator; python_version=='3.6' -async-exit-stack; python_version=='3.6' # Backends ormar -tortoise-orm==0.17.8; python_version>='3.7' +tortoise-orm==0.17.8; databases aiosqlite sqlalchemy==1.3.22 From b8b1bdec9cb8ed37c7d4a86411472d67aed33ded Mon Sep 17 00:00:00 2001 From: "adam.watkins" Date: Fri, 16 Dec 2022 13:43:35 -0800 Subject: [PATCH 3/7] feat: update version and remove py 3.6 support --- .github/workflows/pypi-publish.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml index 0bbf43df..08c79dd6 100644 --- a/.github/workflows/pypi-publish.yml +++ b/.github/workflows/pypi-publish.yml @@ -17,8 +17,6 @@ jobs: - uses: actions/checkout@v2 - name: Set up Python uses: actions/setup-python@v2 - with: - python-version: '3.6' - name: Bump Version env: TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} From 4a056a895907f98b6b8e6dce8352aba9926721fa Mon Sep 17 00:00:00 2001 From: awtkns Date: Fri, 27 Jan 2023 23:19:11 -0800 Subject: [PATCH 4/7] :arrow_down: Revert poetry changes --- .github/workflows/pytest.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 55c14d64..0c77a4bb 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -33,13 +33,10 @@ jobs: uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - - name: Install poetry - uses: snok/install-poetry@v1 - with: - virtualenvs-create: true - virtualenvs-in-project: true - name: Install dependencies - run: poetry install --no-interaction --no-root + run: | + python -m pip install --upgrade pip + pip install -r tests/dev.requirements.txt - name: Test with pytest env: POSTGRES_DB: test @@ -48,5 +45,4 @@ jobs: POSTGRES_HOST: localhost POSTGRES_PORT: ${{ job.services.postgres.ports[5432] }} run: | - source .venv/bin/activate pytest From 27dde690433d2a24dfa5e9fdbec91504d4ac2887 Mon Sep 17 00:00:00 2001 From: awtkns Date: Sat, 28 Jan 2023 00:05:44 -0800 Subject: [PATCH 5/7] :arrow_up: Upgrade tortoise dep --- tests/dev.requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/dev.requirements.txt b/tests/dev.requirements.txt index c9f34eb7..2bf965bf 100644 --- a/tests/dev.requirements.txt +++ b/tests/dev.requirements.txt @@ -1,8 +1,9 @@ fastapi +httpx # Backends ormar -tortoise-orm==0.17.8; +tortoise-orm==0.19.2 databases aiosqlite sqlalchemy==1.3.22 From 45885d72d8dc4b22178e8ee68125de9f820ed9e1 Mon Sep 17 00:00:00 2001 From: awtkns Date: Sat, 28 Jan 2023 00:27:08 -0800 Subject: [PATCH 6/7] :arrow_up: Pin tortoise dep and release 0.8.6 --- fastapi_crudrouter/_version.py | 2 +- tests/dev.requirements.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fastapi_crudrouter/_version.py b/fastapi_crudrouter/_version.py index 3e2f46a3..de77196f 100644 --- a/fastapi_crudrouter/_version.py +++ b/fastapi_crudrouter/_version.py @@ -1 +1 @@ -__version__ = "0.9.0" +__version__ = "0.8.6" diff --git a/tests/dev.requirements.txt b/tests/dev.requirements.txt index 2bf965bf..9182cdd5 100644 --- a/tests/dev.requirements.txt +++ b/tests/dev.requirements.txt @@ -3,10 +3,10 @@ httpx # Backends ormar -tortoise-orm==0.19.2 +tortoise-orm==0.18.1 databases aiosqlite -sqlalchemy==1.3.22 +sqlalchemy<1.4.0 sqlalchemy_utils==0.36.8 gino-starlette==0.1.1 asyncpg From 01affc894cf6596ab808ec30179ac0f1f2d88606 Mon Sep 17 00:00:00 2001 From: awtkns Date: Sat, 28 Jan 2023 00:39:17 -0800 Subject: [PATCH 7/7] :bug: Only test tortoise on versions higher than 3.8 --- tests/implementations/__init__.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/implementations/__init__.py b/tests/implementations/__init__.py index 0c311095..839f22a4 100644 --- a/tests/implementations/__init__.py +++ b/tests/implementations/__init__.py @@ -1,3 +1,5 @@ +import sys + from .databases_ import ( databases_implementation, databases_implementation_custom_ids, @@ -23,6 +25,7 @@ sqlalchemy_implementation_string_pk, DSN_LIST, ) +from .tortoise_ import tortoise_implementation implementations = [ (memory_implementation, ""), @@ -33,9 +36,6 @@ implementations.extend([(sqlalchemy_implementation, dsn) for dsn in DSN_LIST]) implementations.extend([(databases_implementation, dsn) for dsn in DSN_LIST]) -try: - from .tortoise_ import tortoise_implementation -except ImportError: - pass -else: + +if sys.version_info >= (3, 8): implementations.append((tortoise_implementation, ""))