diff --git a/Makefile b/Makefile index 2df7e11c0cbcb7addb1cc5365d99fea8c69c7364..ffb2d53c1208e71c38bbf4f7412668e3ccda5686 100644 --- a/Makefile +++ b/Makefile @@ -6,8 +6,14 @@ all: clean setup build update_dependencies setup_first: setup_development_setuptools setup_development setup_pip_install build_setup_py @echo "first_setup" -clean: clean_eggs clean_node_modules clean_static_vendor clean_checkmate clean_pycache clean_build clean_dist +clean: clean_node_modules clean_static_vendor @echo "clean" + rm -rf .eggs + rm -rf flask_covid19.egg-info + rm -rf __pycache__ + rm -rf build + rm -rf dist + rm -rf .checkmate build: build_setup_py build_wheel_dist build_wheel build_frontend @echo "build" @@ -102,11 +108,6 @@ vcs_pull: vcs: vcs_commit vcs_push vcs_pull -clean_eggs: - @echo "clean_eggs" - rm -rf .eggs - rm -rf flask_covid19.egg-info - clean_node_modules: @echo "clean_node_modules" rm -rf node_modules @@ -116,22 +117,6 @@ clean_static_vendor: @echo "clean_node_modules" rm -rf src/covid19/static/vendor -clean_checkmate: - @echo "clean_checkmate" - rm -rf .checkmate - -clean_pycache: - @echo "clean_pycache" - rm -rf __pycache__ - -clean_build: - @echo "clean_build" - rm -rf build - -clean_dist: - @echo "clean_dist" - rm -rf dist - setup: setup_development_pip setup_development_setuptools setup_development setup_frontend @echo "setup" diff --git a/requirements/build.txt b/requirements/build.txt index bfa22fa1ddece4ec5e717c934c6fc9d3245fe195..6f0b7c6fe4a9b80425be6d9fe8973427309a8a22 100644 --- a/requirements/build.txt +++ b/requirements/build.txt @@ -36,7 +36,7 @@ filelock==3.0.12 # via virtualenv flask-sqlalchemy==2.5.1 # via -r requirements/build.in -flask==1.1.2 +flask==1.1.4 # via # -r requirements/build.in # flask-sqlalchemy @@ -113,7 +113,7 @@ six==1.15.0 # -r requirements/build.in # python-dateutil # virtualenv -sqlalchemy==1.4.6 +sqlalchemy==1.4.15 # via # -r requirements/build.in # alembic diff --git a/requirements/docs.txt b/requirements/docs.txt index 057e43d937d3f1c22c8cbd42feee222c35826519..5cc10a2cea72c7a8a288bfa59f2d8426fcd3a446 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -46,7 +46,7 @@ filelock==3.0.12 # via virtualenv flask-sqlalchemy==2.5.1 # via -r requirements/build.in -flask==1.1.2 +flask==1.1.4 # via # -r requirements/build.in # flask-sqlalchemy @@ -189,7 +189,7 @@ sphinxcontrib-qthelp==1.0.3 # via sphinx sphinxcontrib-serializinghtml==1.1.4 # via sphinx -sqlalchemy==1.4.6 +sqlalchemy==1.4.15 # via # -r requirements/build.in # alembic diff --git a/requirements/tests.txt b/requirements/tests.txt index f41eb64f2522d882ebfe4183af8bd2f575978e93..b32ba6c0dd382203347d52157a8a4d923f3dd547 100644 --- a/requirements/tests.txt +++ b/requirements/tests.txt @@ -48,7 +48,7 @@ flask-sqlalchemy==2.5.1 # flask-db # flask-fixtures # pytest-flask-sqlalchemy -flask==1.1.2 +flask==1.1.4 # via # -r requirements/build.in # flask-db @@ -133,13 +133,13 @@ pytest-flask==1.2.0 # via -r requirements/tests.in pytest-mock==3.5.1 # via pytest-flask-sqlalchemy -pytest-postgresql==2.6.1 +pytest-postgresql==3.0.0 # via -r requirements/tests.in pytest-runner==5.3.0 # via -r requirements/tests.in pytest-venv==0.2.1 # via -r requirements/tests.in -pytest==6.2.3 +pytest==6.2.4 # via # -r requirements/tests.in # pytest-flask @@ -176,7 +176,7 @@ six==1.15.0 # virtualenv sqlalchemy-utils==0.36.8 # via flask-db -sqlalchemy==1.4.12 +sqlalchemy==1.4.15 # via # -r requirements/build.in # alembic