From 391af88e36d54b71408144c91d5e8fe3963c7af4 Mon Sep 17 00:00:00 2001 From: "thomas.woehlke" <thomas.woehlke@rub.de> Date: Wed, 24 Feb 2021 21:48:33 +0100 Subject: [PATCH] Default task --- build.cmd | 2 +- requirements/build.txt | 95 ++++++--------------------------- requirements/dev.txt | 117 ++++++++--------------------------------- requirements/docs.txt | 111 +++----------------------------------- setup.py | 1 - 5 files changed, 46 insertions(+), 280 deletions(-) diff --git a/build.cmd b/build.cmd index 81a10eff..bb8b32ba 100644 --- a/build.cmd +++ b/build.cmd @@ -13,7 +13,7 @@ pip install -r requirements\docs.in --log logfile2.txt pip install -r requirements\tests.in --log logfile3.txt pip install -r requirements\dev.in --log logfile4.txt -rem pip install -e . --compile --force-reinstall --progress-bar pretty --log logfile5.txt +pip install -e . --compile --force-reinstall --progress-bar pretty --log logfile5.txt rem rem pip install -e . --compile --progress-bar pretty --log logfile5.txt rem python -m build --wheel diff --git a/requirements/build.txt b/requirements/build.txt index 397c9b1e..cbd0a7a2 100644 --- a/requirements/build.txt +++ b/requirements/build.txt @@ -8,94 +8,46 @@ appdirs==1.4.4 # via virtualenv argparse==1.4.0 # via pytoolbox -atomicwrites==1.4.0 - # via pytest -attrs==19.3.0 - # via - # plantuml-creator - # plantuml2freemind - # pytest certifi==2020.12.5 # via # pipenv # requests +cfgv==3.2.0 + # via pre-commit chardet==4.0.0 # via requests -cleo==0.8.1 - # via plantuml2freemind click==7.1.2 # via pip-tools -clikit==0.6.2 - # via cleo -colorama==0.4.4 - # via pytest -crashtest==0.3.1 - # via clikit distlib==0.3.1 # via virtualenv filelock==3.0.12 # via virtualenv -httplib2==0.19.0 - # via plantuml +identify==1.5.14 + # via pre-commit idna==2.10 # via requests -importlib-metadata==1.3.0 - # via plantuml-creator -markdown==3.3.3 - # via plantuml-markdown -more-itertools==8.0.2 - # via - # plantuml-creator - # pytest - # zipp +nodeenv==1.5.0 + # via pre-commit packaging==20.0 - # via - # -r requirements\build.in - # plantuml-creator - # pytest -pastel==0.2.1 - # via clikit + # via -r requirements\build.in +pbr==3.1.1 + # via -r requirements\build.in pip-licenses==3.3.0 # via -r requirements\build.in pip-tools==5.5.0 # via -r requirements\build.in pipenv==2020.11.15 # via -r requirements\build.in -plantuml-creator==1.0.7 - # via -r requirements\build.in -plantuml-gentools==0.1.2 - # via -r requirements\build.in -plantuml-markdown==3.4.2 - # via -r requirements\build.in -plantuml-wrapper==0.1.0 +pre-commit==2.10.1 # via -r requirements\build.in -plantuml2freemind==0.8.2 - # via -r requirements\build.in -plantuml==0.3.0 - # via plantuml-markdown -pluggy==0.13.1 - # via - # plantuml-creator - # pytest ptable==0.9.2 # via pip-licenses -py2puml==0.3.1 - # via -r requirements\build.in -py==1.8.1 - # via - # plantuml-creator - # pytest pyaml==20.4.0 # via pytoolbox -pylev==1.3.0 - # via clikit pyparsing==2.4.6 # via - # httplib2 + # -r requirements\build.in # packaging - # plantuml-creator -pytest==5.3.2 - # via plantuml-creator python-magic==0.4.22 # via pytoolbox pytoml==0.1.21 @@ -106,25 +58,17 @@ pytz==2021.1 # via pytoolbox pyyaml==5.4.1 # via - # plantuml2freemind + # pre-commit # pyaml requests==2.25.1 # via pytoolbox -ruamel-yaml==0.16.12 - # via -r requirements\build.in -ruamel.yaml.clib==0.2.2 - # via ruamel-yaml six==1.13.0 # via + # -r requirements\build.in # packaging - # plantuml-creator # virtualenv -str2bool==1.1 - # via plantuml-creator -stringcase==1.2.0 - # via plantuml-creator -typing-extensions==3.7.4.3 - # via plantuml2freemind +toml==0.10.2 + # via pre-commit urllib3==1.26.3 # via requests venv-run==0.1.0 @@ -135,16 +79,9 @@ virtualenv==20.4.2 # via # -r requirements\build.in # pipenv -wcwidth==0.1.8 - # via - # plantuml-creator - # pytest + # pre-commit wheel==0.36.2 # via -r requirements\build.in -zipp==0.6.0 - # via - # importlib-metadata - # plantuml-creator # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/dev.txt b/requirements/dev.txt index c773956f..1f0bbb1a 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -24,7 +24,6 @@ atomicwrites==1.4.0 # via pytest attrs==19.3.0 # via - # jsonschema # plantuml-creator # plantuml2freemind # pytest @@ -96,51 +95,33 @@ filelock==3.0.12 flask-admin==1.5.7 # via -r requirements\dev.in flask-babel==2.0.0 - # via - # -r requirements\dev.in - # -r requirements\docs.in + # 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-checkr==0.1.2 - # via -r requirements\dev.in -flask-ckeditor==0.4.4.1 - # 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\docs.in + # via -r requirements\dev.in flask-fixtures==0.3.8 # via -r requirements\tests.in -flask-graphql==2.0.1 - # via -r requirements\dev.in flask-healthz==0.0.2 # via -r requirements\dev.in -flask-hintful==0.0.7 - # 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 - # -r requirements\docs.in -flask-pwa==0.1.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 - # -r requirements\docs.in + # via -r requirements\dev.in flask-responsebuilder==2.0.13 - # via - # -r requirements\dev.in - # -r requirements\docs.in + # via -r requirements\dev.in flask-sqlalchemy==2.4.4 # via # -r requirements\dev.in @@ -151,8 +132,6 @@ flask-sqlalchemy==2.4.4 # pytest-flask-sqlalchemy flask-unittest==0.1.1 # via -r requirements\tests.in -flask-was==0.1.0 - # via -r requirements\dev.in flask-whooshalchemy3==0.2.0 # via -r requirements\dev.in flask-wtf==0.14.3 @@ -164,34 +143,22 @@ flask==1.1.2 # flask-babel # flask-bs4 # flask-caching - # flask-checkr - # flask-ckeditor # flask-cors # flask-db # flask-filealchemy # flask-fixtures - # flask-graphql # flask-healthz - # flask-hintful # flask-moment # flask-monitoring # flask-pluginkit - # flask-pwa # flask-redisboard # flask-resources # flask-responsebuilder # flask-sqlalchemy # flask-unittest - # flask-was # flask-whooshalchemy3 # flask-wtf # pytest-flask -graphql-core==2.3.2 - # via - # flask-graphql - # graphql-server-core -graphql-server-core==1.2.0 - # via flask-graphql h11==0.9.0 # via uvicorn httplib2==0.19.0 @@ -229,8 +196,6 @@ jsonpatch==1.28 # via visdom jsonpointer==2.0 # via jsonpatch -jsonschema==3.2.0 - # via flask-checkr kiwisolver==1.3.1 # via matplotlib kombu==5.0.2 @@ -251,10 +216,7 @@ markupsafe==1.1.1 # mako # wtforms marshmallow==3.10.0 - # via - # flask-hintful - # flask-resources - # openapi-specgen + # via flask-resources matplotlib==3.3.4 # via statisticaldiagrams mirakuru==2.3.0 @@ -282,12 +244,9 @@ numpy==1.20.1 # statisticaldiagrams # torch # visdom -openapi-specgen==0.0.6 - # via flask-hintful packaging==20.0 # via # -r requirements\build.in - # -r requirements\docs.in # pallets-sphinx-themes # plantuml-creator # pytest @@ -301,6 +260,7 @@ pastel==0.2.1 # via clikit pbr==3.1.1 # via + # -r requirements\build.in # flask-whooshalchemy3 # sphinxcontrib-gravizo pillow==8.1.0 @@ -308,38 +268,21 @@ pillow==8.1.0 # matplotlib # visdom pip-licenses==3.3.0 - # via - # -r requirements\build.in - # -r requirements\docs.in + # via -r requirements\build.in pip-tools==5.5.0 - # via - # -r requirements\build.in - # -r requirements\dev.in - # -r requirements\docs.in + # via -r requirements\build.in pipenv==2020.11.15 - # via - # -r requirements\build.in - # -r requirements\docs.in + # via -r requirements\build.in plantuml-creator==1.0.7 - # via - # -r requirements\build.in - # -r requirements\docs.in + # via -r requirements\docs.in plantuml-gentools==0.1.2 - # via - # -r requirements\build.in - # -r requirements\docs.in + # via -r requirements\docs.in plantuml-markdown==3.4.2 - # via - # -r requirements\build.in - # -r requirements\docs.in + # via -r requirements\docs.in plantuml-wrapper==0.1.0 - # via - # -r requirements\build.in - # -r requirements\docs.in + # via -r requirements\docs.in plantuml2freemind==0.8.2 - # via - # -r requirements\build.in - # -r requirements\docs.in + # via -r requirements\docs.in plantuml==0.3.0 # via plantuml-markdown pluggy==0.13.1 @@ -349,15 +292,11 @@ pluggy==0.13.1 port-for==0.4 # via pytest-postgresql pre-commit==2.10.1 - # via -r requirements\dev.in + # via -r requirements\build.in prettytable==2.0.0 # via # pyecharts # reactive-pyecharts -promise==2.3 - # via - # graphql-core - # graphql-server-core prompt-toolkit==3.0.16 # via click-repl psutil==5.8.0 @@ -369,9 +308,7 @@ psycopg2==2.8.6 ptable==0.9.2 # via pip-licenses py2puml==0.3.1 - # via - # -r requirements\build.in - # -r requirements\docs.in + # via -r requirements\docs.in py==1.8.1 # via # plantuml-creator @@ -396,12 +333,11 @@ pynndescent==0.5.2 # via -r requirements\dev.in pyparsing==2.4.6 # via + # -r requirements\build.in # httplib2 # matplotlib # packaging # plantuml-creator -pyrsistent==0.17.3 - # via jsonschema pytest-enabler==1.2.0 # via -r requirements\tests.in pytest-flask-sqlalchemy==1.0.2 @@ -441,9 +377,7 @@ python-magic==0.4.22 pytoml==0.1.21 # via -r requirements\build.in pytoolbox==14.0.0 - # via - # -r requirements\build.in - # -r requirements\docs.in + # via -r requirements\build.in pytz==2020.5 # via # -r requirements\dev.in @@ -477,13 +411,9 @@ requests==2.25.1 # sphinx # visdom ruamel-yaml==0.16.12 - # via - # -r requirements\build.in - # flask-filealchemy + # via flask-filealchemy ruamel.yaml.clib==0.2.2 # via ruamel-yaml -rx==1.6.1 - # via graphql-core scikit-learn==0.24.1 # via pynndescent scipy==1.6.0 @@ -499,16 +429,14 @@ simplejson==3.17.2 # via pyecharts six==1.13.0 # via + # -r requirements\build.in # apscheduler # click-repl # cycler # flask-cors # flask-fixtures - # graphql-core - # jsonschema # packaging # plantuml-creator - # promise # python-dateutil # python-frontmatter # sqlalchemy-utils @@ -608,7 +536,6 @@ virtualenv-clone==0.5.4 virtualenv==20.4.2 # via # -r requirements\build.in - # -r requirements\docs.in # pipenv # pre-commit # pytest-venv @@ -633,9 +560,7 @@ werkzeug==1.0.1 wget==3.2 # via -r requirements\dev.in wheel==0.36.2 - # via - # -r requirements\build.in - # -r requirements\docs.in + # via -r requirements\build.in whoosh==2.7.4 # via flask-whooshalchemy3 wtforms==2.3.3 diff --git a/requirements/docs.txt b/requirements/docs.txt index 3f683cb0..74f89d56 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -6,10 +6,6 @@ # alabaster==0.7.12 # via sphinx -appdirs==1.4.4 - # via virtualenv -argparse==1.4.0 - # via pytoolbox atomicwrites==1.4.0 # via pytest attrs==19.3.0 @@ -18,22 +14,15 @@ attrs==19.3.0 # plantuml2freemind # pytest babel==2.9.0 - # via - # flask-babel - # sphinx + # via sphinx certifi==2020.12.5 - # via - # pipenv - # requests + # via requests chardet==3.0.4 # via requests cleo==0.8.1 # via plantuml2freemind click==7.1.2 - # via - # flask - # manual-sitemap - # pip-tools + # via manual-sitemap clikit==0.6.2 # via cleo colorama==0.4.4 @@ -42,32 +31,8 @@ colorama==0.4.4 # sphinx crashtest==0.3.1 # via clikit -distlib==0.3.1 - # via virtualenv docutils==0.16 # via sphinx -filelock==3.0.12 - # via virtualenv -flask-babel==2.0.0 - # via -r requirements\docs.in -flask-filealchemy==0.6.1 - # via -r requirements\docs.in -flask-pluginkit==3.6.0 - # via -r requirements\docs.in -flask-resources==0.6.0 - # via -r requirements\docs.in -flask-responsebuilder==2.0.13 - # via -r requirements\docs.in -flask-sqlalchemy==2.4.4 - # via flask-filealchemy -flask==1.1.2 - # via - # flask-babel - # flask-filealchemy - # flask-pluginkit - # flask-resources - # flask-responsebuilder - # flask-sqlalchemy httplib2==0.19.0 # via plantuml idna==2.10 @@ -76,23 +41,14 @@ imagesize==1.2.0 # via sphinx importlib-metadata==1.3.0 # via plantuml-creator -itsdangerous==1.1.0 - # via flask jinja2==2.11.3 - # via - # flask - # flask-babel - # sphinx -json2html==1.3.0 - # via flask-responsebuilder + # via sphinx manual-sitemap==19.6.0 # via -r requirements\docs.in markdown==3.3.3 # via plantuml-markdown markupsafe==1.1.1 # via jinja2 -marshmallow==3.10.0 - # via flask-resources more-itertools==8.0.2 # via # plantuml-creator @@ -100,7 +56,6 @@ more-itertools==8.0.2 # zipp packaging==20.0 # via - # -r requirements\docs.in # pallets-sphinx-themes # plantuml-creator # pytest @@ -111,12 +66,6 @@ pastel==0.2.1 # via clikit pbr==5.5.1 # via sphinxcontrib-gravizo -pip-licenses==3.3.0 - # via -r requirements\docs.in -pip-tools==5.5.0 - # via -r requirements\docs.in -pipenv==2020.11.15 - # via -r requirements\docs.in plantuml-creator==1.0.7 # via -r requirements\docs.in plantuml-gentools==0.1.2 @@ -133,16 +82,12 @@ pluggy==0.13.1 # via # plantuml-creator # pytest -ptable==0.9.2 - # via pip-licenses py2puml==0.3.1 # via -r requirements\docs.in py==1.8.1 # via # plantuml-creator # pytest -pyaml==20.4.0 - # via pytoolbox pygments==2.8.0 # via # sphinx @@ -156,45 +101,20 @@ pyparsing==2.4.6 # plantuml-creator pytest==5.3.2 # via plantuml-creator -python-frontmatter==0.5.0 - # via flask-filealchemy -python-magic==0.4.22 - # via pytoolbox -pytoolbox==14.0.0 - # via -r requirements\docs.in pytz==2021.1 - # via - # babel - # flask-babel - # pytoolbox + # via babel pyyaml==5.4.1 - # via - # flask-responsebuilder - # plantuml2freemind - # pyaml - # python-frontmatter + # via plantuml2freemind requests==2.25.1 - # via - # pytoolbox - # sphinx -ruamel-yaml==0.16.12 - # via flask-filealchemy -ruamel.yaml.clib==0.2.2 - # via ruamel-yaml -semver==2.13.0 - # via flask-pluginkit + # via sphinx six==1.13.0 # via # packaging # plantuml-creator - # python-frontmatter - # virtualenv snowballstemmer==2.1.0 # via sphinx speaklater==1.3 - # via - # -r requirements\docs.in - # flask-resources + # via -r requirements\docs.in sphinx-issues==1.2.0 # via -r requirements\docs.in sphinx-tabs==2.0.1 @@ -225,8 +145,6 @@ sphinxcontrib-qthelp==1.0.3 # via sphinx sphinxcontrib-serializinghtml==1.1.4 # via sphinx -sqlalchemy==1.3.23 - # via flask-sqlalchemy str2bool==1.1 # via plantuml-creator stringcase==1.2.0 @@ -237,27 +155,14 @@ typing-extensions==3.7.4.3 # via plantuml2freemind urllib3==1.26.3 # via requests -virtualenv-clone==0.5.4 - # via pipenv -virtualenv==20.4.2 - # via - # -r requirements\docs.in - # pipenv wcwidth==0.1.8 # via # plantuml-creator # pytest -werkzeug==1.0.1 - # via flask -wheel==0.36.2 - # via -r requirements\docs.in -xmltodict==0.12.0 - # via flask-responsebuilder zipp==0.6.0 # via # importlib-metadata # plantuml-creator # The following packages are considered to be unsafe in a requirements file: -# pip # setuptools diff --git a/setup.py b/setup.py index 54061e65..6bb667d3 100644 --- a/setup.py +++ b/setup.py @@ -32,7 +32,6 @@ keywords_list = [ ] requires_setup = [ - "setuptools==53.0.0", "wheel==0.36.2", "pip-licenses==3.3.0", "pip-tools==5.5.0", -- GitLab