Merge 34aa118 into a746ae4

FlexMeasures · May 8, 2023 · 0316d43 · 0316d43
2 parents a746ae4 + 34aa118
commit 0316d43
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -29,6 +29,7 @@ notebooks/.ipynb_checkpoints/
 
 flexmeasures/ui/static/documentation
 documentation/img/screenshot_*
+generic_asset_fm_user_ownership.sql
 
 uml_diagram.png
 db_schema.png

diff --git a/Makefile b/Makefile
@@ -46,7 +46,7 @@ install-deps:
 	pip-sync requirements/app.txt
 
 install-flexmeasures:
-	python setup.py develop
+	pip install -e
 
 install-pip-tools:
 	pip3 install -q "pip-tools>=6.4"

diff --git a/flexmeasures/api/common/schemas/__init__.py b/flexmeasures/api/common/schemas/__init__.py
diff --git a/flexmeasures/api/common/schemas/tests/__init__.py b/flexmeasures/api/common/schemas/tests/__init__.py
diff --git a/to_pypi.sh b/to_pypi.sh
@@ -66,8 +66,7 @@ pip -q install twine
 pip -q install wheel
 
 echo "[TO_PYPI] Packaging ..."
-python setup.py egg_info sdist
-python setup.py egg_info bdist_wheel
+python -m build
 
 if [ "$1" == "--dry-run" ]; then
     echo "[TO_PYPI] Not uploading to Pypi (--dry-run active) ..."