From 67ec3c020783f694edfaf457f7aee3828a7548ce Mon Sep 17 00:00:00 2001
From: "thomas.woehlke" <thomas.woehlke@rub.de>
Date: Thu, 25 Feb 2021 11:59:21 +0100
Subject: [PATCH] Default task
---
.gitignore | 1 +
requirements/build.txt | 2 +
requirements/dev.txt | 111 ++---------------------------------------
requirements/docs.txt | 18 +------
requirements/tests.txt | 28 ++++++++---
setup.py | 43 +++-------------
6 files changed, 38 insertions(+), 165 deletions(-)
diff --git a/.gitignore b/.gitignore
index e2a7deb8..c5c62ef8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1148,3 +1148,4 @@ dump.rdb
/logfile3.txt
/logfile4.txt
/logfile5.txt
+/logfile*.txt
diff --git a/requirements/build.txt b/requirements/build.txt
index 5c389499..a1b8409a 100644
--- a/requirements/build.txt
+++ b/requirements/build.txt
@@ -50,6 +50,8 @@ pyparsing==2.4.6
# via
# -r requirements\build.in
# packaging
+python-dotenv==0.15.0
+ # via -r requirements\build.in
python-magic==0.4.22
# via pytoolbox
pytoml==0.1.21
diff --git a/requirements/dev.txt b/requirements/dev.txt
index 57aae828..0d5c9f73 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -4,10 +4,6 @@
#
# pip-compile 'requirements\dev.in'
#
-aiocronjob==0.2.6
- # via -r requirements\dev.in
-aiofiles==0.5.0
- # via aiocronjob
alabaster==0.7.12
# via sphinx
alembic==1.5.4
@@ -16,8 +12,6 @@ amqp==5.0.5
# via kombu
appdirs==1.4.4
# via virtualenv
-apscheduler==3.7.0
- # via flask-monitoring
argparse==1.4.0
# via pytoolbox
atomicwrites==1.4.0
@@ -62,24 +56,15 @@ click==7.1.2
# click-plugins
# click-repl
# flask
- # flask-monitoring
- # manual-sitemap
# pip-tools
- # uvicorn
clikit==0.6.2
# via cleo
colorama==0.4.4
# via
# pytest
# sphinx
-colorhash==1.0.3
- # via flask-monitoring
-configparser==5.0.1
- # via flask-monitoring
crashtest==0.3.1
# via clikit
-crontab==0.22.9
- # via aiocronjob
cycler==0.10.0
# via matplotlib
distlib==0.3.1
@@ -88,8 +73,6 @@ docutils==0.16
# via sphinx
dominate==2.6.0
# via flask-bs4
-fastapi==0.55.1
- # via aiocronjob
filelock==3.0.12
# via virtualenv
flask-admin==1.5.7
@@ -98,40 +81,23 @@ flask-babel==2.0.0
# via -r requirements\dev.in
flask-bs4==4.5.3.0
# via -r requirements\dev.in
-flask-caching==1.9.0
- # via -r requirements\dev.in
flask-cors==3.0.10
# via -r requirements\dev.in
flask-db==0.3.0
- # via -r requirements\dev.in
-flask-filealchemy==0.6.1
- # via -r requirements\dev.in
+ # via -r requirements\tests.in
flask-fixtures==0.3.8
# via -r requirements\tests.in
-flask-healthz==0.0.2
- # via -r requirements\dev.in
-flask-moment==0.11.0
- # via -r requirements\dev.in
-flask-monitoring==1.1.2
- # via -r requirements\dev.in
flask-pluginkit==3.6.0
# via -r requirements\dev.in
flask-redisboard==0.2.0
# via -r requirements\dev.in
-flask-resources==0.6.0
- # via -r requirements\dev.in
-flask-responsebuilder==2.0.13
- # via -r requirements\dev.in
flask-sqlalchemy==2.4.4
# via
# -r requirements\dev.in
# flask-db
- # flask-filealchemy
# flask-fixtures
# flask-whooshalchemy3
# pytest-flask-sqlalchemy
-flask-unittest==0.1.1
- # via -r requirements\tests.in
flask-whooshalchemy3==0.2.0
# via -r requirements\dev.in
flask-wtf==0.14.3
@@ -142,25 +108,15 @@ flask==1.1.2
# flask-admin
# flask-babel
# flask-bs4
- # flask-caching
# flask-cors
# flask-db
- # flask-filealchemy
# flask-fixtures
- # flask-healthz
- # flask-moment
- # flask-monitoring
# flask-pluginkit
# flask-redisboard
- # flask-resources
- # flask-responsebuilder
# flask-sqlalchemy
- # flask-unittest
# flask-whooshalchemy3
# flask-wtf
# pytest-flask
-h11==0.9.0
- # via uvicorn
httplib2==0.19.0
# via plantuml
identify==1.5.13
@@ -184,14 +140,11 @@ jinja2==2.11.3
# flask
# flask-babel
# pyecharts
- # reactive-pyecharts
# sphinx
joblib==1.0.1
# via
# pynndescent
# scikit-learn
-json2html==1.3.0
- # via flask-responsebuilder
jsonpatch==1.28
# via visdom
jsonpointer==2.0
@@ -206,8 +159,6 @@ llvmlite==0.35.0
# pynndescent
mako==1.1.4
# via alembic
-manual-sitemap==19.6.0
- # via -r requirements\docs.in
markdown==3.3.3
# via plantuml-markdown
markupsafe==1.1.1
@@ -215,8 +166,6 @@ markupsafe==1.1.1
# jinja2
# mako
# wtforms
-marshmallow==3.10.0
- # via flask-resources
matplotlib==3.3.4
# via statisticaldiagrams
mirakuru==2.3.0
@@ -235,7 +184,6 @@ numba==0.52.0
numpy==1.20.1
# via
# -r requirements\dev.in
- # flask-monitoring
# matplotlib
# numba
# pandas
@@ -247,13 +195,10 @@ numpy==1.20.1
packaging==20.0
# via
# -r requirements\build.in
- # pallets-sphinx-themes
# plantuml-creator
# pytest
# pytest-flask-sqlalchemy
# sphinx
-pallets-sphinx-themes==1.2.3
- # via -r requirements\docs.in
pandas==1.2.2
# via -r requirements\dev.in
pastel==0.2.1
@@ -294,15 +239,11 @@ port-for==0.4
pre-commit==2.10.1
# via -r requirements\build.in
prettytable==2.0.0
- # via
- # pyecharts
- # reactive-pyecharts
+ # via pyecharts
prompt-toolkit==3.0.16
# via click-repl
psutil==5.8.0
- # via
- # flask-monitoring
- # mirakuru
+ # via mirakuru
psycopg2==2.8.6
# via -r requirements\dev.in
ptable==0.9.2
@@ -315,8 +256,6 @@ py==1.8.1
# pytest
pyaml==20.4.0
# via pytoolbox
-pydantic==1.7.3
- # via fastapi
pyecharts-extras==0.0.5
# via -r requirements\dev.in
pyecharts==1.9.0
@@ -324,9 +263,7 @@ pyecharts==1.9.0
# -r requirements\dev.in
# pyecharts-extras
pygments==2.8.0
- # via
- # sphinx
- # sphinx-tabs
+ # via sphinx
pylev==1.3.0
# via clikit
pynndescent==0.5.2
@@ -367,11 +304,9 @@ python-dateutil==2.8.1
# matplotlib
# pandas
python-dotenv==0.15.0
- # via -r requirements\tests.in
+ # via -r requirements\build.in
python-editor==1.0.4
# via alembic
-python-frontmatter==0.5.0
- # via flask-filealchemy
python-magic==0.4.22
# via pytoolbox
pytoml==0.1.21
@@ -380,26 +315,18 @@ pytoolbox==14.0.0
# via -r requirements\build.in
pytz==2020.5
# via
- # aiocronjob
- # apscheduler
# babel
# celery
# flask-babel
- # flask-monitoring
# pandas
# pytoolbox
- # tzlocal
pyyaml==5.4.1
# via
- # flask-responsebuilder
# plantuml2freemind
# pre-commit
# pyaml
- # python-frontmatter
pyzmq==22.0.3
# via visdom
-reactive-pyecharts==1.0.0
- # via -r requirements\dev.in
redis==3.5.3
# via
# celery
@@ -409,10 +336,6 @@ requests==2.25.1
# pytoolbox
# sphinx
# visdom
-ruamel-yaml==0.16.12
- # via flask-filealchemy
-ruamel.yaml.clib==0.2.2
- # via ruamel-yaml
scikit-learn==0.24.1
# via pynndescent
scipy==1.6.0
@@ -429,7 +352,6 @@ simplejson==3.17.2
six==1.13.0
# via
# -r requirements\build.in
- # apscheduler
# click-repl
# cycler
# flask-cors
@@ -437,7 +359,6 @@ six==1.13.0
# packaging
# plantuml-creator
# python-dateutil
- # python-frontmatter
# sqlalchemy-utils
# virtualenv
# visdom
@@ -445,19 +366,10 @@ six==1.13.0
snowballstemmer==2.1.0
# via sphinx
speaklater==1.3
- # via
- # -r requirements\docs.in
- # flask-resources
-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-plantuml
sphinxcontrib-applehelp==1.0.2
@@ -485,13 +397,10 @@ sqlalchemy==1.3.23
# -r requirements\dev.in
# alembic
# flask-db
- # flask-monitoring
# flask-sqlalchemy
# flask-whooshalchemy3
# pytest-flask-sqlalchemy
# sqlalchemy-utils
-starlette==0.13.2
- # via fastapi
statisticaldiagrams==20.5
# via -r requirements\dev.in
str2bool==1.1
@@ -516,14 +425,8 @@ typing-extensions==3.7.4.3
# via
# plantuml2freemind
# torch
-tzlocal==2.1
- # via
- # apscheduler
- # flask-monitoring
urllib3==1.26.3
# via requests
-uvicorn==0.11.8
- # via aiocronjob
venv-run==0.1.0
# via -r requirements\build.in
vine==5.0.0
@@ -550,8 +453,6 @@ wcwidth==0.1.8
# pytest
websocket-client==0.57.0
# via visdom
-websockets==8.1
- # via uvicorn
werkzeug==1.0.1
# via
# flask
@@ -567,8 +468,6 @@ wtforms==2.3.3
# flask-admin
# flask-bs4
# flask-wtf
-xmltodict==0.12.0
- # via flask-responsebuilder
zipp==0.6.0
# via
# importlib-metadata
diff --git a/requirements/docs.txt b/requirements/docs.txt
index 74f89d56..e2d5ca26 100644
--- a/requirements/docs.txt
+++ b/requirements/docs.txt
@@ -21,8 +21,6 @@ chardet==3.0.4
# via requests
cleo==0.8.1
# via plantuml2freemind
-click==7.1.2
- # via manual-sitemap
clikit==0.6.2
# via cleo
colorama==0.4.4
@@ -43,8 +41,6 @@ importlib-metadata==1.3.0
# via plantuml-creator
jinja2==2.11.3
# via sphinx
-manual-sitemap==19.6.0
- # via -r requirements\docs.in
markdown==3.3.3
# via plantuml-markdown
markupsafe==1.1.1
@@ -56,12 +52,9 @@ more-itertools==8.0.2
# zipp
packaging==20.0
# via
- # pallets-sphinx-themes
# plantuml-creator
# pytest
# sphinx
-pallets-sphinx-themes==1.2.3
- # via -r requirements\docs.in
pastel==0.2.1
# via clikit
pbr==5.5.1
@@ -89,9 +82,7 @@ py==1.8.1
# plantuml-creator
# pytest
pygments==2.8.0
- # via
- # sphinx
- # sphinx-tabs
+ # via sphinx
pylev==1.3.0
# via clikit
pyparsing==2.4.6
@@ -115,16 +106,9 @@ snowballstemmer==2.1.0
# via sphinx
speaklater==1.3
# via -r requirements\docs.in
-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-plantuml
sphinxcontrib-applehelp==1.0.2
diff --git a/requirements/tests.txt b/requirements/tests.txt
index d0231ca8..fcfd994d 100644
--- a/requirements/tests.txt
+++ b/requirements/tests.txt
@@ -4,6 +4,8 @@
#
# pip-compile 'requirements\tests.in'
#
+alembic==1.5.5
+ # via flask-db
appdirs==1.4.4
# via virtualenv
atomicwrites==1.4.0
@@ -18,19 +20,20 @@ distlib==0.3.1
# via virtualenv
filelock==3.0.12
# via virtualenv
+flask-db==0.3.0
+ # via -r requirements\tests.in
flask-fixtures==0.3.8
# via -r requirements\tests.in
flask-sqlalchemy==2.4.4
# via
+ # flask-db
# flask-fixtures
# pytest-flask-sqlalchemy
-flask-unittest==0.1.1
- # via -r requirements\tests.in
flask==1.1.2
# via
+ # flask-db
# flask-fixtures
# flask-sqlalchemy
- # flask-unittest
# pytest-flask
itsdangerous==1.1.0
# via flask
@@ -40,8 +43,12 @@ jaraco.functools==3.2.1
# via pytest-enabler
jinja2==2.11.3
# via flask
+mako==1.1.4
+ # via alembic
markupsafe==1.1.1
- # via jinja2
+ # via
+ # jinja2
+ # mako
mirakuru==2.3.0
# via pytest-postgresql
more-itertools==8.7.0
@@ -85,16 +92,25 @@ pytest==5.3.2
# pytest-mock
# pytest-postgresql
# pytest-venv
-python-dotenv==0.15.0
- # via -r requirements\tests.in
+python-dateutil==2.8.1
+ # via alembic
+python-editor==1.0.4
+ # via alembic
six==1.15.0
# via
# flask-fixtures
+ # python-dateutil
+ # sqlalchemy-utils
# virtualenv
+sqlalchemy-utils==0.36.8
+ # via flask-db
sqlalchemy==1.3.23
# via
+ # alembic
+ # flask-db
# flask-sqlalchemy
# pytest-flask-sqlalchemy
+ # sqlalchemy-utils
toml==0.10.2
# via pytest-enabler
virtualenv==20.4.2
diff --git a/setup.py b/setup.py
index c34ecbb8..9cb6e762 100644
--- a/setup.py
+++ b/setup.py
@@ -52,6 +52,7 @@ requires_build = [
"ptable==0.9.2",
"pyaml==20.4.0",
"pyparsing==2.4.6",
+ "python-dotenv==0.15.0",
"python-magic==0.4.22",
"pytoml==0.1.21",
"pytoolbox==14.0.0",
@@ -68,6 +69,7 @@ requires_build = [
]
requires_test = [
+ "alembic==1.5.5",
"appdirs==1.4.4",
"atomicwrites==1.4.0",
"attrs==20.3.0",
@@ -75,14 +77,15 @@ requires_test = [
"colorama==0.4.4",
"distlib==0.3.1",
"filelock==3.0.12",
+ "flask-db==0.3.0",
"flask-fixtures==0.3.8",
"flask-sqlalchemy==2.4.4",
- "flask-unittest==0.1.1",
"flask==1.1.2",
"itsdangerous==1.1.0",
"jaraco.context==4.0.0",
"jaraco.functools==3.2.1",
"jinja2==2.11.3",
+ "mako==1.1.4",
"markupsafe==1.1.1",
"mirakuru==2.3.0",
"more-itertools==8.7.0",
@@ -100,8 +103,10 @@ requires_test = [
"pytest-runner==5.3.0",
"pytest-venv==0.2.1",
"pytest==5.3.2",
- "python-dotenv==0.15.0",
+ "python-dateutil==2.8.1",
+ "python-editor==1.0.4",
"six==1.15.0",
+ "sqlalchemy-utils==0.36.8",
"sqlalchemy==1.3.23",
"toml==0.10.2",
"virtualenv==20.4.2",
@@ -117,7 +122,6 @@ requires_docs = [
"certifi==2020.12.5",
"chardet==3.0.4",
"cleo==0.8.1",
- "click==7.1.2",
"clikit==0.6.2",
"colorama==0.4.4",
"crashtest==0.3.1",
@@ -127,7 +131,6 @@ requires_docs = [
"imagesize==1.2.0",
"importlib-metadata==1.3.0",
"jinja2==2.11.3",
- "manual-sitemap==19.6.0",
"markdown==3.3.3",
"markupsafe==1.1.1",
"more-itertools==8.0.2",
@@ -153,8 +156,6 @@ requires_docs = [
"six==1.13.0",
"snowballstemmer==2.1.0",
"speaklater==1.3",
- "sphinx-issues==1.2.0",
- "sphinx-tabs==2.0.1",
"sphinx==3.4.3",
"sphinxcontrib-applehelp==1.0.2",
"sphinxcontrib-devhelp==1.0.2",
@@ -186,13 +187,10 @@ requires_extras = {
}
requires_dev = [
- "aiocronjob==0.2.6",
- "aiofiles==0.5.0",
"alabaster==0.7.12",
"alembic==1.5.4",
"amqp==5.0.5",
"appdirs==1.4.4",
- "apscheduler==3.7.0",
"argparse==1.4.0",
"atomicwrites==1.4.0",
"attrs==19.3.0",
@@ -210,37 +208,24 @@ requires_dev = [
"click==7.1.2",
"clikit==0.6.2",
"colorama==0.4.4",
- "colorhash==1.0.3",
- "configparser==5.0.1",
"crashtest==0.3.1",
- "crontab==0.22.9",
"cycler==0.10.0",
"distlib==0.3.1",
"docutils==0.16",
"dominate==2.6.0",
- "fastapi==0.55.1",
"filelock==3.0.12",
"flask-admin==1.5.7",
"flask-babel==2.0.0",
"flask-bs4==4.5.3.0",
- "flask-caching==1.9.0",
"flask-cors==3.0.10",
"flask-db==0.3.0",
- "flask-filealchemy==0.6.1",
"flask-fixtures==0.3.8",
- "flask-healthz==0.0.2",
- "flask-moment==0.11.0",
- "flask-monitoring==1.1.2",
"flask-pluginkit==3.6.0",
"flask-redisboard==0.2.0",
- "flask-resources==0.6.0",
- "flask-responsebuilder==2.0.13",
"flask-sqlalchemy==2.4.4",
- "flask-unittest==0.1.1",
"flask-whooshalchemy3==0.2.0",
"flask-wtf==0.14.3",
"flask==1.1.2",
- "h11==0.9.0",
"httplib2==0.19.0",
"identify==1.5.13",
"idna==2.10",
@@ -251,17 +236,14 @@ requires_dev = [
"jaraco.functools==3.2.1",
"jinja2==2.11.3",
"joblib==1.0.1",
- "json2html==1.3.0",
"jsonpatch==1.28",
"jsonpointer==2.0",
"kiwisolver==1.3.1",
"kombu==5.0.2",
"llvmlite==0.35.0",
"mako==1.1.4",
- "manual-sitemap==19.6.0",
"markdown==3.3.3",
"markupsafe==1.1.1",
- "marshmallow==3.10.0",
"matplotlib==3.3.4",
"mirakuru==2.3.0",
"more-itertools==8.0.2",
@@ -269,7 +251,6 @@ requires_dev = [
"numba==0.52.0",
"numpy==1.20.1",
"packaging==20.0",
- "pallets-sphinx-themes==1.2.3",
"pandas==1.2.2",
"pastel==0.2.1",
"pbr==3.1.1",
@@ -294,7 +275,6 @@ requires_dev = [
"py2puml==0.3.1",
"py==1.8.1",
"pyaml==20.4.0",
- "pydantic==1.7.3",
"pyecharts-extras==0.0.5",
"pyecharts==1.9.0",
"pygments==2.8.0",
@@ -312,14 +292,12 @@ requires_dev = [
"python-dateutil==2.8.1",
"python-dotenv==0.15.0",
"python-editor==1.0.4",
- "python-frontmatter==0.5.0",
"python-magic==0.4.22",
"pytoml==0.1.21",
"pytoolbox==14.0.0",
"pytz==2020.5",
"pyyaml==5.4.1",
"pyzmq==22.0.3",
- "reactive-pyecharts==1.0.0",
"redis==3.5.3",
"requests==2.25.1",
"scikit-learn==0.24.1",
@@ -329,8 +307,6 @@ requires_dev = [
"six==1.13.0",
"snowballstemmer==2.1.0",
"speaklater==1.3",
- "sphinx-issues==1.2.0",
- "sphinx-tabs==2.0.1",
"sphinx==3.4.3",
"sphinxcontrib-applehelp==1.0.2",
"sphinxcontrib-devhelp==1.0.2",
@@ -343,7 +319,6 @@ requires_dev = [
"sphinxcontrib-serializinghtml==1.1.4",
"sqlalchemy-utils==0.36.8",
"sqlalchemy==1.3.23",
- "starlette==0.13.2",
"statisticaldiagrams==20.5",
"str2bool==1.1",
"stringcase==1.2.0",
@@ -354,9 +329,7 @@ requires_dev = [
"torchfile==0.1.0",
"tornado==6.1",
"typing-extensions==3.7.4.3",
- "tzlocal==2.1",
"urllib3==1.26.3",
- "uvicorn==0.11.8",
"venv-run==0.1.0",
"vine==5.0.0",
"virtualenv-clone==0.5.4",
@@ -365,13 +338,11 @@ requires_dev = [
"visitor==0.1.3",
"wcwidth==0.1.8",
"websocket-client==0.57.0",
- "websockets==8.1",
"werkzeug==1.0.1",
"wget==3.2",
"wheel==0.36.2",
"whoosh==2.7.4",
"wtforms==2.3.3",
- "xmltodict==0.12.0",
"zipp==0.6.0",
]
--
GitLab