diff --git a/.gitignore b/.gitignore index d6f923645ee5af0466b85d167b7b6a390bcc6eb1..c859b74a434c3e20776cada7b2da9bc29bfa9740 100644 --- a/.gitignore +++ b/.gitignore @@ -1127,20 +1127,9 @@ Debug*/Debug*\ Libs .idea/misc.xml .idea/*.iml /download.wget -/WHO-COVID-19-global-data.csv -/download *.wget -/WHO-COVID-19-global-data *.csv -/data/WHO-COVID-19-global-data *.csv -/data/ecdc_europa_data (1).csv -/data/RKI_COVID19.csv /covid19/static/node_modules -/src/covid19/RKI_COVID19__2021-02-06__landkreise.csv -/src/covid19/RKI_COVID19__2021-02-06__bundeslaender.csv -/src/covid19/RKI_COVID19__2021-02-06__landkreise.csv /node_modules -/req_dev.py -/req_docs.py -/req_tests.py +/requirements/req_build.py /requirements/req_dev.py /requirements/req_docs.py /requirements/req_tests.py @@ -1151,6 +1140,5 @@ Debug*/Debug*\ Libs /src/covid19/blueprints/owid/x3.py /.run/ /.checkmate/ -/.run/ /lsp/ /src/covid19_worker/dump.rdb diff --git a/.run/covid19.run.xml b/.run/covid19.run.xml deleted file mode 100644 index 3fc2f8423e712ce3074672e739f4901f7b84901f..0000000000000000000000000000000000000000 --- a/.run/covid19.run.xml +++ /dev/null @@ -1,24 +0,0 @@ -<component name="ProjectRunConfigurationManager"> - <configuration default="false" name="covid19" type="PythonConfigurationType" factoryName="Python" singleton="false"> - <module name="covid19python" /> - <option name="INTERPRETER_OPTIONS" value="" /> - <option name="PARENT_ENVS" value="true" /> - <envs> - <env name="PYTHONUNBUFFERED" value="1" /> - </envs> - <option name="SDK_HOME" value="" /> - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/src/covid19" /> - <option name="IS_MODULE_SDK" value="true" /> - <option name="ADD_CONTENT_ROOTS" value="true" /> - <option name="ADD_SOURCE_ROOTS" value="true" /> - <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" /> - <option name="SCRIPT_NAME" value="$PROJECT_DIR$/src/covid19/__init__.py" /> - <option name="PARAMETERS" value="" /> - <option name="SHOW_COMMAND_LINE" value="false" /> - <option name="EMULATE_TERMINAL" value="true" /> - <option name="MODULE_MODE" value="false" /> - <option name="REDIRECT_INPUT" value="false" /> - <option name="INPUT_FILE" value="" /> - <method v="2" /> - </configuration> -</component> \ No newline at end of file diff --git a/artwork/TODO.md b/artwork/TODO.md deleted file mode 100644 index b6dbda7f350106bf4ad180200790a61d91f2a1ae..0000000000000000000000000000000000000000 --- a/artwork/TODO.md +++ /dev/null @@ -1,2 +0,0 @@ -# TODO - diff --git a/lsp/conf/xml.json b/lsp/conf/xml.json deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/requirements/build.in b/requirements/build.in new file mode 100644 index 0000000000000000000000000000000000000000..d0273f2e3f0d7ef6be1a93b83dc44bff2a1472d2 --- /dev/null +++ b/requirements/build.in @@ -0,0 +1,17 @@ +setuptools +packaging +wheel>=0.36.2 +pip-licenses==3.3.0 +pip-tools>=5.5.0 +pipenv>=2020.11.15 +virtualenv>=20.4.2 +pytoolbox>=14.0.0 +pytoml==0.1.21 +py2puml==0.3.1 +plantuml-creator==1.0.7 +plantuml-markdown==3.4.2 +plantuml-wrapper==0.1.0 +plantuml-gentools==0.1.2 +plantuml2freemind==0.8.2 +ruamel-yaml==0.15.87 +venv-run>=0.1.0 diff --git a/requirements/docs.in b/requirements/docs.in index c054bcac28732438a34d61254c2ed6515ec2343b..26307677f1437b6499730874cc9757dd857f8695 100644 --- a/requirements/docs.in +++ b/requirements/docs.in @@ -1,11 +1,16 @@ +packaging wheel>=0.36.2 pip-tools>=5.5.0 pip-licenses>=3.3.0 -tokenize-rt>=4.1.0 +pipenv>=2020.11.15 +virtualenv>=20.4.2 +pytoolbox>=14.0.0 Flask-Babel>=2 -flask-resources==0.6.0 +pytoml==0.1.21 +flask-resources>=0.6.0 Flask-PluginKit>=3.6.0 Flask-ResponseBuilder>=2.0.12 +flask-filealchemy>=0.6.1 sphinx>=3.4.3,<3.5.0 sphinx-tabs==2.0.1 sphinx-issues==1.2.0 @@ -19,6 +24,6 @@ plantuml-markdown==3.4.2 plantuml-wrapper==0.1.0 plantuml2freemind==0.8.2 plantuml-gentools==0.1.2 -speaklater==1.3 -npmdownloader>=1.2.1 manual-sitemap>=19.6.0 +speaklater==1.3 +tokenize-rt>=4.1.0 diff --git a/requirements/tests.in b/requirements/tests.in index 61ed7fa0e624c55a048525c35916f89e98f9b759..5ed0798098b19e8e7413e87c9268f9609c556921 100644 --- a/requirements/tests.in +++ b/requirements/tests.in @@ -1,15 +1,11 @@ -pytoml -pytest==5.3.2 -pytest-runner==5.3.0 -pytest-flask -pytest-flask-sqlalchemy -pytest-mock -pytest-celery -blinker -greenlet -python-dotenv -test-flask -unittest2>=1.0.0 -extras>=1.0.0 -fixtures>=1.3.0 -python-mimeparse +python-dotenv>=0.15.0 +pytest>=5.3.2,<6.0.0 +pytest-venv>=0.2.1 +pytest-runner>=5.3.0 +pytest-postgresql>=2.6.1 +pytest-flask>=1.1.0 +pytest-flask-sqlalchemy>=1.0.2 +pytest-enabler>=1.2.0 +flask-unittest>=0.1.1 +Flask-Fixtures>=0.3.8 + diff --git a/setup.py b/setup.py index 35aa9336134d5f8bc8952bc4ede0779006dbf818..d0d0263f592354a9d691b9488c88825d21c338b9 100644 --- a/setup.py +++ b/setup.py @@ -486,6 +486,8 @@ setup( "Topic :: Internet :: WWW/HTTP :: WSGI :: Application", "Topic :: Internet :: WWW/HTTP :: WSGI :: Middleware", "Topic :: Software Development :: Libraries :: Python Modules", + "Topic :: Database :: Frontends", + "Framework :: Flask", ], long_description=readme + "\n\n" + history, long_description_content_type="text/markdown", @@ -498,5 +500,10 @@ setup( install_requires=requires_install, setup_requires=requires_setup, tests_require=requires_test, + scripts=[ + 'scripts/script_setup_requirements', + 'scripts/script_npm_install' + 'scripts/script_get_python_requirements_from_txt' + ], python_requires=">= 3.8" )