Skip to content

Commit

Permalink
Run CI against Django main branch (#159)
Browse files Browse the repository at this point in the history
* 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/

* Add changelog

* Drop 3.5 from tox matrix, as it was dropped in #119
  • Loading branch information
amureki authored Mar 9, 2021
1 parent 2043cdb commit 0a397a3
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 4 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
7 changes: 6 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[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
flake8
isort
pydocstyle
Expand All @@ -29,7 +29,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

Expand Down

0 comments on commit 0a397a3

Please sign in to comment.