sts-sponsors team mailing list archive

[Alberto Donato <mp+440826@xxxxxxxxxxxxxxxxxx>]

Alberto Donato has proposed merging ~ack/maas:drop-requirements-dev into maas:master.

Commit message:
drop requirements-dev.txt, add them to setup.cfg

Requested reviews:
  MAAS Lander (maas-lander): unittests
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~ack/maas/+git/maas/+merge/440826
-- 
Your team MAAS Committers is subscribed to branch maas:master.

diff --git a/Makefile b/Makefile
index 462e8ac..fdd0660 100644
--- a/Makefile
+++ b/Makefile
@@ -91,9 +91,9 @@ install-dependencies:
 	if [ -x /usr/bin/snap ]; then cat required-packages/snaps | xargs -L1 sudo snap install; fi
 .PHONY: install-dependencies
 
-$(VENV): requirements-dev.txt
+$(VENV):
 	python3 -m venv --system-site-packages --clear $@
-	$(VENV)/bin/pip install -r $<
+	$(VENV)/bin/pip install -e .[testing]
 
 bin:
 	mkdir $@
diff --git a/requirements-dev.txt b/requirements-dev.txt
deleted file mode 100644
index 443d70a..0000000
--- a/requirements-dev.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-fixtures==4.0.0
-hypothesis==6.46.9
-ipdb==0.13.9
-junitxml==0.7
-postgresfixture==0.4.2
-pytest==7.1.2
-pytest-mock==3.7.0
-pytest-xdist==2.5.0
-python-subunit==1.4.0
-testresources==2.0.1
-testscenarios==0.5.0
-testtools==2.5.0
-# Install MAAS itself in editable mode
--e .
diff --git a/setup.cfg b/setup.cfg
index 5d2d8f8..a92ecaf 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -54,3 +54,18 @@ pytest11 =
     maas-django = maastesting.pytest.django
     maas-seeds = maastesting.pytest.seeds
     maas-perftest = maastesting.pytest.perftest
+
+[options.extras_require]
+testing =
+    fixtures==4.0.0
+    hypothesis==6.46.9
+    ipdb==0.13.9
+    junitxml==0.7
+    postgresfixture==0.4.2
+    pytest==7.1.2
+    pytest-mock==3.7.0
+    pytest-xdist==2.5.0
+    python-subunit==1.4.0
+    testresources==2.0.1
+    testscenarios==0.5.0
+    testtools==2.5.0