From 0dd550abd068928b1429458d7b8e7166f15b7749 Mon Sep 17 00:00:00 2001 From: Rust Saiargaliev Date: Tue, 9 Mar 2021 20:09:44 +0100 Subject: [PATCH 1/3] Run CI against Django `main` branch I thought, it make sense to be ready and see possible issues upfront. This practice is ofthen used by OSS Django packages, for example, check out: https://github.com/jazzband/ --- setup.py | 5 ++++- tox.ini | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 4d41bfe7..06772587 100755 --- a/setup.py +++ b/setup.py @@ -24,12 +24,15 @@ classifiers=[ "Development Status :: 5 - Production/Stable", "Framework :: Django", + "Framework :: Django :: 2.2", + "Framework :: Django :: 3.0", + "Framework :: Django :: 3.1", "Intended Audience :: Developers", "License :: OSI Approved :: Apache Software License", "Operating System :: OS Independent", "Topic :: Software Development", "Programming Language :: Python", - "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", diff --git a/tox.ini b/tox.ini index d4619bf0..cb336490 100644 --- a/tox.ini +++ b/tox.ini @@ -3,6 +3,7 @@ envlist = py35-django{22}-{postgresql,sqlite} py{36,37,38}-django{22,30,31}-{postgresql,sqlite} py{39}-django{31}-{postgresql,sqlite} + py39-djangomain flake8 isort pydocstyle @@ -29,7 +30,12 @@ deps = django22: Django==2.2 django30: Django>=3.0,<3.1 django31: Django>=3.1,<3.2 + djangomain: https://github.com/django/django/archive/main.tar.gz postgresql: psycopg2-binary +ignore_outcome = + djangomain: True +ignore_errors = + djangomain: True commands = pytest From 12ee65fdf088ce7af7bef9c9055fee6559ebff1f Mon Sep 17 00:00:00 2001 From: Rust Saiargaliev Date: Tue, 9 Mar 2021 20:12:56 +0100 Subject: [PATCH 2/3] Add changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9df27a5b..4c996bb3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). - Add the functionality to import Django models using the `app_name.ModelName` convention in `import_from_str` [PR #140](https://github.com/model-bakers/model_bakery/pull/140) - Add the functionality to import recipes using `app_name.recipe_name` [PR #140](https://github.com/model-bakers/model_bakery/pull/140) - [dev] Add a unit test for `utils.seq` [PR #143](https://github.com/model-bakers/model_bakery/pull/143) +- [dev] Run CI against `main` Django branch to cover possible upcoming changes/deprecations [PR #159](https://github.com/model-bakers/model_bakery/pull/159) ### Changed From 5166eb8a229ab149c3e1fc836ce7d87ca849bf9f Mon Sep 17 00:00:00 2001 From: Rust Saiargaliev Date: Tue, 9 Mar 2021 20:41:45 +0100 Subject: [PATCH 3/3] Drop 3.5 from tox matrix, as it was dropped in #119 --- tox.ini | 1 - 1 file changed, 1 deletion(-) diff --git a/tox.ini b/tox.ini index cb336490..de5889f5 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,5 @@ [tox] envlist = - py35-django{22}-{postgresql,sqlite} py{36,37,38}-django{22,30,31}-{postgresql,sqlite} py{39}-django{31}-{postgresql,sqlite} py39-djangomain