From a3f66871d8bc21bf31f0dc808c4911cd133a3dd9 Mon Sep 17 00:00:00 2001 From: keisuke-umezawa Date: Tue, 5 Mar 2024 14:40:15 +0900 Subject: [PATCH 1/4] Delete setup.py --- setup.py | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 setup.py diff --git a/setup.py b/setup.py deleted file mode 100644 index 26e08e48..00000000 --- a/setup.py +++ /dev/null @@ -1,5 +0,0 @@ -from setuptools import setup - - -if __name__ == "__main__": - setup() From 7a9a251ef1a1ecf61e506690394945cdc1e304ec Mon Sep 17 00:00:00 2001 From: keisuke-umezawa Date: Tue, 5 Mar 2024 14:54:11 +0900 Subject: [PATCH 2/4] Delete setup command --- .github/workflows/github-release.yml | 2 +- .github/workflows/pypi-publish.yml | 2 +- Dockerfile | 1 - Makefile | 4 ++-- docs/getting-started.rst | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml index 858876a5..13fc17b6 100644 --- a/.github/workflows/github-release.yml +++ b/.github/workflows/github-release.yml @@ -27,7 +27,7 @@ jobs: run: | python -m pip install --upgrade pip setuptools pip install --progress-bar off wheel twine - - run: python setup.py sdist bdist_wheel + - run: python -m build - run: twine check dist/* - name: Create GitHub release diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml index a01c2d8c..7d79419e 100644 --- a/.github/workflows/pypi-publish.yml +++ b/.github/workflows/pypi-publish.yml @@ -29,7 +29,7 @@ jobs: run: | python -m pip install --upgrade pip setuptools pip install --progress-bar off wheel twine - - run: python setup.py sdist bdist_wheel + - run: python -m buil - name: Publish distribution to PyPI uses: pypa/gh-action-pypi-publish@release/v1 diff --git a/Dockerfile b/Dockerfile index a3a1d6f6..2f54020f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,6 @@ RUN pip install --upgrade pip setuptools RUN pip install --progress-bar off PyMySQL[rsa] psycopg2-binary gunicorn optuna-fast-fanova ADD ./pyproject.toml /usr/src/pyproject.toml -ADD ./setup.py /usr/src/setup.py ADD ./optuna_dashboard /usr/src/optuna_dashboard COPY --from=front-builder /usr/src/optuna_dashboard/public/ /usr/src/optuna_dashboard/public/ RUN pip install --progress-bar off . diff --git a/Makefile b/Makefile index 4094fd57..917e4aac 100644 --- a/Makefile +++ b/Makefile @@ -32,11 +32,11 @@ vscode-extension: vscode/assets/bundle.js .PHONY: sdist sdist: pyproject.toml $(DASHBOARD_TS_OUT) - python setup.py sdist + python -m build .PHONY: wheel wheel: pyproject.toml $(DASHBOARD_TS_OUT) - python setup.py bdist_wheel + python -m build .PHONY: docs docs: docs/conf.py $(RST_FILES) diff --git a/docs/getting-started.rst b/docs/getting-started.rst index 3375c469..f0b8ac89 100644 --- a/docs/getting-started.rst +++ b/docs/getting-started.rst @@ -48,7 +48,7 @@ Please clone the git repository and execute following commands to build sdist pa # Node.js v16 is required to compile TypeScript files. $ npm install $ npm run build:prd - $ python setup.py sdist + $ python -m build Then you can install it like: From 54d8b1f1e9363957656f9d6834a3217bdc92f58d Mon Sep 17 00:00:00 2001 From: keisuke-umezawa Date: Tue, 5 Mar 2024 14:58:09 +0900 Subject: [PATCH 3/4] Add --sdist --wheel --- .github/workflows/github-release.yml | 2 +- .github/workflows/pypi-publish.yml | 2 +- Makefile | 4 ++-- docs/getting-started.rst | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml index 13fc17b6..469c2e58 100644 --- a/.github/workflows/github-release.yml +++ b/.github/workflows/github-release.yml @@ -27,7 +27,7 @@ jobs: run: | python -m pip install --upgrade pip setuptools pip install --progress-bar off wheel twine - - run: python -m build + - run: python -m build --sdist --wheel - run: twine check dist/* - name: Create GitHub release diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml index 7d79419e..d9a810af 100644 --- a/.github/workflows/pypi-publish.yml +++ b/.github/workflows/pypi-publish.yml @@ -29,7 +29,7 @@ jobs: run: | python -m pip install --upgrade pip setuptools pip install --progress-bar off wheel twine - - run: python -m buil + - run: python -m build --sdist --wheel - name: Publish distribution to PyPI uses: pypa/gh-action-pypi-publish@release/v1 diff --git a/Makefile b/Makefile index 917e4aac..184b59df 100644 --- a/Makefile +++ b/Makefile @@ -32,11 +32,11 @@ vscode-extension: vscode/assets/bundle.js .PHONY: sdist sdist: pyproject.toml $(DASHBOARD_TS_OUT) - python -m build + python -m build --sdist .PHONY: wheel wheel: pyproject.toml $(DASHBOARD_TS_OUT) - python -m build + python -m build --wheel .PHONY: docs docs: docs/conf.py $(RST_FILES) diff --git a/docs/getting-started.rst b/docs/getting-started.rst index f0b8ac89..5d84e8aa 100644 --- a/docs/getting-started.rst +++ b/docs/getting-started.rst @@ -48,7 +48,7 @@ Please clone the git repository and execute following commands to build sdist pa # Node.js v16 is required to compile TypeScript files. $ npm install $ npm run build:prd - $ python -m build + $ python -m build --sdist Then you can install it like: From e5ca8ea0d382b72b8fe9550b520d5dc0ed88ed20 Mon Sep 17 00:00:00 2001 From: keisuke-umezawa Date: Tue, 5 Mar 2024 14:59:26 +0900 Subject: [PATCH 4/4] Install build --- .github/workflows/github-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml index 469c2e58..84d0b83f 100644 --- a/.github/workflows/github-release.yml +++ b/.github/workflows/github-release.yml @@ -26,7 +26,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip setuptools - pip install --progress-bar off wheel twine + pip install --progress-bar off wheel twine build - run: python -m build --sdist --wheel - run: twine check dist/*