From 759d1f075e0e4fb6f75489e41bd7e74af6d35eb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20H=C3=B6ning?= Date: Sat, 6 May 2023 11:24:36 +0200 Subject: [PATCH 1/4] use the build module instead of calling setup.py directly --- to_pypi.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/to_pypi.sh b/to_pypi.sh index 41224be1c..8ab383c8f 100755 --- 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) ..." From f5e79f8f0d1b2e16502834a8f400256af84a287f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20H=C3=B6ning?= Date: Sat, 6 May 2023 11:25:09 +0200 Subject: [PATCH 2/4] use pip install instead of calling setup.py directly --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7f6aa66be..2e789d537 100644 --- 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" From 7977503afaa0ad1742548b9bb9119175f21dbebc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20H=C3=B6ning?= Date: Sat, 6 May 2023 11:26:09 +0200 Subject: [PATCH 3/4] ignore a file we produce in DB migrations --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index db26adc49..2ce31f0d1 100644 --- 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 From 34aa118177f2b2f9c50f71cabdde2de346d6a9f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20H=C3=B6ning?= Date: Mon, 8 May 2023 15:20:21 +0200 Subject: [PATCH 4/4] add two missing __init__.py files --- flexmeasures/api/common/schemas/__init__.py | 0 flexmeasures/api/common/schemas/tests/__init__.py | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 flexmeasures/api/common/schemas/__init__.py create mode 100644 flexmeasures/api/common/schemas/tests/__init__.py diff --git a/flexmeasures/api/common/schemas/__init__.py b/flexmeasures/api/common/schemas/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/flexmeasures/api/common/schemas/tests/__init__.py b/flexmeasures/api/common/schemas/tests/__init__.py new file mode 100644 index 000000000..e69de29bb