From 5c8256da020571d3ca7c912ad7b812d0dd0baaeb Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Sun, 14 Feb 2021 17:06:03 +0100
Subject: [PATCH] * Fixed #123 split RkiBundeslaenderService into two Services,
one for bundeslaender and one for landkreise * Fixed #128 add fields from csv
to RkiLandkreiseImport * Fixed #139 refactor RkiBundeslaenderServiceDownload
to new method scheme introduced 07.02.2021 * Fixed #140 move WhoImport to RKI
in: rk_service_import.py * Fixed #125 implement RkiLandkreise * Fixed #126
implement RkiBundeslaenderImport
---
requirements/dev.txt | 217 ++++++++++++++++++++++++-----------------
requirements/docs.txt | 157 +++++++++++++----------------
requirements/tests.in | 4 +-
requirements/tests.txt | 115 +++++-----------------
run_setup.sh | 3 +
setup.py | 19 ++--
6 files changed, 231 insertions(+), 284 deletions(-)
diff --git a/requirements/dev.txt b/requirements/dev.txt
index 205e26a0..5a031ff1 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -4,95 +4,130 @@
#
# pip-compile requirements/dev.in
#
-
-# --------------------------------------------------------------
-# Covid 19 Data - Requirements
-# --------------------------------------------------------------
-setuptools==53.0.0
-pip==21.0.1
-pip-licenses==3.3.0
-wheel==0.36.2
-#------------------------------------------
-dash>=1.19.0
-dash-extensions>=0.0.45
-dtale>=1.34.0
-#------------------------------------------
-wget>=3.2
-celery[redis]>=5.0.5
-#------------------------------------------
-Flask>=1.1.2
-Flask-SQLAlchemy>=2.4.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
-#------------------------------------------
-Flask-DB>=0.3.0
-flask-pwa>=0.1.0
-Flask-Moment>=0.11.0
-Flask-CKEditor>=0.4.4.1
-flask-checkr>=0.1.2
-flask-whooshalchemy3>=0.2.0
-Flask-PluginKit>=3.6.0
-Flask-ResponseBuilder>=2.0.12
-flask-was>=0.1.0
-Flask-GraphQL>=2.0.1
-flask-hintful>=0.0.7
-Flask-Caching>=1.9.0
-flask-roles>=0.5
-Flask-Babel>=2
-Flask-Login<0.6.0,>=0.5.0
-#------------------------------------------
-manual-sitemap>=19.6.0
-aiocronjob>=0.2.0
-# --------------------------------------------------------------
-# Frontend, Statistics, Data Vizualisation
-# --------------------------------------------------------------
-npmdownloader>=1.2.1
-pyecharts>=1.9.0
-pyecharts-extras>=0.0.5
-reactive-pyecharts>=1.0.0
-visdom>=0.1.8.9
-tokenize-rt>=4.1.0
-pynndescent>=0.5.1
-torch>=1.7.1
-numpy>=1.20.1
-pandas>=1.1.0
-scipy>=1.5.0
-StatisticalDiagrams>=20.5
-# --------------------------------------------------------------
-# Tools:
-# --------------------------------------------------------------
-#importlib_metadata<4.0,>=1.4
-#PyGObject>=3.38.0
-#gaphor==2.2.1
-#
-# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-# docs - sphinx
-# --------------------------------------------------------------
-sphinx==3.4.3
-sphinx-tabs==2.0.1
-sphinx-issues==1.2.0
+alabaster==0.7.12
+ # via sphinx
+appdirs==1.4.4
+ # via virtualenv
+attrs==20.3.0
+ # via pytest
+babel==2.9.0
+ # via sphinx
+blinker==1.4
+ # via -r requirements/tests.in
+certifi==2020.12.5
+ # via requests
+cfgv==3.2.0
+ # via pre-commit
+chardet==4.0.0
+ # via requests
+click==7.1.2
+ # via pip-tools
+distlib==0.3.1
+ # via virtualenv
+docutils==0.16
+ # via sphinx
+filelock==3.0.12
+ # via
+ # tox
+ # virtualenv
+greenlet==1.0.0
+ # via -r requirements/tests.in
+identify==1.5.13
+ # via pre-commit
+idna==2.10
+ # via requests
+imagesize==1.2.0
+ # via sphinx
+iniconfig==1.1.1
+ # via pytest
+jinja2==2.11.3
+ # via sphinx
+markupsafe==1.1.1
+ # via jinja2
+nodeenv==1.5.0
+ # via pre-commit
+packaging==20.9
+ # via
+ # -r requirements/docs.in
+ # pallets-sphinx-themes
+ # pytest
+ # sphinx
+ # tox
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
+ # via -r requirements/docs.in
+pip-tools==5.5.0
+ # via -r requirements/dev.in
+pluggy==0.13.1
+ # via
+ # pytest
+ # tox
+pre-commit==2.10.1
+ # via -r requirements/dev.in
+py==1.10.0
+ # via
+ # pytest
+ # tox
+pygments==2.8.0
+ # via
+ # sphinx
+ # sphinx-tabs
+pyparsing==2.4.7
+ # via packaging
+pytest==6.2.2
+ # via -r requirements/tests.in
+python-dotenv==0.15.0
+ # via -r requirements/tests.in
+pytz==2021.1
+ # via babel
+pyyaml==5.4.1
+ # via pre-commit
+requests==2.25.1
+ # via sphinx
+six==1.15.0
+ # via
+ # tox
+ # virtualenv
+snowballstemmer==2.1.0
+ # via sphinx
+sphinx-issues==1.2.0
+ # via -r requirements/docs.in
+sphinx-tabs==2.0.1
+ # via -r requirements/docs.in
+sphinx==3.4.3
+ # via
+ # -r requirements/docs.in
+ # pallets-sphinx-themes
+ # sphinx-issues
+ # sphinx-tabs
+ # sphinxcontrib-log-cabinet
+sphinxcontrib-applehelp==1.0.2
+ # via sphinx
+sphinxcontrib-devhelp==1.0.2
+ # via sphinx
+sphinxcontrib-htmlhelp==1.0.3
+ # via sphinx
+sphinxcontrib-jsmath==1.0.1
+ # via sphinx
+sphinxcontrib-log-cabinet==1.0.1
+ # via -r requirements/docs.in
+sphinxcontrib-qthelp==1.0.3
+ # via sphinx
+sphinxcontrib-serializinghtml==1.1.4
+ # via sphinx
+toml==0.10.2
+ # via
+ # pre-commit
+ # pytest
+ # tox
+tox==3.21.4
+ # via -r requirements/dev.in
+urllib3==1.26.3
+ # via requests
+virtualenv==20.4.2
+ # via
+ # pre-commit
+ # tox
+
+# The following packages are considered to be unsafe in a requirements file:
+# pip
+# setuptools
diff --git a/requirements/docs.txt b/requirements/docs.txt
index 98778b34..95063dbc 100644
--- a/requirements/docs.txt
+++ b/requirements/docs.txt
@@ -4,95 +4,70 @@
#
# pip-compile requirements/docs.in
#
-
-# --------------------------------------------------------------
-# Covid 19 Data - Requirements
-# --------------------------------------------------------------
-setuptools==53.0.0
-pip==21.0.1
-pip-licenses==3.3.0
-wheel==0.36.2
-#------------------------------------------
-dash>=1.19.0
-dash-extensions>=0.0.45
-dtale>=1.34.0
-#------------------------------------------
-wget>=3.2
-celery[redis]>=5.0.5
-#------------------------------------------
-Flask>=1.1.2
-Flask-SQLAlchemy>=2.4.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
-#------------------------------------------
-Flask-DB>=0.3.0
-flask-pwa>=0.1.0
-Flask-Moment>=0.11.0
-Flask-CKEditor>=0.4.4.1
-flask-checkr>=0.1.2
-flask-whooshalchemy3>=0.2.0
-Flask-PluginKit>=3.6.0
-Flask-ResponseBuilder>=2.0.12
-flask-was>=0.1.0
-Flask-GraphQL>=2.0.1
-flask-hintful>=0.0.7
-Flask-Caching>=1.9.0
-flask-roles>=0.5
-Flask-Babel>=2
-Flask-Login<0.6.0,>=0.5.0
-#------------------------------------------
-manual-sitemap>=19.6.0
-aiocronjob>=0.2.0
-# --------------------------------------------------------------
-# Frontend, Statistics, Data Vizualisation
-# --------------------------------------------------------------
-npmdownloader>=1.2.1
-pyecharts>=1.9.0
-pyecharts-extras>=0.0.5
-reactive-pyecharts>=1.0.0
-visdom>=0.1.8.9
-tokenize-rt>=4.1.0
-pynndescent>=0.5.1
-torch>=1.7.1
-numpy>=1.20.1
-pandas>=1.1.0
-scipy>=1.5.0
-StatisticalDiagrams>=20.5
-# --------------------------------------------------------------
-# Tools:
-# --------------------------------------------------------------
-#importlib_metadata<4.0,>=1.4
-#PyGObject>=3.38.0
-#gaphor==2.2.1
-#
-# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-# docs - sphinx
-# --------------------------------------------------------------
-sphinx==3.4.3
-sphinx-tabs==2.0.1
-sphinx-issues==1.2.0
+alabaster==0.7.12
+ # via sphinx
+babel==2.9.0
+ # via sphinx
+certifi==2020.12.5
+ # via requests
+chardet==4.0.0
+ # via requests
+docutils==0.16
+ # via sphinx
+idna==2.10
+ # via requests
+imagesize==1.2.0
+ # via sphinx
+jinja2==2.11.3
+ # via sphinx
+markupsafe==1.1.1
+ # via jinja2
+packaging==20.9
+ # via
+ # -r requirements/docs.in
+ # pallets-sphinx-themes
+ # sphinx
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
+ # via -r requirements/docs.in
+pygments==2.8.0
+ # via
+ # sphinx
+ # sphinx-tabs
+pyparsing==2.4.7
+ # via packaging
+pytz==2021.1
+ # via babel
+requests==2.25.1
+ # via sphinx
+snowballstemmer==2.1.0
+ # via sphinx
+sphinx-issues==1.2.0
+ # via -r requirements/docs.in
+sphinx-tabs==2.0.1
+ # via -r requirements/docs.in
+sphinx==3.4.3
+ # via
+ # -r requirements/docs.in
+ # pallets-sphinx-themes
+ # sphinx-issues
+ # sphinx-tabs
+ # sphinxcontrib-log-cabinet
+sphinxcontrib-applehelp==1.0.2
+ # via sphinx
+sphinxcontrib-devhelp==1.0.2
+ # via sphinx
+sphinxcontrib-htmlhelp==1.0.3
+ # via sphinx
+sphinxcontrib-jsmath==1.0.1
+ # via sphinx
+sphinxcontrib-log-cabinet==1.0.1
+ # via -r requirements/docs.in
+sphinxcontrib-qthelp==1.0.3
+ # via sphinx
+sphinxcontrib-serializinghtml==1.1.4
+ # via sphinx
+urllib3==1.26.3
+ # via requests
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools
diff --git a/requirements/tests.in b/requirements/tests.in
index 8e1387e4..17b90b92 100644
--- a/requirements/tests.in
+++ b/requirements/tests.in
@@ -1,4 +1,6 @@
pytest
blinker
greenlet
-python-dotenv
\ No newline at end of file
+python-dotenv
+pytest-flask
+test-flask
\ No newline at end of file
diff --git a/requirements/tests.txt b/requirements/tests.txt
index 673077fb..50c58b65 100644
--- a/requirements/tests.txt
+++ b/requirements/tests.txt
@@ -4,96 +4,25 @@
#
# pip-compile requirements/tests.in
#
-
-# --------------------------------------------------------------
-# Covid 19 Data - Requirements
-# --------------------------------------------------------------
-setuptools==53.0.0
-pip==21.0.1
-pip-licenses==3.3.0
-wheel==0.36.2
-#------------------------------------------
-dash>=1.19.0
-dash-extensions>=0.0.45
-dtale>=1.34.0
-#------------------------------------------
-wget>=3.2
-celery[redis]>=5.0.5
-#------------------------------------------
-Flask>=1.1.2
-Flask-SQLAlchemy>=2.4.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
-#------------------------------------------
-Flask-DB>=0.3.0
-flask-pwa>=0.1.0
-Flask-Moment>=0.11.0
-Flask-CKEditor>=0.4.4.1
-flask-checkr>=0.1.2
-flask-whooshalchemy3>=0.2.0
-Flask-PluginKit>=3.6.0
-Flask-ResponseBuilder>=2.0.12
-flask-was>=0.1.0
-Flask-GraphQL>=2.0.1
-flask-hintful>=0.0.7
-Flask-Caching>=1.9.0
-flask-roles>=0.5
-Flask-Babel>=2
-Flask-Login<0.6.0,>=0.5.0
-#------------------------------------------
-manual-sitemap>=19.6.0
-aiocronjob>=0.2.0
-# --------------------------------------------------------------
-# Frontend, Statistics, Data Vizualisation
-# --------------------------------------------------------------
-npmdownloader>=1.2.1
-pyecharts>=1.9.0
-pyecharts-extras>=0.0.5
-reactive-pyecharts>=1.0.0
-visdom>=0.1.8.9
-tokenize-rt>=4.1.0
-pynndescent>=0.5.1
-torch>=1.7.1
-numpy>=1.20.1
-pandas>=1.1.0
-scipy>=1.5.0
-StatisticalDiagrams>=20.5
-# --------------------------------------------------------------
-# Tools:
-# --------------------------------------------------------------
-#importlib_metadata<4.0,>=1.4
-#PyGObject>=3.38.0
-#gaphor==2.2.1
-#
-# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-# docs - sphinx
-# --------------------------------------------------------------
-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
+attrs==20.3.0
+ # via pytest
+blinker==1.4
+ # via -r requirements/tests.in
+greenlet==1.0.0
+ # via -r requirements/tests.in
+iniconfig==1.1.1
+ # via pytest
+packaging==20.9
+ # via pytest
+pluggy==0.13.1
+ # via pytest
+py==1.10.0
+ # via pytest
+pyparsing==2.4.7
+ # via packaging
+pytest==6.2.2
+ # via -r requirements/tests.in
+python-dotenv==0.15.0
+ # via -r requirements/tests.in
+toml==0.10.2
+ # via pytest
diff --git a/run_setup.sh b/run_setup.sh
index 6830e999..7975ff78 100755
--- a/run_setup.sh
+++ b/run_setup.sh
@@ -34,3 +34,6 @@ pip install -e .
echo "--------------------------------------------------"
echo " DONE"
echo "--------------------------------------------------"
+pip-compile requirements/docs.in
+pip-compile requirements/tests.in
+pip-compile requirements/dev.in
diff --git a/setup.py b/setup.py
index 79647de8..b47432aa 100644
--- a/setup.py
+++ b/setup.py
@@ -36,13 +36,16 @@ requires_setup = [
"Flask-PluginKit>=3.6.0",
"Flask-ResponseBuilder>=2.0.12",
"Flask-Babel>=2",
- "npmdownloader>=1.2.1"
+ "npmdownloader>=1.2.1",
]
requires_test = [
+ "pytest>=5.3.2",
+ "greenlet==1.0.0",
+ "python-dotenv==0.15.0",
+ "blinker==1.4",
"test-flask>=0.2.0",
- "pytest>=6,<7",
- "pytest-flask>=1.1.0"
+ "pytest-flask>=1.1.0",
]
requires_docs = [
@@ -53,11 +56,11 @@ requires_docs = [
"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",
+ "plantuml-creator==1.0.7",
+ "plantuml-markdown==3.4.2",
+ "plantuml-wrapper==0.1.0",
+ "plantuml2freemind==0.8.2",
+ "plantuml-gentools==0.1.2",
"speaklater==1.3"
]
--
GitLab