From a81b56d72961dfd85fc6f2dc00ddc718db0331e0 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Tue, 6 Dec 2022 14:55:34 +0000 Subject: [PATCH 1/3] Add compatibility for Django 4.1 --- .circleci/config.yml | 16 ++++++++++++++++ setup.py | 1 + tests/requirements/django41.txt | 1 + 3 files changed, 18 insertions(+) create mode 100644 tests/requirements/django41.txt diff --git a/.circleci/config.yml b/.circleci/config.yml index 4825c266..38ed7652 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,12 +18,14 @@ workflows: - test-3.8-31 - test-3.8-32 - test-3.8-40 + - test-3.8-41 - test-3.9-22 - test-3.9-30 - test-3.9-31 - test-3.9-32 - test-3.9-40 + - test-3.9-41 - done: requires: @@ -42,12 +44,14 @@ workflows: - test-3.8-31 - test-3.8-32 - test-3.8-40 + - test-3.8-41 - test-3.9-22 - test-3.9-30 - test-3.9-31 - test-3.9-32 - test-3.9-40 + - test-3.9-41 jobs: base: &test-template @@ -178,6 +182,12 @@ jobs: - image: circleci/python:3.8-buster-node environment: DJANGO_VERSION: "40" + test-3.8-41: + <<: *test-template + docker: + - image: circleci/python:3.8-buster-node + environment: + DJANGO_VERSION: "41" test-3.9-22: <<: *test-template @@ -209,6 +219,12 @@ jobs: - image: circleci/python:3.9-buster-node environment: DJANGO_VERSION: "40" + test-3.9-41: + <<: *test-template + docker: + - image: circleci/python:3.9-buster-node + environment: + DJANGO_VERSION: "41" done: docker: diff --git a/setup.py b/setup.py index 7fffbc27..6f6b55d2 100644 --- a/setup.py +++ b/setup.py @@ -43,6 +43,7 @@ def rel(*parts): 'Framework :: Django :: 3.1', 'Framework :: Django :: 3.2', 'Framework :: Django :: 4.0', + 'Framework :: Django :: 4.1', 'Environment :: Web Environment', 'License :: OSI Approved :: MIT License', ], diff --git a/tests/requirements/django41.txt b/tests/requirements/django41.txt new file mode 100644 index 00000000..4041b77b --- /dev/null +++ b/tests/requirements/django41.txt @@ -0,0 +1 @@ +django>=4.1,<4.2 From c18993f1c560a3969b8315c64709a77c95c681d2 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Tue, 6 Dec 2022 15:12:56 +0000 Subject: [PATCH 2/3] Add support for Python 3.10 --- .circleci/config.yml | 27 +++++++++++++++++++++++++++ setup.py | 1 + 2 files changed, 28 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 38ed7652..99852616 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -27,6 +27,10 @@ workflows: - test-3.9-40 - test-3.9-41 + - test-3.10-32 + - test-3.10-40 + - test-3.10-41 + - done: requires: - test-3.6-22 @@ -53,6 +57,10 @@ workflows: - test-3.9-40 - test-3.9-41 + - test-3.10-32 + - test-3.10-40 + - test-3.10-41 + jobs: base: &test-template docker: @@ -226,6 +234,25 @@ jobs: environment: DJANGO_VERSION: "41" + test-3.10-32: + <<: *test-template + docker: + - image: circleci/python:3.10-buster-node + environment: + DJANGO_VERSION: "32" + test-3.10-40: + <<: *test-template + docker: + - image: circleci/python:3.10-buster-node + environment: + DJANGO_VERSION: "40" + test-3.10-41: + <<: *test-template + docker: + - image: circleci/python:3.10-buster-node + environment: + DJANGO_VERSION: "41" + done: docker: - image: circleci/python:3.9-buster-node diff --git a/setup.py b/setup.py index 6f6b55d2..d4c32730 100644 --- a/setup.py +++ b/setup.py @@ -35,6 +35,7 @@ def rel(*parts): 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', 'Framework :: Django', 'Framework :: Django :: 2.0', 'Framework :: Django :: 2.1', From 7a1d1ca12f5990b84b412f408e04b3ae2fe02ee7 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Tue, 6 Dec 2022 15:42:38 +0000 Subject: [PATCH 3/3] Don't submit coverage if env varibale is unset --- .circleci/config.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 99852616..fdf470e1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -106,7 +106,10 @@ jobs: source venv/bin/activate cd tests coverage run --source=webpack_loader manage.py test - coveralls + if [ "$COVERALLS_REPO_TOKEN" != "" ] + then + coveralls + fi environment: COVERALLS_PARALLEL: 1 @@ -260,5 +263,8 @@ jobs: - run: name: Finish Coveralls command: | - pip install coveralls - coveralls --finish + if [ "$COVERALLS_REPO_TOKEN" != "" ] + then + pip install coveralls + coveralls --finish + fi