removed pytest and coverage replaced with pytest-cov

Author: btr1975

cookiecutter.json

@@ -11,7 +11,7 @@
     "use_requests": "n",
     "use_cryptography": "n",
     "__template_repo": "https://github.com/btr1975/cookiecutter-python-fastapi-openapi",
-    "__template_version": "1.0.2",
+    "__template_version": "1.0.3",
     "_copy_without_render": [
         ".github"
     ]

{{cookiecutter.git_repo_name}}/Makefile

@@ -1,9 +1,9 @@
 # Makefile for project needs
 # Author: Ben Trachtenberg
-# Version: 1.0.1
+# Version: 1.0.2
 #
 
-.PHONY: info app-run coverage pylint pytest gh-pages pdf word
+.PHONY: info app-run coverage pylint pytest gh-pages pdf
 
 info:
 	@echo "make options"
@@ -12,30 +12,23 @@ info:
 	@echo "    pylint    To run pylint"
 	@echo "    pytest    To run pytest with verbose option"
 	@echo "    pdf       To create PDF Docs"
-	@echo "    word      To create Word Docs"
 {% if cookiecutter.app_documents_location == 'github-pages' %}	@echo "    gh-pages  To create the GitHub pages"{% endif %}
 
 app-run:
 	@python app_run.py
 
 coverage:
-	@coverage erase
-	@coverage run
-	@coverage report
-	@coverage html
+	@pytest --cov --cov-report=html -vvv
 
 pylint:
 	@pylint modules/
 
 pytest:
-	@pytest -vvv
+	@pytest --cov -vvv
 
 pdf:
 	@sphinx-build -b rinoh ./docs ./docs/_build/pdf
 
-word:
-	@sphinx-build -b docx ./docs ./docs/_build/word
-
 {% if cookiecutter.app_documents_location == 'github-pages' %}
 gh-pages:
 	@sphinx-build ./docs ./docs/gh-pages

{{cookiecutter.git_repo_name}}/docs/_static/css/my_theme.css

@@ -0,0 +1,5 @@
+@import url("theme.css");
+
+.wy-nav-content {
+    max-width: 90%;
+}

{{cookiecutter.git_repo_name}}/docs/conf.py

@@ -41,7 +41,6 @@
               'sphinx.ext.viewcode',
               'sphinx.ext.autodoc',
               'myst_parser',
-              'docxsphinx',
               'sphinxcontrib.mermaid',
 ]
 
@@ -92,6 +91,7 @@
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ['_static']
+html_style = 'css/my_theme.css'
 
 # This is used fpr making a PDF using rinohtype
 # See https://www.mos6581.org/rinohtype/master/sphinx.html

{{cookiecutter.git_repo_name}}/make.bat

@@ -1,7 +1,7 @@
 @ECHO OFF
 REM Makefile for project needs
 REM Author: Ben Trachtenberg
-REM Version: 1.0.1
+REM Version: 1.0.2
 REM
 
 IF "%1" == "app-run" (
@@ -10,10 +10,7 @@ IF "%1" == "app-run" (
 )
 
 IF "%1" == "coverage" (
-    coverage erase
-    coverage run
-    coverage report
-    coverage html
+    pytest --cov --cov-report=html -vvv
     GOTO END
 )
 
@@ -23,7 +20,7 @@ IF "%1" == "pylint" (
 )
 
 IF "%1" == "pytest" (
-    pytest -vvv
+    pytest --cov -vvv
     GOTO END
 )
 
@@ -32,11 +29,6 @@ IF "%1" == "pdf" (
     GOTO END
 )
 
-IF "%1" == "word" (
-    sphinx-build -b docx ./docs ./docs/_build/word
-    GOTO END
-)
-
 {% if cookiecutter.app_documents_location == 'github-pages' %}
 IF "%1" == "gh-pages" (
     sphinx-build ./docs ./docs/gh-pages
@@ -50,7 +42,6 @@ IF "%1" == "gh-pages" (
 @ECHO     pylint    To run pylint
 @ECHO     pytest    To run pytest with verbose option
 @ECHO     pdf       To create PDF Docs
-@ECHO     word      To create Word Docs
 {% if cookiecutter.app_documents_location == 'github-pages' %}@ECHO     gh-pages  To create the GitHub pages{% endif %}
 
 :END

{{cookiecutter.git_repo_name}}/requirements-dev.txt

@@ -2,13 +2,11 @@
 # NOTICE THE FIRST LINE INCLUDES THE requirements.txt
 #
 -r requirements.txt
-pytest
-coverage
+pytest-cov
 sphinx
 pylint
 rinohtype
 myst-parser
-docxsphinx
 sphinx_rtd_theme
 sphinxcontrib-mermaid
 {% if cookiecutter.use_requests == 'y' %}requests-mock{% endif %}