Merge pull request #65 from edx/feanil/fix_tox_ini

Feanil/fix tox ini
openedx · Sep 23, 2020 · 028d0ab · 028d0ab
2 parents dfb7968 + d3299df
commit 028d0ab
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -12,6 +12,3 @@ Describe in a couple of sentences what this PR adds
 - [ ] Changelog record added
 - [ ] Documentation updated (not only docstrings)
 - [ ] Commits are squashed
-
-**Post merge:**
-- [ ] Delete working branch (if not needed anymore)
diff --git a/cookiecutter-django-app/{{cookiecutter.repo_name}}/tox.ini b/cookiecutter-django-app/{{cookiecutter.repo_name}}/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {py35,py38}-django{111,20,21,22}
+envlist = {py35,py38}-django{22,30}
 
 [doc8]
 ; D001 = Line too long
@@ -36,10 +36,8 @@ norecursedirs = .* docs requirements site-packages
 
 [testenv]
 deps =
-    django111: Django>=1.11
-    django20: Django>=2.0,<2.1
-    django21: Django>=2.1,<2.2
     django22: Django>=2.2,<2.3
+    django30: Django>=3.0,<3.1
     -r{toxinidir}/requirements/test.txt
 commands =
     pytest {posargs}