Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 10 additions & 40 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand 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:
Expand All @@ -58,42 +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: 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: 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.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: 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
Expand All @@ -108,6 +74,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
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Features

* Supported ORMs

- `Django <https://www.djangoproject.com>`_ >= 1.4
- `Django <https://www.djangoproject.com>`_ >= 2.0
- `Peewee <https://peewee.readthedocs.io>`_ >= 2.8.0
- `Pony <https://ponyorm.com>`_ >= 0.5.0
- `SQLAlchemy <https://www.sqlalchemy.org>`_ >= 1.0.0
Expand All @@ -29,7 +29,7 @@ Features
- `PostgreSQL <https://www.postgresql.org>`_ >= 8.0
- `MySQL <https://www.mysql.com>`_ >= 5.5

* Supports Python 2.7, 3.5 - 3.8
* Supports Python 2.7, 3.5 - 3.9
* Extensively documented

Dependencies
Expand Down
6 changes: 1 addition & 5 deletions architect/orms/django/features.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,14 @@

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

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):
"""
Expand Down
4 changes: 2 additions & 2 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Features

* Supported ORMs

- `Django <https://www.djangoproject.com>`_ >= 1.4
- `Django <https://www.djangoproject.com>`_ >= 2.0
- `Peewee <https://peewee.readthedocs.io>`_ >= 2.8.0
- `Pony <https://ponyorm.com>`_ >= 0.5.0
- `SQLAlchemy <https://www.sqlalchemy.org>`_ >= 1.0.0
Expand All @@ -29,7 +29,7 @@ Features
- `PostgreSQL <https://www.postgresql.org>`_ >= 8.0
- `MySQL <https://www.mysql.com>`_ >= 5.5

* Supports Python 2.7, 3.5 - 3.8
* Supports Python 2.7, 3.5 - 3.9
* Extensively documented

Dependencies
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
],
)