Improve basic configuration

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

Author: pombredanne

Makefile

@@ -96,7 +96,7 @@ test:
 
 docs:
 	rm -rf docs/_build/
-	@${ACTIVATE} sphinx-build docs/source docs/_build/
+	@${ACTIVATE} sphinx-build docs/ docs/_build/
 
 postgresdb:
 	@echo "-> Configure PostgreSQL database"

configure

@@ -28,9 +28,9 @@ CLI_ARGS=$1
 ################################
 
 # Requirement arguments passed to pip and used by default or with --dev.
-REQUIREMENTS="--editable . -r requirements.txt"
-DEV_REQUIREMENTS="--editable .[testing] -r requirements.txt -r requirements-dev.txt"
-DOCS_REQUIREMENTS="--editable .[docs] -r requirements.txt"
+REQUIREMENTS="--editable . --requirement requirements.txt"
+DEV_REQUIREMENTS="--editable .[testing] --requirement requirements.txt --requirement requirements-dev.txt"
+DOCS_REQUIREMENTS="--editable .[docs] --requirement requirements.txt"
 
 # where we create a virtualenv
 VIRTUALENV_DIR=venv

configure.bat

@@ -26,9 +26,9 @@
 @rem ################################
 
 @rem # Requirement arguments passed to pip and used by default or with --dev.
-set "REQUIREMENTS=--editable . --constraint requirements.txt"
-set "DEV_REQUIREMENTS=--editable .[testing] --constraint requirements.txt --constraint requirements-dev.txt"
-set "DOCS_REQUIREMENTS=--editable .[docs] --constraint requirements.txt"
+set "REQUIREMENTS=--editable . --requirement requirements.txt"
+set "DEV_REQUIREMENTS=--editable .[testing] --requirement requirements.txt --requirement requirements-dev.txt"
+set "DOCS_REQUIREMENTS=--editable .[docs] --requirement requirements.txt"
 
 @rem # where we create a virtualenv
 set "VIRTUALENV_DIR=venv"

requirements-dev.txt

@@ -19,3 +19,5 @@ sphinxcontrib-jquery==4.1
 sphinxcontrib-jsmath==1.0.1
 sphinxcontrib-qthelp==1.0.6
 sphinxcontrib-serializinghtml==1.1.9
+sphinxcontrib_django
+sphinx-jsonschema

setup.cfg

@@ -107,10 +107,6 @@ install_requires =
     wrapt>=1.15.0
 
 
-[options.packages.find]
-where = src
-
-
 [options.extras_require]
 testing =
     # Validation
@@ -135,7 +131,8 @@ docs =
     sphinx-rtd-dark-mode>=1.3.0
     sphinx-copybutton
     sphinx-autobuild>=2021.3.14
-
+    sphinxcontrib_django
+    sphinx-jsonschema
 
 [isort]
 force_single_line = True