Merge ~adam-collard/django-piston3:tox-descriptions-and-extras into django-piston3:master

[Adam Collard]

Describe tox environments, use extras for it's purpose

[Alberto Donato (ack)]

+1

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b tox-descriptions-and-extras lp:~adam-collard/django-piston3/+git/django-piston3 into -b master lp:~maas-committers/django-piston3

STATUS: SUCCESS
COMMIT: 6263876509ef5365fe417508de6e331c9b6ea4aa

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b tox-descriptions-and-extras lp:~adam-collard/django-piston3/+git/django-piston3 into -b master lp:~maas-committers/django-piston3

STATUS: SUCCESS
COMMIT: 89e500da30347ff2112ee4c2f7d79c1042a7423b

review: Approve

dc53578... by Adam Collard on 2022-05-11

Tox minversion 3 parter

[MAAS Lander (maas-lander)]

UNIT TESTS
-b tox-descriptions-and-extras lp:~adam-collard/django-piston3/+git/django-piston3 into -b master lp:~maas-committers/django-piston3

STATUS: SUCCESS
COMMIT: dc5357814eb0ad130fb86046523e70cfa31e47d7

review: Approve

369cd68... by Adam Collard on 2022-05-11

Rename [tox:tox] to [tox]

[MAAS Lander (maas-lander)]

UNIT TESTS
-b tox-descriptions-and-extras lp:~adam-collard/django-piston3/+git/django-piston3 into -b master lp:~maas-committers/django-piston3

STATUS: SUCCESS
COMMIT: b574c76893d912e6b9207793c3324fe52225a315

review: Approve

7d75894... by Adam Collard on 2022-05-11

Fix path to MANIFEST.in

98aa98d... by Adam Collard on 2022-05-11

Speed up lint and format, don't need to install package

[MAAS Lander (maas-lander)]

UNIT TESTS
-b tox-descriptions-and-extras lp:~adam-collard/django-piston3/+git/django-piston3 into -b master lp:~maas-committers/django-piston3

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/piston-tester/63/consoleText
COMMIT: 98aa98d772b1f15795cb5765ca02131c7da19de1

review: Needs Fixing

5f11494... by Adam Collard on 2022-05-11

Split [tox] and [tox:tox]

[Alberto Donato (ack)]

+1

please add a comment that the [tox] section can be dropped once we move to jammy only

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b tox-descriptions-and-extras lp:~adam-collard/django-piston3/+git/django-piston3 into -b master lp:~maas-committers/django-piston3

STATUS: SUCCESS
COMMIT: 5f11494cb3dd723543a327b32f7740588f0362d3

review: Approve

a3e1c5d... by Adam Collard on 2022-05-11

Add comment

diff --git a/MANIFEST.in b/MANIFEST.in
index dfa3628..c059648 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,3 @@
 include README.md
 
-recursive-include piston/templates *
+recursive-include piston3/templates *
diff --git a/setup.cfg b/setup.cfg
index 709ddd0..c428d4a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -36,19 +36,26 @@ max-line-length = 80
 select = C, E, F, W, B, B950
 ignore = E203, E501, W503
 
-[tox:tox]
+# This is needed for Jenkins on focal to self-upgrade, doesn't find it if it's in [tox:tox]
+[tox]
 minversion = 3.15
+
+[tox:tox]
 envlist = format, lint, py3-django{22,32}
 
 [testenv]
+description = Test package with supported Django versions
+extras =
+    testing
 deps =
     django22: Django==2.2
     django32: Django==3.2
-    .[testing]
 commands =
     {envbindir}/pytest {posargs}
 
 [testenv:format]
+skip_install = true
+description = Format source code
 deps =
     black
     isort
@@ -57,6 +64,8 @@ commands =
     {envbindir}/black -q {[globals]lint_files}
 
 [testenv:lint]
+skip_install = true
+description = Lint source code
 deps =
     black
     flake8