From a39aeb6c932a2f01ff62fcbc74e8369c08b6b484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikul=C3=A1=C5=A1=20Poul?= Date: Wed, 21 Sep 2022 10:32:08 +0100 Subject: [PATCH 1/4] Drop support of unsupported versions of Django, add 4.1 --- README.md | 6 +++++- tox.ini | 9 ++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index f84af02..a3808dd 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) Adds first-class support for [PostgreSQL Views][pg-views] in the Django ORM. -For of the original [django-pgviews][django-pgviews] by [mypebble][mypebble] with support for Django 2.2+. +Fork of the original [django-pgviews][django-pgviews] by [mypebble][mypebble] with support for Django 3.2+. [pg-views]: http://www.postgresql.org/docs/9.1/static/sql-createview.html [django-pgviews]: https://github.com/mypebble/django-pgviews @@ -454,6 +454,10 @@ to pin views to specific databases. 4.0 0.8.1 + + 4.1 + 0.8.4 + diff --git a/tox.ini b/tox.ini index fafb1ea..2e0acdb 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] envlist = - py{37,38,39,310}-dj{22,32}, - py{38,39,310}-dj40 + py{37,38,39,310}-dj{32}, + py{38,39,310}-dj{40,41} [testenv] @@ -11,10 +11,9 @@ setenv = changedir = {toxinidir}/tests/test_project deps= -rtests/requirements.txt - dj22: https://github.com/django/django/archive/stable/2.2.x.tar.gz#egg=django - dj31: https://github.com/django/django/archive/stable/3.1.x.tar.gz#egg=django - dj32: https://github.com/django/django/archive/stable/3.1.x.tar.gz#egg=django + dj32: https://github.com/django/django/archive/stable/3.2.x.tar.gz#egg=django dj40: https://github.com/django/django/archive/stable/4.0.x.tar.gz#egg=django + dj41: https://github.com/django/django/archive/stable/4.1.x.tar.gz#egg=django commands= python manage.py test {posargs:test_project.viewtest test_project.multidbtest} passenv = DB_NAME DB_USER DB_PASSWORD From c76986303c4294356ac5f4b8dd01c6f967cf4570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikul=C3=A1=C5=A1=20Poul?= Date: Wed, 21 Sep 2022 10:36:58 +0100 Subject: [PATCH 2/4] Add DEFAULT_AUTO_FIELD --- tests/test_project/test_project/settings/base.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/test_project/test_project/settings/base.py b/tests/test_project/test_project/settings/base.py index 3997544..018af9d 100644 --- a/tests/test_project/test_project/settings/base.py +++ b/tests/test_project/test_project/settings/base.py @@ -32,6 +32,9 @@ }, } + +DEFAULT_AUTO_FIELD = "django.db.models.AutoField" + # Hosts/domain names that are valid for this site; required if DEBUG is False # See https://docs.djangoproject.com/en/1.5/ref/settings/#allowed-hosts ALLOWED_HOSTS = [] From e470bef76b1f71cb2f8199f47d47b7198b8e9dcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikul=C3=A1=C5=A1=20Poul?= Date: Wed, 21 Sep 2022 10:38:39 +0100 Subject: [PATCH 3/4] Bump version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 1ccefbf..6627f5a 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ setup( name="django-pgviews-redux", - version="0.8.3", + version="0.8.4", description="Create and manage Postgres SQL Views in Django", long_description=LONG_DESCRIPTION, long_description_content_type="text/markdown", From 04cdb098913b0c56c385fd377a6871751b42f356 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikul=C3=A1=C5=A1=20Poul?= Date: Thu, 22 Sep 2022 10:20:06 +0100 Subject: [PATCH 4/4] Upgrade postgres version in tests --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f8ccf29..3e6e6c4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,12 +3,12 @@ jobs: build: docker: - image: mikicz/tox - environment: # environment variables for primary container + environment: DATABASE_URL: postgresql://root@localhost/circle_test?sslmode=disable DB_USER: root DB_NAME: circle_test DB_PASSWORD: "password" - - image: circleci/postgres:10 # an example of how to specify a service container + - image: cimg/postgres:14.5 environment: POSTGRES_USER: root POSTGRES_DB: circle_test