From 604db349bae7177ebb9a6ea11d3a5ca081c1767c Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Tue, 17 Oct 2023 16:23:05 -0400 Subject: [PATCH 1/5] customized pypi index Signed-off-by: Jinzhe Zeng --- .github/workflows/build_wheel.yml | 36 +++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml index df4a109841..204b7eaf58 100644 --- a/.github/workflows/build_wheel.yml +++ b/.github/workflows/build_wheel.yml @@ -136,6 +136,42 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} + build_pypi_index: + needs: [build_wheels, build_sdist] + runs-on: ubuntu-latest + steps: + - uses: actions/download-artifact@v3 + with: + name: artifact + path: dist/packages + - uses: actions/setup-python@v4 + name: Install Python + with: + python-version: '3.11' + cache: 'pip' + - run: pip install dumb-pypi + - run: | + ls dist/packages > package_list.txt + dumb-pypi --output-dir dist --packages-url ../../packages --package-list package_list.txt + - name: Upload Pages artifact + uses: actions/upload-pages-artifact@v2 + with: + path: dist + deploy_pypi_index: + needs: build_pypi_index + permissions: + pages: write + id-token: write + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} + runs-on: ubuntu-latest + if: github.event_name == 'push' && github.ref == 'refs/heads/pypi-server' + steps: + - name: Deploy to GitHub Pages + id: deployment + uses: actions/deploy-pages@v2 + pass: name: Pass testing build wheels needs: [build_wheels, build_sdist] From 2ad0ab3a20e9983c98091995c91920613f8df9df Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Tue, 17 Oct 2023 17:17:51 -0400 Subject: [PATCH 2/5] do not cache Signed-off-by: Jinzhe Zeng --- .github/workflows/build_wheel.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml index 204b7eaf58..360ca0c5f7 100644 --- a/.github/workflows/build_wheel.yml +++ b/.github/workflows/build_wheel.yml @@ -148,7 +148,6 @@ jobs: name: Install Python with: python-version: '3.11' - cache: 'pip' - run: pip install dumb-pypi - run: | ls dist/packages > package_list.txt From 88c77d9477449a32f8b94cea83740ea6159de2f2 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Tue, 17 Oct 2023 18:47:43 -0400 Subject: [PATCH 3/5] update docs --- .github/workflows/build_wheel.yml | 4 ++-- doc/install/easy-install-dev.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml index 360ca0c5f7..0efab67e4c 100644 --- a/.github/workflows/build_wheel.yml +++ b/.github/workflows/build_wheel.yml @@ -151,7 +151,7 @@ jobs: - run: pip install dumb-pypi - run: | ls dist/packages > package_list.txt - dumb-pypi --output-dir dist --packages-url ../../packages --package-list package_list.txt + dumb-pypi --output-dir dist --packages-url ../../packages --package-list package_list.txt --title "DeePMD-kit Developed Packages" - name: Upload Pages artifact uses: actions/upload-pages-artifact@v2 with: @@ -165,7 +165,7 @@ jobs: name: github-pages url: ${{ steps.deployment.outputs.page_url }} runs-on: ubuntu-latest - if: github.event_name == 'push' && github.ref == 'refs/heads/pypi-server' + if: github.event_name == 'push' && github.ref == 'refs/heads/pypi-server' && github.repository_owner == 'njzjz' steps: - name: Deploy to GitHub Pages id: deployment diff --git a/doc/install/easy-install-dev.md b/doc/install/easy-install-dev.md index 855c2f1839..7abd5724d8 100644 --- a/doc/install/easy-install-dev.md +++ b/doc/install/easy-install-dev.md @@ -17,7 +17,7 @@ docker pull ghcr.io/deepmodeling/deepmd-kit:devel Below is an one-line shell command to download the [artifact](https://nightly.link/deepmodeling/deepmd-kit/workflows/build_wheel/devel/artifact.zip) containing wheels and install it with `pip`: ```sh -bash -c 'wget -O /tmp/z.$$ https://nightly.link/deepmodeling/deepmd-kit/workflows/build_wheel/devel/artifact.zip && unzip /tmp/z.$$ -d /tmp/dist.$$ && pip install -U --pre deepmd-kit[gpu,cu11,lmp] --find-links /tmp/dist.$$ && rm -r /tmp/z.$$ /tmp/dist.$$' +pip install --pre deepmd-kit[gpu,cu11,lmp] --extra-index-url https://deepmodeling.github.io/deepmd-kit/simple ``` `cu11` and `lmp` are optional, which is the same as the stable version. From f0cedf7343e21f530843cc91625e36ea290ec7d9 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Tue, 17 Oct 2023 19:01:06 -0400 Subject: [PATCH 4/5] -U Signed-off-by: Jinzhe Zeng --- doc/install/easy-install-dev.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/install/easy-install-dev.md b/doc/install/easy-install-dev.md index 7abd5724d8..dd943c37af 100644 --- a/doc/install/easy-install-dev.md +++ b/doc/install/easy-install-dev.md @@ -17,7 +17,7 @@ docker pull ghcr.io/deepmodeling/deepmd-kit:devel Below is an one-line shell command to download the [artifact](https://nightly.link/deepmodeling/deepmd-kit/workflows/build_wheel/devel/artifact.zip) containing wheels and install it with `pip`: ```sh -pip install --pre deepmd-kit[gpu,cu11,lmp] --extra-index-url https://deepmodeling.github.io/deepmd-kit/simple +pip install -U --pre deepmd-kit[gpu,cu11,lmp] --extra-index-url https://deepmodeling.github.io/deepmd-kit/simple ``` `cu11` and `lmp` are optional, which is the same as the stable version. From 58f552f1ae6c4f078755698fe1544a612351ca23 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Tue, 17 Oct 2023 19:01:38 -0400 Subject: [PATCH 5/5] submit to deepmodeling Signed-off-by: Jinzhe Zeng --- .github/workflows/build_wheel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml index 0efab67e4c..84c8ac4b74 100644 --- a/.github/workflows/build_wheel.yml +++ b/.github/workflows/build_wheel.yml @@ -165,7 +165,7 @@ jobs: name: github-pages url: ${{ steps.deployment.outputs.page_url }} runs-on: ubuntu-latest - if: github.event_name == 'push' && github.ref == 'refs/heads/pypi-server' && github.repository_owner == 'njzjz' + if: github.event_name == 'push' && github.ref == 'refs/heads/devel' && github.repository_owner == 'deepmodeling' steps: - name: Deploy to GitHub Pages id: deployment