From b789f2f4a135df7a991a0329e19a4d1232786d34 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Mon, 8 Feb 2021 08:56:04 +0100
Subject: [PATCH] ### 0.0.14 Release * Fixed #69 Branch: ISSUE_66_ATTEMPT_01 *
 Fixed #70 load package.json from Bootstrap-Template sb-admin-angular into
 statics * Fixed #67 implement Flask-Login (wontfix) * Issue #159 merge Branch
 ISSUE_66_ATTEMPT_01 to master

---
 docs/conf.py           |  7 +++++++
 requirements.txt       |  6 ++----
 requirements/dev.txt   | 26 +++++++++++++++++++-------
 requirements/docs.txt  | 25 ++++++++++++++++++-------
 requirements/tests.txt | 27 ++++++++++++++++++++-------
 setup.py               | 18 ++++++++++++------
 6 files changed, 78 insertions(+), 31 deletions(-)
 create mode 100644 docs/conf.py

diff --git a/docs/conf.py b/docs/conf.py
new file mode 100644
index 00000000..ca84a482
--- /dev/null
+++ b/docs/conf.py
@@ -0,0 +1,7 @@
+extensions = [
+    "pallets_sphinx_themes",
+    "sphinxcontrib-plantuml",
+    "sphinxcontrib-gravizos"
+]
+
+html_theme = "flask"
diff --git a/requirements.txt b/requirements.txt
index 25f9c52b..d75f7fc5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -79,15 +79,13 @@ sphinx-tabs==2.0.1
 sphinx-issues==1.2.0
 pallets-sphinx-themes==1.2.3
 sphinxcontrib-plantuml==0.19
+sphinxcontrib-gravizo==0.0.4
 py2puml==0.3.1
 plantuml-creator==1.0.7
-sphinxcontrib-gravizo==0.0.4
 plantuml-markdown==3.4.2
 plantuml-wrapper==0.1.0
 plantuml2freemind==0.8.2
-#
-#plantuml-gentools==0.1.2
-
+plantuml-gentools==0.1.2
 #
 #-----------------------------------------------------------------
 #
\ No newline at end of file
diff --git a/requirements/dev.txt b/requirements/dev.txt
index 570e06f3..205e26a0 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -4,6 +4,7 @@
 #
 #    pip-compile requirements/dev.in
 #
+
 # --------------------------------------------------------------
 # Covid 19 Data - Requirements
 # --------------------------------------------------------------
@@ -21,16 +22,18 @@ celery[redis]>=5.0.5
 #------------------------------------------
 Flask>=1.1.2
 Flask-SQLAlchemy>=2.4.4
-SQLAlchemy>=1.3.23
-psycopg2>=2.8.6
-#Flask-Authorization>=1.4
 Flask-Multipass>=0.3.3
 Flask-Cors>=3.0.10
 Flask-BS4==4.5.3.0
 #------------------------------------------
+SQLAlchemy>=1.3.23
+psycopg2>=2.8.6
+#psycopg2-mq==0.5.5
+#------------------------------------------
 test-flask>=0.2.0
 pytest-flask>=1.1.0
 #------------------------------------------
+Flask-Admin>=1.5.7
 Flask-Redisboard>=0.2.0
 Flask-Monitoring>=1.1.2
 flask-healthz>=0.0.2
@@ -64,15 +67,16 @@ visdom>=0.1.8.9
 tokenize-rt>=4.1.0
 pynndescent>=0.5.1
 torch>=1.7.1
-numpy>=1.19.0
+numpy>=1.20.1
 pandas>=1.1.0
 scipy>=1.5.0
 StatisticalDiagrams>=20.5
 # --------------------------------------------------------------
 # Tools:
 # --------------------------------------------------------------
-PyGObject>=3.38.0
-gaphor>=2.2.2
+#importlib_metadata<4.0,>=1.4
+#PyGObject>=3.38.0
+#gaphor==2.2.1
 #
 # ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 # docs - sphinx
@@ -81,6 +85,14 @@ sphinx==3.4.3
 sphinx-tabs==2.0.1
 sphinx-issues==1.2.0
 pallets-sphinx-themes==1.2.3
+sphinxcontrib-plantuml==0.19
+sphinxcontrib-gravizo==0.0.4
+py2puml==0.3.1
+plantuml-creator==1.0.7
+plantuml-markdown==3.4.2
+plantuml-wrapper==0.1.0
+plantuml2freemind==0.8.2
+plantuml-gentools==0.1.2
 #
 #-----------------------------------------------------------------
-#
+#
\ No newline at end of file
diff --git a/requirements/docs.txt b/requirements/docs.txt
index 803603d2..98778b34 100644
--- a/requirements/docs.txt
+++ b/requirements/docs.txt
@@ -15,23 +15,25 @@ wheel==0.36.2
 #------------------------------------------
 dash>=1.19.0
 dash-extensions>=0.0.45
-dtale>=1.33.1
+dtale>=1.34.0
 #------------------------------------------
 wget>=3.2
 celery[redis]>=5.0.5
 #------------------------------------------
 Flask>=1.1.2
 Flask-SQLAlchemy>=2.4.4
-SQLAlchemy>=1.3.23
-psycopg2>=2.8.6
-psycopg2-mq==0.5.5
 Flask-Multipass>=0.3.3
 Flask-Cors>=3.0.10
 Flask-BS4==4.5.3.0
 #------------------------------------------
+SQLAlchemy>=1.3.23
+psycopg2>=2.8.6
+#psycopg2-mq==0.5.5
+#------------------------------------------
 test-flask>=0.2.0
 pytest-flask>=1.1.0
 #------------------------------------------
+Flask-Admin>=1.5.7
 Flask-Redisboard>=0.2.0
 Flask-Monitoring>=1.1.2
 flask-healthz>=0.0.2
@@ -65,15 +67,16 @@ visdom>=0.1.8.9
 tokenize-rt>=4.1.0
 pynndescent>=0.5.1
 torch>=1.7.1
-numpy>=1.19.0
+numpy>=1.20.1
 pandas>=1.1.0
 scipy>=1.5.0
 StatisticalDiagrams>=20.5
 # --------------------------------------------------------------
 # Tools:
 # --------------------------------------------------------------
-PyGObject>=3.38.0
-gaphor>=2.2.2
+#importlib_metadata<4.0,>=1.4
+#PyGObject>=3.38.0
+#gaphor==2.2.1
 #
 # ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 # docs - sphinx
@@ -82,6 +85,14 @@ sphinx==3.4.3
 sphinx-tabs==2.0.1
 sphinx-issues==1.2.0
 pallets-sphinx-themes==1.2.3
+sphinxcontrib-plantuml==0.19
+sphinxcontrib-gravizo==0.0.4
+py2puml==0.3.1
+plantuml-creator==1.0.7
+plantuml-markdown==3.4.2
+plantuml-wrapper==0.1.0
+plantuml2freemind==0.8.2
+plantuml-gentools==0.1.2
 #
 #-----------------------------------------------------------------
 #
\ No newline at end of file
diff --git a/requirements/tests.txt b/requirements/tests.txt
index 90b9c073..673077fb 100644
--- a/requirements/tests.txt
+++ b/requirements/tests.txt
@@ -4,6 +4,7 @@
 #
 #    pip-compile requirements/tests.in
 #
+
 # --------------------------------------------------------------
 # Covid 19 Data - Requirements
 # --------------------------------------------------------------
@@ -14,23 +15,25 @@ wheel==0.36.2
 #------------------------------------------
 dash>=1.19.0
 dash-extensions>=0.0.45
-dtale>=1.33.1
+dtale>=1.34.0
 #------------------------------------------
 wget>=3.2
 celery[redis]>=5.0.5
 #------------------------------------------
 Flask>=1.1.2
 Flask-SQLAlchemy>=2.4.4
-SQLAlchemy>=1.3.23
-psycopg2>=2.8.6
-#Flask-Authorization>=1.4
 Flask-Multipass>=0.3.3
 Flask-Cors>=3.0.10
 Flask-BS4==4.5.3.0
 #------------------------------------------
+SQLAlchemy>=1.3.23
+psycopg2>=2.8.6
+#psycopg2-mq==0.5.5
+#------------------------------------------
 test-flask>=0.2.0
 pytest-flask>=1.1.0
 #------------------------------------------
+Flask-Admin>=1.5.7
 Flask-Redisboard>=0.2.0
 Flask-Monitoring>=1.1.2
 flask-healthz>=0.0.2
@@ -64,15 +67,16 @@ visdom>=0.1.8.9
 tokenize-rt>=4.1.0
 pynndescent>=0.5.1
 torch>=1.7.1
-numpy>=1.19.0
+numpy>=1.20.1
 pandas>=1.1.0
 scipy>=1.5.0
 StatisticalDiagrams>=20.5
 # --------------------------------------------------------------
 # Tools:
 # --------------------------------------------------------------
-PyGObject>=3.38.0
-gaphor>=2.2.1
+#importlib_metadata<4.0,>=1.4
+#PyGObject>=3.38.0
+#gaphor==2.2.1
 #
 # ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 # docs - sphinx
@@ -81,6 +85,15 @@ sphinx==3.4.3
 sphinx-tabs==2.0.1
 sphinx-issues==1.2.0
 pallets-sphinx-themes==1.2.3
+sphinxcontrib-plantuml==0.19
+sphinxcontrib-gravizo==0.0.4
+py2puml==0.3.1
+plantuml-creator==1.0.7
+plantuml-markdown==3.4.2
+plantuml-wrapper==0.1.0
+plantuml2freemind==0.8.2
+plantuml-gentools==0.1.2
 #
 #-----------------------------------------------------------------
+#
 #
\ No newline at end of file
diff --git a/setup.py b/setup.py
index bcf445d0..9b483a3f 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ setup(
         "wheel==0.36.2",
         "dash>=1.19.0",
         "dash-extensions>=0.0.45",
-        "dtale>=1.33.1",
+        "dtale>=1.34.0",
         "wget>=3.2",
         "celery[redis]>=5.0.5",
         "Flask>=1.1.2",
@@ -26,7 +26,7 @@ setup(
         "#Flask-Authorization>=1.4",
         "Flask-Multipass>=0.3.3",
         "Flask-Cors>=3.0.10",
-        "Flask-BS4>=4.5.3.0,<5.0.0.0",
+        "Flask-BS4==4.5.3.0",
         "test-flask>=0.2.0",
         "pytest-flask>=1.1.0",
         "Flask-Admin>=1.5.7",
@@ -58,16 +58,22 @@ setup(
         "tokenize-rt>=4.1.0",
         "pynndescent>=0.5.1",
         "torch>=1.7.1",
-        "numpy>=1.19.0",
+        "numpy>=1.20.1",
         "pandas>=1.1.0",
         "scipy>=1.5.0",
         "StatisticalDiagrams>=20.5",
-        "PyGObject>=3.38.0",
-        "gaphor>=2.2.1",
         "sphinx==3.4.3",
         "sphinx-tabs==2.0.0",
         "sphinx-issues==1.2.0",
-        "pallets-sphinx-themes==1.2.3"
+        "pallets-sphinx-themes==1.2.3",
+        "sphinxcontrib-plantuml==0.19",
+        "sphinxcontrib-gravizo==0.0.4",
+        "py2puml==0.3.1",
+        "plantuml-creator==1.0.7",
+        "plantuml-markdown==3.4.2",
+        "plantuml-wrapper==0.1.0",
+        "plantuml2freemind==0.8.2",
+        "plantuml-gentools==0.1.2"
     ],
     extras_require={"dotenv": ["python-dotenv"]},
 )
-- 
GitLab