diff --git a/build.sh b/build.sh index ccb05146b8cefcdcfb822cef42fd6fe6b06c6c59..e5d7e6ccb8b1d61372ce94c197c212ec9d76092e 100755 --- a/build.sh +++ b/build.sh @@ -40,8 +40,8 @@ function main() { # setup_venv pip_compile pip_install - pip_install_via_setup_py - build_wheel + # pip_install_via_setup_py + # build_wheel } main diff --git a/requirements/build.in b/requirements/build.in index 12ea98499a4a877ee9626257576d58710130c316..796afcd89f86938dd78b4b7f67e16cce10fb1bd5 100644 --- a/requirements/build.in +++ b/requirements/build.in @@ -14,4 +14,4 @@ pre-commit==2.10.1 chardet==3.0.4 python-dotenv>=0.15.0 build>=0.3.1.post1 -twine>=3.4.1 +twine>=3.4.1 \ No newline at end of file diff --git a/requirements/build.txt b/requirements/build.txt index af2fa513c8b486919e6603de6bac8cd10306689c..49e10942d48afb3209fd91fdf9883301a4756c2b 100644 --- a/requirements/build.txt +++ b/requirements/build.txt @@ -8,12 +8,16 @@ appdirs==1.4.4 # via virtualenv argparse==1.4.0 # via pytoolbox +bleach==3.3.0 + # via readme-renderer build==0.3.1.post1 # via -r requirements/build.in certifi==2020.12.5 # via # pipenv # requests +cffi==1.14.5 + # via cryptography cfgv==3.2.0 # via pre-commit chardet==3.0.4 @@ -22,19 +26,36 @@ chardet==3.0.4 # requests click==7.1.2 # via pip-tools +colorama==0.4.4 + # via twine +cryptography==3.4.7 + # via secretstorage distlib==0.3.1 # via virtualenv +docutils==0.17 + # via readme-renderer filelock==3.0.12 # via virtualenv identify==1.5.14 # via pre-commit idna==2.10 # via requests +importlib-metadata==3.10.0 + # via + # keyring + # twine +jeepney==0.6.0 + # via + # keyring + # secretstorage +keyring==23.0.1 + # via twine nodeenv==1.5.0 # via pre-commit packaging==20.9 # via # -r requirements/build.in + # bleach # build pbr==3.1.1 # via -r requirements/build.in @@ -46,12 +67,18 @@ pip-tools==5.5.0 # via -r requirements/build.in pipenv==2020.11.15 # via -r requirements/build.in +pkginfo==1.7.0 + # via twine pre-commit==2.10.1 # via -r requirements/build.in ptable==0.9.2 # via pip-licenses pyaml==20.4.0 # via pytoolbox +pycparser==2.20 + # via cffi +pygments==2.8.1 + # via readme-renderer pyparsing==2.4.7 # via # -r requirements/build.in @@ -68,11 +95,24 @@ pyyaml==5.4.1 # via # pre-commit # pyaml +readme-renderer==29.0 + # via twine +requests-toolbelt==0.9.1 + # via twine requests==2.25.1 - # via pytoolbox + # via + # pytoolbox + # requests-toolbelt + # twine +rfc3986==1.4.0 + # via twine +secretstorage==3.3.1 + # via keyring six==1.13.0 # via # -r requirements/build.in + # bleach + # readme-renderer # virtualenv toml==0.10.2 # via @@ -80,6 +120,10 @@ toml==0.10.2 # build # pep517 # pre-commit +tqdm==4.59.0 + # via twine +twine==3.4.1 + # via -r requirements/build.in urllib3==1.26.3 # via requests venv-run==0.1.0 @@ -91,8 +135,12 @@ virtualenv==20.4.2 # -r requirements/build.in # pipenv # pre-commit +webencodings==0.5.1 + # via bleach wheel==0.36.2 # via -r requirements/build.in +zipp==3.4.1 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/dev.txt b/requirements/dev.txt index 40c31f2665ef4fb5957be1bea935350682ec80a5..583a1ada53bf81bfc40c634cefa1a35ee7676b87 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -22,6 +22,8 @@ babel==2.9.0 # sphinx billiard==3.6.3.0 # via celery +bleach==3.3.0 + # via readme-renderer blinker==1.4 # via flask-whooshalchemy3 build==0.3.1.post1 @@ -54,8 +56,12 @@ click==7.1.2 # click-repl # flask # pip-tools +colorama==0.4.4 + # via twine cryptography==3.4.7 - # via jwcrypto + # via + # jwcrypto + # secretstorage cx-oracle==8.1.0 # via -r requirements/dev.in cycler==0.10.0 @@ -63,7 +69,9 @@ cycler==0.10.0 distlib==0.3.1 # via virtualenv docutils==0.16 - # via sphinx + # via + # readme-renderer + # sphinx dominate==2.6.0 # via flask-bs4 filelock==3.0.12 @@ -122,6 +130,10 @@ idna==2.10 # via requests imagesize==1.2.0 # via sphinx +importlib-metadata==3.10.0 + # via + # keyring + # twine iniconfig==1.1.1 # via pytest itsdangerous==1.1.0 @@ -132,6 +144,10 @@ jaraco.context==4.0.0 # via pytest-enabler jaraco.functools==3.2.1 # via pytest-enabler +jeepney==0.6.0 + # via + # keyring + # secretstorage jinja2==2.11.3 # via # flask @@ -148,6 +164,8 @@ jsonpointer==2.0 # via jsonpatch jwcrypto==0.8 # via github3.py +keyring==23.0.1 + # via twine kiwisolver==1.3.1 # via matplotlib kombu==5.0.2 @@ -191,6 +209,7 @@ numpy==1.20.2 packaging==20.9 # via # -r requirements/build.in + # bleach # build # pytest # pytest-flask-sqlalchemy @@ -215,6 +234,8 @@ pip-tools==5.5.0 # via -r requirements/build.in pipenv==2020.11.15 # via -r requirements/build.in +pkginfo==1.7.0 + # via twine plantuml-gentools==0.1.2 # via -r requirements/docs.in plantuml-markdown==3.4.2 @@ -254,7 +275,9 @@ pyecharts==1.9.0 # -r requirements/dev.in # pyecharts-extras pygments==2.8.0 - # via sphinx + # via + # readme-renderer + # sphinx pynndescent==0.5.2 # via -r requirements/dev.in pyparsing==2.4.7 @@ -312,16 +335,24 @@ pyyaml==5.4.1 # pyaml pyzmq==22.0.3 # via visdom +readme-renderer==29.0 + # via twine redis==3.5.3 # via # celery # flask-redisboard +requests-toolbelt==0.9.1 + # via twine requests==2.25.1 # via # github3.py # pytoolbox + # requests-toolbelt # sphinx + # twine # visdom +rfc3986==1.4.0 + # via twine scikit-learn==0.24.1 # via pynndescent scipy==1.6.2 @@ -331,6 +362,8 @@ scipy==1.6.2 # scikit-learn # statisticaldiagrams # visdom +secretstorage==3.3.1 + # via keyring semver==2.13.0 # via flask-pluginkit simplejson==3.17.2 @@ -338,11 +371,13 @@ simplejson==3.17.2 six==1.13.0 # via # -r requirements/build.in + # bleach # click-repl # cycler # flask-cors # flask-fixtures # python-dateutil + # readme-renderer # sqlalchemy-utils # virtualenv # visdom @@ -408,6 +443,10 @@ torchfile==0.1.0 # via visdom tornado==6.1 # via visdom +tqdm==4.59.0 + # via twine +twine==3.4.1 + # via -r requirements/build.in typing-extensions==3.7.4.3 # via torch uritemplate==3.0.1 @@ -436,6 +475,8 @@ wcwidth==0.1.8 # via # prettytable # prompt-toolkit +webencodings==0.5.1 + # via bleach websocket-client==0.57.0 # via visdom werkzeug==1.0.1 @@ -453,6 +494,8 @@ wtforms==2.3.3 # flask-admin # flask-bs4 # flask-wtf +zipp==3.4.1 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/setup.py b/setup.py index bd0becd94cfc4beef3a4530915acc0829776437d..5a14c20ba4d76daa19a330c931e89c2d5d8e00f0 100644 --- a/setup.py +++ b/setup.py @@ -135,7 +135,7 @@ requires_docs = [ "plantuml-markdown==3.4.2", "plantuml-wrapper==0.1.0", "plantuml==0.3.0", - "py2puml==0.3.1", + "py2puml==0.4.0", "pycparser==2.20", "pygments==2.8.0", "pyparsing==2.4.6", @@ -153,7 +153,7 @@ requires_docs = [ "sphinxcontrib-htmlhelp==1.0.3", "sphinxcontrib-jsmath==1.0.1", "sphinxcontrib-log-cabinet==1.0.1", - "sphinxcontrib-plantuml==0.19", + "sphinxcontrib-plantuml==0.20.1", "sphinxcontrib-qthelp==1.0.3", "sphinxcontrib-serializinghtml==1.1.4", "tokenize-rt==4.1.0", @@ -255,7 +255,7 @@ requires_install = [ "psutil==5.8.0", "psycopg2-binary==2.8.6", "ptable==0.9.2", - "py2puml==0.3.1", + "py2puml==0.4.0", "py==1.8.1", "pyaml==20.4.0", "pycparser==2.20", @@ -297,7 +297,7 @@ requires_install = [ "sphinxcontrib-htmlhelp==1.0.3", "sphinxcontrib-jsmath==1.0.1", "sphinxcontrib-log-cabinet==1.0.1", - "sphinxcontrib-plantuml==0.19", + "sphinxcontrib-plantuml==0.20.1", "sphinxcontrib-qthelp==1.0.3", "sphinxcontrib-serializinghtml==1.1.4", "sqlalchemy-utils==0.36.8",