diff --git a/etc/requirements.txt b/etc/requirements.txt index b92013b96650bc23a86c805935f0f3e1de8f55b4..ce5cfe9f2d299e857ec7f9b816cab8a859c5f3a9 100644 --- a/etc/requirements.txt +++ b/etc/requirements.txt @@ -30,6 +30,7 @@ Flask-Admin==1.5.8 Flask-BS4==4.5.3.0 Flask-Caching==1.10.1 Flask-Cors==3.0.10 +-e git+git@git.noc.ruhr-uni-bochum.de:thomaswoehlke/flask-covid19.git@1c6e57884b0edce121a57fae4bf7696e09d7e4cb#egg=flask_covid19 Flask-DB==0.3.1 flask-dictabase==1.1.3 Flask-Fixtures==0.3.8 @@ -75,6 +76,7 @@ Pillow==8.2.0 pip-licenses==3.3.1 pip-tools==6.1.0 pipenv==2020.11.15 +pkg-resources==0.0.0 plantuml==0.3.0 plantuml-gentools==0.1.2 plantuml-markdown==3.4.2 @@ -86,6 +88,7 @@ prettytable==2.1.0 prompt-toolkit==3.0.18 protobuf==3.17.1 psutil==5.8.0 +psycopg2-binary==2.8.6 PTable==0.9.2 py==1.10.0 py2puml==0.4.0 @@ -94,6 +97,7 @@ pycparser==2.20 pyecharts==1.9.0 pyecharts-extras==0.0.5 Pygments==2.9.0 +PyMySQL==1.0.2 pynndescent==0.5.2 pyparsing==2.4.7 pytest==6.2.4 diff --git a/requirements/build.txt b/requirements/build.txt index 2e6719b853217828bf75d2c5565839535eb31d42..aa8435c4528cfe88bbc28c75ced3ab5001a7f015 100644 --- a/requirements/build.txt +++ b/requirements/build.txt @@ -70,7 +70,7 @@ pip-licenses==3.3.1 # via -r requirements/build.in pip-tools==6.1.0 # via -r requirements/build.in -pipenv==2020.11.15 +pipenv==2021.5.29 # via -r requirements/build.in pre-commit==2.12.1 # via -r requirements/build.in @@ -129,7 +129,7 @@ venv-run==0.1.0 # via -r requirements/build.in virtualenv-clone==0.5.4 # via pipenv -virtualenv==20.4.6 +virtualenv==20.4.7 # via # -r requirements/build.in # pipenv diff --git a/requirements/dev.txt b/requirements/dev.txt index ee079ad06913f6d062cdb6bca45cc7db79157551..b049faa9f00a399bb129fdfbd0355c12e254c75a 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -58,7 +58,9 @@ click==7.1.2 # flask # pip-tools cryptography==3.4.7 - # via jwcrypto + # via + # jwcrypto + # mysqldb-wrapper cycler==0.10.0 # via matplotlib dataset==1.5.0 @@ -101,7 +103,7 @@ flask-login==0.5.0 # flask-login-dictabase-blueprint flask-sqlalchemy==2.5.1 # via - # -r requirements/build.in + # -r requirements/dev.in # flask-db # flask-fixtures # pytest-flask-sqlalchemy @@ -185,12 +187,22 @@ markupsafe==1.1.1 # wtforms matplotlib==3.4.2 # via statisticaldiagrams +memcache==0.5.1 + # via -r requirements/dev.in mirakuru==2.3.1 # via pytest-postgresql more-itertools==8.7.0 # via # jaraco.functools # pytest-enabler +mysql-connector-python==8.0.25 + # via -r requirements/dev.in +mysqlclient==2.0.3 + # via + # -r requirements/dev.in + # mysqldb-wrapper +mysqldb-wrapper==0.9.0 + # via -r requirements/dev.in nodeenv==1.6.0 # via pre-commit numba==0.53.1 @@ -232,7 +244,7 @@ pip-licenses==3.3.1 # via -r requirements/build.in pip-tools==6.1.0 # via -r requirements/build.in -pipenv==2020.11.15 +pipenv==2021.5.29 # via -r requirements/build.in plantuml-gentools==0.1.2 # via -r requirements/docs.in @@ -252,10 +264,10 @@ prettytable==2.1.0 # via pyecharts prompt-toolkit==3.0.18 # via click-repl +protobuf==3.17.1 + # via mysql-connector-python psutil==5.8.0 # via mirakuru -psycopg2-binary==2.8.6 - # via -r requirements/dev.in ptable==0.9.2 # via pip-licenses py2puml==0.4.0 @@ -278,8 +290,6 @@ pygments==2.9.0 # via # -r requirements/build.in # sphinx -pymysql==1.0.2 - # via -r requirements/dev.in pynndescent==0.5.2 # via -r requirements/dev.in pyparsing==2.4.7 @@ -363,6 +373,7 @@ six==1.16.0 # cycler # flask-cors # flask-fixtures + # protobuf # python-dateutil # sqlalchemy-utils # virtualenv @@ -401,7 +412,7 @@ sqlalchemy-utils==0.37.3 # via flask-db sqlalchemy==1.4.15 # via - # -r requirements/build.in + # -r requirements/dev.in # alembic # dataset # flask-db @@ -446,7 +457,7 @@ vine==5.0.0 # celery virtualenv-clone==0.5.4 # via pipenv -virtualenv==20.4.6 +virtualenv==20.4.7 # via # -r requirements/build.in # pipenv diff --git a/requirements/docs.txt b/requirements/docs.txt index 20722c0b6463518a7b1a430e40bc4a40baa67005..b6ec047556ca56a6f5411b82abd067af2926ed04 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -44,12 +44,8 @@ docutils==0.17.1 # sphinx filelock==3.0.12 # via virtualenv -flask-sqlalchemy==2.5.1 - # via -r requirements/build.in flask==1.1.4 - # via - # -r requirements/build.in - # flask-sqlalchemy + # via -r requirements/build.in github3.py==2.0.0 # via sphinxcontrib-github greenlet==1.0.0 @@ -100,7 +96,7 @@ pip-licenses==3.3.1 # via -r requirements/build.in pip-tools==6.1.0 # via -r requirements/build.in -pipenv==2020.11.15 +pipenv==2021.5.29 # via -r requirements/build.in plantuml-gentools==0.1.2 # via -r requirements/docs.in @@ -193,10 +189,7 @@ sphinxcontrib-qthelp==1.0.3 sphinxcontrib-serializinghtml==1.1.4 # via sphinx sqlalchemy==1.4.15 - # via - # -r requirements/build.in - # alembic - # flask-sqlalchemy + # via alembic tokenize-rt==4.1.0 # via -r requirements/docs.in toml==0.10.2 @@ -217,7 +210,7 @@ venv-run==0.1.0 # via -r requirements/build.in virtualenv-clone==0.5.4 # via pipenv -virtualenv==20.4.6 +virtualenv==20.4.7 # via # -r requirements/build.in # pipenv diff --git a/requirements/tests.txt b/requirements/tests.txt index a531e08efce773218d617c0369dbd4cfee52dbeb..5461b5809c39b19910e7c026548597b22a0ddbfe 100644 --- a/requirements/tests.txt +++ b/requirements/tests.txt @@ -44,7 +44,6 @@ flask-fixtures==0.3.8 # via -r requirements/tests.in flask-sqlalchemy==2.5.1 # via - # -r requirements/build.in # flask-db # flask-fixtures # pytest-flask-sqlalchemy @@ -103,7 +102,7 @@ pip-licenses==3.3.1 # via -r requirements/build.in pip-tools==6.1.0 # via -r requirements/build.in -pipenv==2020.11.15 +pipenv==2021.5.29 # via -r requirements/build.in pluggy==0.13.1 # via pytest @@ -180,7 +179,6 @@ sqlalchemy-utils==0.36.8 # via flask-db sqlalchemy==1.4.15 # via - # -r requirements/build.in # alembic # flask-db # flask-sqlalchemy @@ -204,7 +202,7 @@ venv-run==0.1.0 # via -r requirements/build.in virtualenv-clone==0.5.4 # via pipenv -virtualenv==20.4.6 +virtualenv==20.4.7 # via # -r requirements/build.in # pipenv diff --git a/setup.py b/setup.py index 1e37f4a923af0fb630e029c74fe28e6ded8c52d6..55ae31b717fafca4bf41a6a6627032775b1c6cf4 100644 --- a/setup.py +++ b/setup.py @@ -34,132 +34,131 @@ keywords_list = [ ] requires_build = [ - "alembic==1.6.2", - "appdirs==1.4.4", - "argparse==1.4.0", - "attrs==21.2.0", - "build==0.3.1.post1", - "certifi==2020.12.5", - "cfgv==3.3.0", - "chardet==4.0.0", - "click==7.1.2", - "distlib==0.3.1", - "docutils==0.17.1", - "filelock==3.0.12", - "flask-sqlalchemy==2.5.1", - "flask==1.1.4", - "greenlet==1.1.0", - "identify==2.2.4", - "idna==2.10", - "itsdangerous==1.1.0", - "jinja2==2.11.3", - "mako==1.1.4", - "markupsafe==2.0.0", - "nodeenv==1.6.0", - "packaging==20.9", - "pbr==5.6.0", - "pep517==0.10.0", - "pip-licenses==3.3.1", - "pip-tools==6.1.0", - "pipenv==2020.11.15", - "pre-commit==2.12.1", - "ptable==0.9.2", - "py==1.10.0", - "pyaml==20.4.0", - "pygments==2.9.0", - "pyparsing==2.4.7", - "python-dateutil==2.8.1", - "python-dotenv==0.17.1", - "python-editor==1.0.4", - "python-magic==0.4.22", - "pytoolbox==14.0.0", - "pytz==2021.1", - "pyyaml==5.4.1", - "requests==2.25.1", - "six==1.16.0", - "sqlalchemy==1.4.15", - "toml==0.10.2", - "tqdm==4.60.0", - "urllib3==1.26.4", - "venv-run==0.1.0", - "virtualenv-clone==0.5.4", - "virtualenv==20.4.6", - "werkzeug==1.0.1", - "wheel==0.36.2", + "alembic==1.6.2", + "appdirs==1.4.4", + "argparse==1.4.0", + "attrs==21.2.0", + "build==0.3.1.post1", + "certifi==2020.12.5", + "cfgv==3.3.0", + "chardet==4.0.0", + "click==7.1.2", + "distlib==0.3.1", + "docutils==0.17.1", + "filelock==3.0.12", + "flask==1.1.4", + "greenlet==1.1.0", + "identify==2.2.4", + "idna==2.10", + "itsdangerous==1.1.0", + "jinja2==2.11.3", + "mako==1.1.4", + "markupsafe==2.0.0", + "nodeenv==1.6.0", + "packaging==20.9", + "pbr==5.6.0", + "pep517==0.10.0", + "pip-licenses==3.3.1", + "pip-tools==6.1.0", + "pipenv==2020.11.15", + "pre-commit==2.12.1", + "ptable==0.9.2", + "py==1.10.0", + "pyaml==20.4.0", + "pygments==2.9.0", + "pyparsing==2.4.7", + "python-dateutil==2.8.1", + "python-dotenv==0.17.1", + "python-editor==1.0.4", + "python-magic==0.4.22", + "pytoolbox==14.0.0", + "pytz==2021.1", + "pyyaml==5.4.1", + "requests==2.25.1", + "six==1.16.0", + "sqlalchemy==1.4.15", + "toml==0.10.2", + "tqdm==4.60.0", + "urllib3==1.26.4", + "venv-run==0.1.0", + "virtualenv-clone==0.5.4", + "virtualenv==20.4.6", + "werkzeug==1.0.1", + "wheel==0.36.2", ] requires_test = [ - "alembic==1.6.2", - "appdirs==1.4.4", - "argparse==1.4.0", - "attrs==21.2.0", - "build==0.3.1.post1", - "certifi==2020.12.5", - "cfgv==3.2.0", - "chardet==4.0.0", - "click==7.1.2", - "distlib==0.3.1", - "docutils==0.17.1", - "filelock==3.0.12", - "flask-db==0.3.1", - "flask-fixtures==0.3.8", - "flask-sqlalchemy==2.5.1", - "flask==1.1.4", - "greenlet==1.0.0", - "identify==2.2.4", - "idna==2.10", - "iniconfig==1.1.1", - "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", - "nodeenv==1.5.0", - "packaging==20.9", - "pbr==5.6.0", - "pep517==0.10.0", - "pip-licenses==3.3.1", - "pip-tools==6.1.0", - "pipenv==2020.11.15", - "pluggy==0.13.1", - "port-for==0.4", - "pre-commit==2.12.1", - "psutil==5.8.0", - "ptable==0.9.2", - "py==1.10.0", - "pyaml==20.4.0", - "pygments==2.9.0", - "pyparsing==2.4.7", - "pytest-enabler==1.2.0", - "pytest-flask-sqlalchemy==1.0.2", - "pytest-flask==1.2.0", - "pytest-mock==3.5.1", - "pytest-postgresql==3.0.0", - "pytest-runner==5.3.0", - "pytest-venv==0.2.1", - "pytest==6.2.4", - "python-dateutil==2.8.1", - "python-dotenv==0.17.1", - "python-editor==1.0.4", - "python-magic==0.4.22", - "pytoolbox==14.0.0", - "pytz==2021.1", - "pyyaml==5.4.1", - "requests==2.25.1", - "six==1.15.0", - "sqlalchemy-utils==0.36.8", - "sqlalchemy==1.4.15", - "toml==0.10.2", - "tqdm==4.60.0", - "urllib3==1.26.4", - "venv-run==0.1.0", - "virtualenv-clone==0.5.4", - "virtualenv==20.4.6", - "werkzeug==1.0.1", - "wheel==0.36.2", + "alembic==1.6.2", + "appdirs==1.4.4", + "argparse==1.4.0", + "attrs==21.2.0", + "build==0.3.1.post1", + "certifi==2020.12.5", + "cfgv==3.2.0", + "chardet==4.0.0", + "click==7.1.2", + "distlib==0.3.1", + "docutils==0.17.1", + "filelock==3.0.12", + "flask-db==0.3.1", + "flask-fixtures==0.3.8", + "flask-sqlalchemy==2.5.1", + "flask==1.1.4", + "greenlet==1.0.0", + "identify==2.2.4", + "idna==2.10", + "iniconfig==1.1.1", + "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", + "nodeenv==1.5.0", + "packaging==20.9", + "pbr==5.6.0", + "pep517==0.10.0", + "pip-licenses==3.3.1", + "pip-tools==6.1.0", + "pipenv==2020.11.15", + "pluggy==0.13.1", + "port-for==0.4", + "pre-commit==2.12.1", + "psutil==5.8.0", + "ptable==0.9.2", + "py==1.10.0", + "pyaml==20.4.0", + "pygments==2.9.0", + "pyparsing==2.4.7", + "pytest-enabler==1.2.0", + "pytest-flask-sqlalchemy==1.0.2", + "pytest-flask==1.2.0", + "pytest-mock==3.5.1", + "pytest-postgresql==3.0.0", + "pytest-runner==5.3.0", + "pytest-venv==0.2.1", + "pytest==6.2.4", + "python-dateutil==2.8.1", + "python-dotenv==0.17.1", + "python-editor==1.0.4", + "python-magic==0.4.22", + "pytoolbox==14.0.0", + "pytz==2021.1", + "pyyaml==5.4.1", + "requests==2.25.1", + "six==1.15.0", + "sqlalchemy-utils==0.36.8", + "sqlalchemy==1.4.15", + "toml==0.10.2", + "tqdm==4.60.0", + "urllib3==1.26.4", + "venv-run==0.1.0", + "virtualenv-clone==0.5.4", + "virtualenv==20.4.6", + "werkzeug==1.0.1", + "wheel==0.36.2", ] requires_docs = [