From 3f5515a085ad1393574cfff0b037d32bc1a1f1e5 Mon Sep 17 00:00:00 2001 From: wakita181009 Date: Fri, 8 Oct 2021 16:54:13 +0700 Subject: [PATCH 1/2] - support python 3.9 - support django 3.2 - remove supporting django 1.x (unsupported officially from 2017) --- .travis.yml | 46 ++++--------------------------- README.rst | 4 +-- architect/orms/django/features.py | 6 +--- docs/index.rst | 4 +-- setup.py | 1 + 5 files changed, 12 insertions(+), 49 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8f332d2..361d336 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ python: - 3.6 - 3.7 - 3.8 + - 3.9 env: - SQLOBJECT='sqlobject>=3.5.0,<3.6.0' DB='all' - SQLOBJECT='sqlobject>=3.6.0,<3.7.0' DB='all' @@ -32,19 +33,12 @@ env: - SQLALCHEMY='sqlalchemy>=1.1.0,<1.2.0' DB='all' - SQLALCHEMY='sqlalchemy>=1.2.0,<1.3.0' DB='all' - SQLALCHEMY='sqlalchemy>=1.3.0,<1.4.0' DB='all' - - DJANGO='django>=1.4.0,<1.5.0' DB='all' - - DJANGO='django>=1.5.0,<1.6.0' DB='all' - - DJANGO='django>=1.6.0,<1.7.0' DB='all' - - DJANGO='django>=1.7.0,<1.8.0' DB='all' - - DJANGO='django>=1.8.0,<1.9.0' DB='all' - - DJANGO='django>=1.9.0,<1.10.0' DB='all' - - DJANGO='django>=1.10.0,<1.11.0' DB='all' - - DJANGO='django>=1.11.0,<1.12.0' DB='all' - DJANGO='django>=2.0.0,<2.1.0' DB='all' - DJANGO='django>=2.1.0,<2.2.0' DB='all' - DJANGO='django>=2.2.0,<2.3.0' DB='all' - DJANGO='django>=3.0.0,<3.1.0' DB='all' - DJANGO='django>=3.1.0,<3.2.0' DB='all' + - DJANGO='django>=3.2.0,<3.3.0' DB='all' jobs: fast_finish: true exclude: @@ -58,42 +52,10 @@ jobs: env: DJANGO='django>=3.0.0,<3.1.0' DB='all' - python: 2.7 env: DJANGO='django>=3.1.0,<3.2.0' DB='all' - - python: 3.5 - env: DJANGO='django>=1.4.0,<1.5.0' DB='all' - - python: 3.5 - env: DJANGO='django>=1.5.0,<1.6.0' DB='all' - - python: 3.5 - env: DJANGO='django>=1.6.0,<1.7.0' DB='all' - - python: 3.5 - env: DJANGO='django>=1.7.0,<1.8.0' DB='all' - python: 3.5 env: DJANGO='django>=3.0.0,<3.1.0' DB='all' - python: 3.5 env: DJANGO='django>=3.1.0,<3.2.0' DB='all' - - python: 3.6 - env: DJANGO='django>=1.4.0,<1.5.0' DB='all' - - python: 3.6 - env: DJANGO='django>=1.5.0,<1.6.0' DB='all' - - python: 3.6 - env: DJANGO='django>=1.6.0,<1.7.0' DB='all' - - python: 3.6 - env: DJANGO='django>=1.7.0,<1.8.0' DB='all' - - python: 3.7 - env: DJANGO='django>=1.4.0,<1.5.0' DB='all' - - python: 3.7 - env: DJANGO='django>=1.5.0,<1.6.0' DB='all' - - python: 3.7 - env: DJANGO='django>=1.6.0,<1.7.0' DB='all' - - python: 3.7 - env: DJANGO='django>=1.7.0,<1.8.0' DB='all' - - python: 3.8 - env: DJANGO='django>=1.4.0,<1.5.0' DB='all' - - python: 3.8 - env: DJANGO='django>=1.5.0,<1.6.0' DB='all' - - python: 3.8 - env: DJANGO='django>=1.6.0,<1.7.0' DB='all' - - python: 3.8 - env: DJANGO='django>=1.7.0,<1.8.0' DB='all' - python: 3.5 env: PONY='pony>=0.5.0,<0.6.0' DB='all' - python: 3.6 @@ -108,6 +70,10 @@ jobs: env: PONY='pony>=0.5.0,<0.6.0' DB='all' - python: 3.8 env: PONY='pony>=0.6.0,<0.7.0' DB='all' + - python: 3.9 + env: PONY='pony>=0.5.0,<0.6.0' DB='all' + - python: 3.9 + env: PONY='pony>=0.6.0,<0.7.0' DB='all' before_script: - psql -c 'create database architect;' -U postgres - mysql -e 'create database architect;' -u root diff --git a/README.rst b/README.rst index f73f364..fa0e827 100644 --- a/README.rst +++ b/README.rst @@ -18,7 +18,7 @@ Features * Supported ORMs - - `Django `_ >= 1.4 + - `Django `_ >= 2.0 - `Peewee `_ >= 2.8.0 - `Pony `_ >= 0.5.0 - `SQLAlchemy `_ >= 1.0.0 @@ -29,7 +29,7 @@ Features - `PostgreSQL `_ >= 8.0 - `MySQL `_ >= 5.5 -* Supports Python 2.7, 3.5 - 3.8 +* Supports Python 2.7, 3.5 - 3.9 * Extensively documented Dependencies diff --git a/architect/orms/django/features.py b/architect/orms/django/features.py index e2b4197..1333d48 100644 --- a/architect/orms/django/features.py +++ b/architect/orms/django/features.py @@ -4,6 +4,7 @@ import django from django.conf import settings +from django.core.exceptions import FieldDoesNotExist from django.db import router, connections, transaction from django.db.utils import ConnectionDoesNotExist from django.utils.functional import cached_property @@ -11,11 +12,6 @@ from ..bases import BasePartitionFeature, BaseOperationFeature from ...exceptions import PartitionColumnError, OptionNotSetError, OptionValueError -if django.VERSION < (1, 8): - from django.db.models.fields import FieldDoesNotExist -else: - from django.core.exceptions import FieldDoesNotExist - class ConnectionMixin(object): """ diff --git a/docs/index.rst b/docs/index.rst index d1b1a01..2d95794 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -18,7 +18,7 @@ Features * Supported ORMs - - `Django `_ >= 1.4 + - `Django `_ >= 2.0 - `Peewee `_ >= 2.8.0 - `Pony `_ >= 0.5.0 - `SQLAlchemy `_ >= 1.0.0 @@ -29,7 +29,7 @@ Features - `PostgreSQL `_ >= 8.0 - `MySQL `_ >= 5.5 -* Supports Python 2.7, 3.5 - 3.8 +* Supports Python 2.7, 3.5 - 3.9 * Extensively documented Dependencies diff --git a/setup.py b/setup.py index abda029..010c9ba 100644 --- a/setup.py +++ b/setup.py @@ -77,6 +77,7 @@ def run_tests(self): 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: Implementation :: CPython', ], ) From f537b47c7ec9e56f734031f56b836da29473d8ce Mon Sep 17 00:00:00 2001 From: wakita181009 Date: Fri, 8 Oct 2021 16:58:58 +0700 Subject: [PATCH 2/2] fix travis.ci --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 361d336..13709e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,10 +52,14 @@ jobs: env: DJANGO='django>=3.0.0,<3.1.0' DB='all' - python: 2.7 env: DJANGO='django>=3.1.0,<3.2.0' DB='all' + - python: 2.7 + env: DJANGO='django>=3.2.0,<3.3.0' DB='all' - python: 3.5 env: DJANGO='django>=3.0.0,<3.1.0' DB='all' - python: 3.5 env: DJANGO='django>=3.1.0,<3.2.0' DB='all' + - python: 3.5 + env: DJANGO='django>=3.2.0,<3.3.0' DB='all' - python: 3.5 env: PONY='pony>=0.5.0,<0.6.0' DB='all' - python: 3.6