From a22ba5fee57d581dfb780e8d8648385693231479 Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Wed, 26 Apr 2023 15:52:00 -0700 Subject: [PATCH 01/32] Update build + release. --- .github/workflows/{ci.yml => ci.yaml} | 0 .github/workflows/{lint.yml => lint.yaml} | 0 .github/workflows/release.yaml | 37 +++++++++++++++++++++++ 3 files changed, 37 insertions(+) rename .github/workflows/{ci.yml => ci.yaml} (100%) rename .github/workflows/{lint.yml => lint.yaml} (100%) create mode 100644 .github/workflows/release.yaml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yaml similarity index 100% rename from .github/workflows/ci.yml rename to .github/workflows/ci.yaml diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yaml similarity index 100% rename from .github/workflows/lint.yml rename to .github/workflows/lint.yaml diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml new file mode 100644 index 00000000..35f789f3 --- /dev/null +++ b/.github/workflows/release.yaml @@ -0,0 +1,37 @@ +name: "[av2] Release" + +on: [push, pull_request] + +jobs: + test_and_build: + name: ${{ matrix.os }}_py${{ matrix.python_version }} + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [macos-latest, ubuntu-latest] + python_version: + ["3.8", "3.9", "3.10"] + defaults: + run: + shell: bash -l {0} + + steps: + - name: Reclaim space. + run: | + rm -rf /usr/share/dotnet + rm -rf /opt/ghc + rm -rf "/usr/local/share/boost" + rm -rf "$AGENT_TOOLSDIRECTORY" + - uses: actions/checkout@v2 + - uses: conda-incubator/setup-miniconda@v2 + with: + activate-environment: av2 + environment-file: conda/environment.yml + mamba-version: "*" + miniforge-version: latest + python-version: ${{ matrix.python_version }} + + - name: Build `av2`. + run: | + python3 -m pip install --upgrade build + python3 -m build From e9394ef481a3cd5e530d2b629c17aea7b35dffab Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Wed, 26 Apr 2023 15:56:34 -0700 Subject: [PATCH 02/32] Modify release script. --- .github/workflows/release.yaml | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 35f789f3..e3ae8604 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -22,16 +22,20 @@ jobs: rm -rf /opt/ghc rm -rf "/usr/local/share/boost" rm -rf "$AGENT_TOOLSDIRECTORY" - - uses: actions/checkout@v2 - - uses: conda-incubator/setup-miniconda@v2 - with: - activate-environment: av2 - environment-file: conda/environment.yml - mamba-version: "*" - miniforge-version: latest - python-version: ${{ matrix.python_version }} + - uses: actions/checkout@v3 - - name: Build `av2`. - run: | - python3 -m pip install --upgrade build - python3 -m build + # Used to host cibuildwheel + - uses: actions/setup-python@v3 + + - name: Install cibuildwheel + run: python -m pip install cibuildwheel==2.12.3 + + - name: Build wheels + run: python -m cibuildwheel --output-dir wheelhouse + # to supply options, put them in 'env', like: + # env: + # CIBW_SOME_OPTION: value + + - uses: actions/upload-artifact@v3 + with: + path: ./wheelhouse/*.whl \ No newline at end of file From 61b56ba6323ee8eef63ac6892b629401c555f078 Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Wed, 26 Apr 2023 19:42:02 -0700 Subject: [PATCH 03/32] Add maturin action. --- .github/workflows/release.yaml | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index e3ae8604..ad58deab 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -23,19 +23,7 @@ jobs: rm -rf "/usr/local/share/boost" rm -rf "$AGENT_TOOLSDIRECTORY" - uses: actions/checkout@v3 - - # Used to host cibuildwheel - - uses: actions/setup-python@v3 - - - name: Install cibuildwheel - run: python -m pip install cibuildwheel==2.12.3 - - - name: Build wheels - run: python -m cibuildwheel --output-dir wheelhouse - # to supply options, put them in 'env', like: - # env: - # CIBW_SOME_OPTION: value - - - uses: actions/upload-artifact@v3 + - uses: PyO3/maturin-action@v1 with: - path: ./wheelhouse/*.whl \ No newline at end of file + command: build + args: --release \ No newline at end of file From 64248c4cbeb5ae07d9b68eea8251bfa48815ca21 Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Wed, 26 Apr 2023 19:52:13 -0700 Subject: [PATCH 04/32] Update ci. --- .github/workflows/release.yaml | 141 ++++++++++++++++++++++++++++++--- 1 file changed, 128 insertions(+), 13 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index ad58deab..25164c80 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -1,20 +1,106 @@ name: "[av2] Release" -on: [push, pull_request] +on: + push: + branches: + - main + - master + tags: + - '*' + pull_request: + workflow_dispatch: + +permissions: + contents: read jobs: - test_and_build: - name: ${{ matrix.os }}_py${{ matrix.python_version }} - runs-on: ${{ matrix.os }} + linux: + runs-on: ubuntu-latest + strategy: + matrix: + target: [x86_64, x86, aarch64, armv7, s390x, ppc64le] + - name: Reclaim space. + run: | + rm -rf /usr/share/dotnet + rm -rf /opt/ghc + rm -rf "/usr/local/share/boost" + rm -rf "$AGENT_TOOLSDIRECTORY" + - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 + with: + python-version: '3.10' + - name: Build wheels + uses: PyO3/maturin-action@v1 + with: + target: ${{ matrix.target }} + args: --release --out dist --find-interpreter + sccache: 'true' + manylinux: auto + - name: Upload wheels + uses: actions/upload-artifact@v3 + with: + name: wheels + path: dist + + windows: + runs-on: windows-latest + strategy: + matrix: + target: [x64, x86] + steps: + - name: Reclaim space. + run: | + rm -rf /usr/share/dotnet + rm -rf /opt/ghc + rm -rf "/usr/local/share/boost" + rm -rf "$AGENT_TOOLSDIRECTORY" + - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 + with: + python-version: '3.10' + architecture: ${{ matrix.target }} + - name: Build wheels + uses: PyO3/maturin-action@v1 + with: + target: ${{ matrix.target }} + args: --release --out dist --find-interpreter + sccache: 'true' + - name: Upload wheels + uses: actions/upload-artifact@v3 + with: + name: wheels + path: dist + + macos: + runs-on: macos-latest strategy: matrix: - os: [macos-latest, ubuntu-latest] - python_version: - ["3.8", "3.9", "3.10"] - defaults: - run: - shell: bash -l {0} + target: [x86_64, aarch64] + steps: + - name: Reclaim space. + run: | + rm -rf /usr/share/dotnet + rm -rf /opt/ghc + rm -rf "/usr/local/share/boost" + rm -rf "$AGENT_TOOLSDIRECTORY" + - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 + with: + python-version: '3.10' + - name: Build wheels + uses: PyO3/maturin-action@v1 + with: + target: ${{ matrix.target }} + args: --release --out dist --find-interpreter + sccache: 'true' + - name: Upload wheels + uses: actions/upload-artifact@v3 + with: + name: wheels + path: dist + sdist: + runs-on: ubuntu-latest steps: - name: Reclaim space. run: | @@ -23,7 +109,36 @@ jobs: rm -rf "/usr/local/share/boost" rm -rf "$AGENT_TOOLSDIRECTORY" - uses: actions/checkout@v3 - - uses: PyO3/maturin-action@v1 + - name: Build sdist + uses: PyO3/maturin-action@v1 + with: + command: sdist + args: --out dist + - name: Upload sdist + uses: actions/upload-artifact@v3 + with: + name: wheels + path: dist + + release: + name: Release + runs-on: ubuntu-latest + if: "startsWith(github.ref, 'refs/tags/')" + needs: [linux, windows, macos, sdist] + - name: Reclaim space. + run: | + rm -rf /usr/share/dotnet + rm -rf /opt/ghc + rm -rf "/usr/local/share/boost" + rm -rf "$AGENT_TOOLSDIRECTORY" + steps: + - uses: actions/download-artifact@v3 + with: + name: wheels + - name: Publish to PyPI + uses: PyO3/maturin-action@v1 + env: + MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }} with: - command: build - args: --release \ No newline at end of file + command: upload + args: --skip-existing * From 9d454e3388cf076186c449ebbe349e4b5134b87e Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Wed, 26 Apr 2023 20:11:13 -0700 Subject: [PATCH 05/32] Test automated build. --- .github/workflows/release.yaml | 63 +++++++++++++++++----------------- 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 25164c80..04070775 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -1,14 +1,15 @@ name: "[av2] Release" -on: - push: - branches: - - main - - master - tags: - - '*' - pull_request: - workflow_dispatch: +# on: +# push: +# branches: +# - main +# tags: +# - '*' +# pull_request: +# workflow_dispatch: + +on: [push, pull_request] permissions: contents: read @@ -120,25 +121,25 @@ jobs: name: wheels path: dist - release: - name: Release - runs-on: ubuntu-latest - if: "startsWith(github.ref, 'refs/tags/')" - needs: [linux, windows, macos, sdist] - - name: Reclaim space. - run: | - rm -rf /usr/share/dotnet - rm -rf /opt/ghc - rm -rf "/usr/local/share/boost" - rm -rf "$AGENT_TOOLSDIRECTORY" - steps: - - uses: actions/download-artifact@v3 - with: - name: wheels - - name: Publish to PyPI - uses: PyO3/maturin-action@v1 - env: - MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }} - with: - command: upload - args: --skip-existing * + # release: + # name: Release + # runs-on: ubuntu-latest + # if: "startsWith(github.ref, 'refs/tags/')" + # needs: [linux, windows, macos, sdist] + # - name: Reclaim space. + # run: | + # rm -rf /usr/share/dotnet + # rm -rf /opt/ghc + # rm -rf "/usr/local/share/boost" + # rm -rf "$AGENT_TOOLSDIRECTORY" + # steps: + # - uses: actions/download-artifact@v3 + # with: + # name: wheels + # - name: Publish to PyPI + # uses: PyO3/maturin-action@v1 + # env: + # MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }} + # with: + # command: upload + # args: --skip-existing * From fcbe3b9f50008675497ddb529e97b30a0f7f5a7b Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Thu, 27 Apr 2023 11:34:42 -0700 Subject: [PATCH 06/32] Add test upload. --- .github/workflows/release.yaml | 37 ++++++++++++++-------------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 04070775..b0ff4517 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -121,25 +121,18 @@ jobs: name: wheels path: dist - # release: - # name: Release - # runs-on: ubuntu-latest - # if: "startsWith(github.ref, 'refs/tags/')" - # needs: [linux, windows, macos, sdist] - # - name: Reclaim space. - # run: | - # rm -rf /usr/share/dotnet - # rm -rf /opt/ghc - # rm -rf "/usr/local/share/boost" - # rm -rf "$AGENT_TOOLSDIRECTORY" - # steps: - # - uses: actions/download-artifact@v3 - # with: - # name: wheels - # - name: Publish to PyPI - # uses: PyO3/maturin-action@v1 - # env: - # MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }} - # with: - # command: upload - # args: --skip-existing * + release: + name: Test release. + runs-on: ubuntu-latest + needs: [linux, windows, macos, sdist] + steps: + - uses: actions/download-artifact@v3 + with: + name: wheels + - name: Publish to PyPI + uses: PyO3/maturin-action@v1 + env: + MATURIN_PYPI_TOKEN: ${{ secrets.TEST_PYPI_API_TOKEN }} + with: + command: upload + args: --repository testpypi --skip-existing * From e2015b2e81d62edd5f10ed8e6b7c8c5a4b0f5611 Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Thu, 27 Apr 2023 14:13:21 -0700 Subject: [PATCH 07/32] Update release workflow. --- .github/workflows/release.yaml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index b0ff4517..c38fda52 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -1,14 +1,5 @@ name: "[av2] Release" -# on: -# push: -# branches: -# - main -# tags: -# - '*' -# pull_request: -# workflow_dispatch: - on: [push, pull_request] permissions: From c8e454304dbfa709102dedc77025438f8b9642c1 Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Thu, 27 Apr 2023 14:14:53 -0700 Subject: [PATCH 08/32] Update release workflow. --- .github/workflows/ci.yaml | 4 ++++ .github/workflows/release.yaml | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f74b6574..f50b10a5 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -2,6 +2,10 @@ name: CI on: [push, pull_request] +concurrency: + group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number || github.sha }} + cancel-in-progress: true + jobs: test_and_build: name: ${{ matrix.os }}_py${{ matrix.python_version }} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index c38fda52..985345a5 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -2,8 +2,9 @@ name: "[av2] Release" on: [push, pull_request] -permissions: - contents: read +concurrency: + group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number || github.sha }} + cancel-in-progress: true jobs: linux: From 7751d39e6c90f55783f5c844f1990165a3c3dcd4 Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Thu, 27 Apr 2023 14:22:39 -0700 Subject: [PATCH 09/32] Update release workflow. --- .github/workflows/release.yaml | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 985345a5..1d18bc12 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -12,6 +12,7 @@ jobs: strategy: matrix: target: [x86_64, x86, aarch64, armv7, s390x, ppc64le] + steps: - name: Reclaim space. run: | rm -rf /usr/share/dotnet @@ -21,13 +22,13 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: - python-version: '3.10' + python-version: "3.10" - name: Build wheels uses: PyO3/maturin-action@v1 with: target: ${{ matrix.target }} args: --release --out dist --find-interpreter - sccache: 'true' + sccache: "true" manylinux: auto - name: Upload wheels uses: actions/upload-artifact@v3 @@ -50,14 +51,14 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: - python-version: '3.10' + python-version: "3.10" architecture: ${{ matrix.target }} - name: Build wheels uses: PyO3/maturin-action@v1 with: target: ${{ matrix.target }} args: --release --out dist --find-interpreter - sccache: 'true' + sccache: "true" - name: Upload wheels uses: actions/upload-artifact@v3 with: @@ -79,13 +80,13 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: - python-version: '3.10' + python-version: "3.10" - name: Build wheels uses: PyO3/maturin-action@v1 with: target: ${{ matrix.target }} args: --release --out dist --find-interpreter - sccache: 'true' + sccache: "true" - name: Upload wheels uses: actions/upload-artifact@v3 with: @@ -115,16 +116,16 @@ jobs: release: name: Test release. - runs-on: ubuntu-latest needs: [linux, windows, macos, sdist] + runs-on: ubuntu-latest steps: - uses: actions/download-artifact@v3 with: name: wheels - - name: Publish to PyPI - uses: PyO3/maturin-action@v1 - env: + - env: MATURIN_PYPI_TOKEN: ${{ secrets.TEST_PYPI_API_TOKEN }} + name: Publish to PyPI + uses: PyO3/maturin-action@v1 with: + args: "--repository testpypi --skip-existing *" command: upload - args: --repository testpypi --skip-existing * From 91a7365b30ff90248a47591bea84b617137a5203 Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Thu, 27 Apr 2023 14:23:42 -0700 Subject: [PATCH 10/32] Remove space reclaim. --- .github/workflows/release.yaml | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 1d18bc12..03e41bd6 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -13,12 +13,6 @@ jobs: matrix: target: [x86_64, x86, aarch64, armv7, s390x, ppc64le] steps: - - name: Reclaim space. - run: | - rm -rf /usr/share/dotnet - rm -rf /opt/ghc - rm -rf "/usr/local/share/boost" - rm -rf "$AGENT_TOOLSDIRECTORY" - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: @@ -42,12 +36,6 @@ jobs: matrix: target: [x64, x86] steps: - - name: Reclaim space. - run: | - rm -rf /usr/share/dotnet - rm -rf /opt/ghc - rm -rf "/usr/local/share/boost" - rm -rf "$AGENT_TOOLSDIRECTORY" - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: @@ -71,12 +59,6 @@ jobs: matrix: target: [x86_64, aarch64] steps: - - name: Reclaim space. - run: | - rm -rf /usr/share/dotnet - rm -rf /opt/ghc - rm -rf "/usr/local/share/boost" - rm -rf "$AGENT_TOOLSDIRECTORY" - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: @@ -96,12 +78,6 @@ jobs: sdist: runs-on: ubuntu-latest steps: - - name: Reclaim space. - run: | - rm -rf /usr/share/dotnet - rm -rf /opt/ghc - rm -rf "/usr/local/share/boost" - rm -rf "$AGENT_TOOLSDIRECTORY" - uses: actions/checkout@v3 - name: Build sdist uses: PyO3/maturin-action@v1 From 09075f3eb7693f6b0bd210405ef27fc722214609 Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Thu, 27 Apr 2023 14:32:08 -0700 Subject: [PATCH 11/32] Remove ppc64le build. --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 03e41bd6..a5879a31 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - target: [x86_64, x86, aarch64, armv7, s390x, ppc64le] + target: [x86_64, x86, aarch64, armv7, s390x] steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 From de822107368910c4e423a8cd3e9e58dad1a5fecb Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Thu, 27 Apr 2023 14:40:06 -0700 Subject: [PATCH 12/32] Use nightly toolchain. --- .github/workflows/release.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index a5879a31..76c886ef 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -24,6 +24,7 @@ jobs: args: --release --out dist --find-interpreter sccache: "true" manylinux: auto + rust-toolchain: nightly - name: Upload wheels uses: actions/upload-artifact@v3 with: @@ -47,6 +48,7 @@ jobs: target: ${{ matrix.target }} args: --release --out dist --find-interpreter sccache: "true" + rust-toolchain: nightly - name: Upload wheels uses: actions/upload-artifact@v3 with: @@ -69,6 +71,7 @@ jobs: target: ${{ matrix.target }} args: --release --out dist --find-interpreter sccache: "true" + rust-toolchain: nightly - name: Upload wheels uses: actions/upload-artifact@v3 with: From f0760dc595d09ffa0be68144c7803b5075509be0 Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Thu, 27 Apr 2023 14:46:41 -0700 Subject: [PATCH 13/32] Limit archs. --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 76c886ef..57b09b23 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - target: [x86_64, x86, aarch64, armv7, s390x] + target: [x86_64, x86, aarch64] steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 From 2ca7e74a943f7d635cbfb44702f33a3ae019212f Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Thu, 27 Apr 2023 16:24:19 -0700 Subject: [PATCH 14/32] Update release. --- .github/workflows/release.yaml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 57b09b23..1ca0ce9f 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -98,13 +98,8 @@ jobs: needs: [linux, windows, macos, sdist] runs-on: ubuntu-latest steps: - - uses: actions/download-artifact@v3 + - name: Publish distribution 📦 to Test PyPI + uses: pypa/gh-action-pypi-publish@release/v1 with: - name: wheels - - env: - MATURIN_PYPI_TOKEN: ${{ secrets.TEST_PYPI_API_TOKEN }} - name: Publish to PyPI - uses: PyO3/maturin-action@v1 - with: - args: "--repository testpypi --skip-existing *" - command: upload + password: ${{ secrets.TEST_PYPI_API_TOKEN }} + repository-url: https://test.pypi.org/legacy/ From 5f62a82bb5544164eeeb87808a043313d1d8d4f5 Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Thu, 27 Apr 2023 16:50:47 -0700 Subject: [PATCH 15/32] Add artifacts. --- .github/workflows/release.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 1ca0ce9f..2c95c29c 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -98,6 +98,9 @@ jobs: needs: [linux, windows, macos, sdist] runs-on: ubuntu-latest steps: + - uses: actions/download-artifact@v3 + with: + name: dist - name: Publish distribution 📦 to Test PyPI uses: pypa/gh-action-pypi-publish@release/v1 with: From 8305746a67fa83fc597439074cdd5217d960ac84 Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Thu, 27 Apr 2023 18:46:18 -0700 Subject: [PATCH 16/32] Update artifact name. --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 2c95c29c..42ba4255 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -100,7 +100,7 @@ jobs: steps: - uses: actions/download-artifact@v3 with: - name: dist + name: wheels - name: Publish distribution 📦 to Test PyPI uses: pypa/gh-action-pypi-publish@release/v1 with: From 65c454c24fe7654527d4bfc4278f5c831d3b4597 Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Thu, 27 Apr 2023 19:31:03 -0700 Subject: [PATCH 17/32] Update download artifact. --- .github/workflows/release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 42ba4255..e7e5087f 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -101,6 +101,7 @@ jobs: - uses: actions/download-artifact@v3 with: name: wheels + path: dist - name: Publish distribution 📦 to Test PyPI uses: pypa/gh-action-pypi-publish@release/v1 with: From 7a1d43082a5d286899064470239b292573bbf1f0 Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Thu, 27 Apr 2023 20:49:37 -0700 Subject: [PATCH 18/32] Add https. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 6c8856d4..cdaf4390 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -53,7 +53,7 @@ test = [ ] [project.urls] -homepage = "argoverse.org" +homepage = "https://argoverse.org" repository = "https://github.com/argoverse/av2-api" [tool.maturin] From 231a03a2572668940e23afa0e19429596564f34f Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Thu, 27 Apr 2023 21:11:28 -0700 Subject: [PATCH 19/32] Update pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index cdaf4390..9bd6e463 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,7 @@ dependencies = [ "torch", "tqdm", "universal_pathlib", - "trackeval @ git+https://github.com/JonathonLuiten/TrackEval.git" + "trackeval @ git+ssh://github.com/JonathonLuiten/TrackEval.git" ] dynamic = [ From b68ba49e9ba7c5ae7e99ba070b7d42905cc73e2a Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Thu, 27 Apr 2023 22:34:26 -0700 Subject: [PATCH 20/32] Update pyproject.toml --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 9bd6e463..15210ae4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,6 @@ dependencies = [ "torch", "tqdm", "universal_pathlib", - "trackeval @ git+ssh://github.com/JonathonLuiten/TrackEval.git" ] dynamic = [ From 7ee0610b6c09766c73871ea9b541799b8f926dad Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Mon, 1 May 2023 14:54:15 -0700 Subject: [PATCH 21/32] Test new pypi build. --- src/av2/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/av2/__init__.py b/src/av2/__init__.py index c0993eaa..ddb52c38 100644 --- a/src/av2/__init__.py +++ b/src/av2/__init__.py @@ -2,4 +2,4 @@ """Argoverse 2 API.""" -__version__ = "0.3.0" +__version__ = "0.3.1" From 0459aa41699b1eb44e61bbeebebf3ad99b57c3d1 Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Mon, 1 May 2023 15:39:41 -0700 Subject: [PATCH 22/32] Test version bump. --- Cargo.lock | 2 +- rust/Cargo.toml | 2 +- src/av2/__init__.py | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index de7b6cc4..b868b25f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -192,7 +192,7 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "av2" -version = "0.3.0" +version = "0.3.1" dependencies = [ "anyhow", "argminmax", diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 0ad26a41..9407699b 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "av2" -version = "0.3.0" +version = "0.3.1" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/src/av2/__init__.py b/src/av2/__init__.py index ddb52c38..78b13f17 100644 --- a/src/av2/__init__.py +++ b/src/av2/__init__.py @@ -1,5 +1,3 @@ # """Argoverse 2 API.""" - -__version__ = "0.3.1" From 862f411faf80a74a8611d86380e8e2ace50f26f1 Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Tue, 2 May 2023 09:56:34 -0700 Subject: [PATCH 23/32] Add project metadata. --- Cargo.lock | 2 +- pyproject.toml | 25 ++++++++++++++++++++++--- rust/Cargo.toml | 2 +- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b868b25f..d8b1fd77 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -192,7 +192,7 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "av2" -version = "0.3.1" +version = "0.3.122" dependencies = [ "anyhow", "argminmax", diff --git a/pyproject.toml b/pyproject.toml index e815ceb6..a7d3ccc5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,10 +4,31 @@ build-backend = "maturin" [project] name = "av2" +description = "Argoverse 2: Next generation datasets for self-driving perception and forecasting." requires-python = ">=3.8" +license = { file = "LICENSE" } +keywords = [ + "argoverse", + "argoverse2", + "autonomous-driving", + "av1", + "av2", + "3d-object-detection", + "3d-scene-flow", + "4d-occupancy-forecasting", + "e2e-forecasting", + "motion-forecasting", +] classifiers = [ + "License :: OSI Approved :: MIT License", + "Operating System :: OS Independent", + "Programming Language :: Python", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3 :: Only", "Programming Language :: Rust", - "Programming Language :: Python :: Implementation :: CPython", ] dependencies = [ @@ -33,8 +54,6 @@ dependencies = [ dynamic = [ "authors", - "description", - "license", "version" ] diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 9407699b..b7c6ca4c 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "av2" -version = "0.3.1" +version = "0.3.122" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html From cb784c8689adad457be8e3052048159cac6d5c46 Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Tue, 9 May 2023 13:05:15 -0700 Subject: [PATCH 24/32] Merge. --- Cargo.lock | 2 +- rust/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6732f55a..017d352a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -201,7 +201,7 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "av2" -version = "0.3.122" +version = "0.3.123" dependencies = [ "anyhow", "argminmax", diff --git a/rust/Cargo.toml b/rust/Cargo.toml index a20cab85..7aa64d70 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "av2" -version = "0.3.122" +version = "0.3.123" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html From b1ab596f3acc92edaef28ffd8f81c17af97fa856 Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Tue, 9 May 2023 13:09:27 -0700 Subject: [PATCH 25/32] Add release section. --- .github/workflows/release.yaml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index e7e5087f..97c158a0 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -93,7 +93,7 @@ jobs: name: wheels path: dist - release: + test_release: name: Test release. needs: [linux, windows, macos, sdist] runs-on: ubuntu-latest @@ -107,3 +107,20 @@ jobs: with: password: ${{ secrets.TEST_PYPI_API_TOKEN }} repository-url: https://test.pypi.org/legacy/ + + release: + name: Release + runs-on: ubuntu-latest + if: "startsWith(github.ref, 'refs/tags/')" + needs: [linux, windows, macos, sdist] + steps: + - uses: actions/download-artifact@v3 + with: + name: wheels + - name: Publish to PyPI + uses: PyO3/maturin-action@v1 + env: + MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }} + with: + command: upload + args: --skip-existing * From 3d0a95227cf5b9780af863e82e8096edb8eda3d3 Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Tue, 9 May 2023 13:10:47 -0700 Subject: [PATCH 26/32] Comment out test release. --- .github/workflows/release.yaml | 28 ++++++++++++++-------------- Cargo.lock | 2 +- rust/Cargo.toml | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 97c158a0..72aacf1e 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -93,20 +93,20 @@ jobs: name: wheels path: dist - test_release: - name: Test release. - needs: [linux, windows, macos, sdist] - runs-on: ubuntu-latest - steps: - - uses: actions/download-artifact@v3 - with: - name: wheels - path: dist - - name: Publish distribution 📦 to Test PyPI - uses: pypa/gh-action-pypi-publish@release/v1 - with: - password: ${{ secrets.TEST_PYPI_API_TOKEN }} - repository-url: https://test.pypi.org/legacy/ + # test_release: + # name: Test release. + # needs: [linux, windows, macos, sdist] + # runs-on: ubuntu-latest + # steps: + # - uses: actions/download-artifact@v3 + # with: + # name: wheels + # path: dist + # - name: Publish distribution 📦 to Test PyPI + # uses: pypa/gh-action-pypi-publish@release/v1 + # with: + # password: ${{ secrets.TEST_PYPI_API_TOKEN }} + # repository-url: https://test.pypi.org/legacy/ release: name: Release diff --git a/Cargo.lock b/Cargo.lock index 017d352a..6bccd0d2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -201,7 +201,7 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "av2" -version = "0.3.123" +version = "0.3.0" dependencies = [ "anyhow", "argminmax", diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 7aa64d70..8a22fffe 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "av2" -version = "0.3.123" +version = "0.3.0" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html From 57a256b65bfed6d0ebbc544335bd5b107764c88a Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Tue, 9 May 2023 14:49:28 -0700 Subject: [PATCH 27/32] Add 3.11. --- .github/workflows/ci.yml | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 00000000..36c49a19 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,38 @@ +name: CI + +on: [push, pull_request] + +concurrency: + group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number || github.sha }} + cancel-in-progress: true + +jobs: + test_and_build: + name: ${{ matrix.os }}_py${{ matrix.python_version }} + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [macos-latest, ubuntu-latest] + python_version: + ["3.8", "3.9", "3.10", "3.11"] + defaults: + run: + shell: bash -l {0} + + steps: + - uses: actions/checkout@v3 + - uses: conda-incubator/setup-miniconda@v2 + with: + activate-environment: av2 + environment-file: conda/environment.yml + mamba-version: "*" + miniforge-version: latest + python-version: ${{ matrix.python_version }} + + - name: Build `av2`. + run: | + maturin develop --extras test + + - name: Run `pytest`. + run: | + pytest tests --cov src/av2 From d95a3887362fe7a00a4b600613eaad68a6c80ad9 Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Tue, 9 May 2023 14:59:48 -0700 Subject: [PATCH 28/32] Update python versions. --- .github/workflows/ci.yml | 2 +- pyproject.toml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 36c49a19..37cda778 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: matrix: os: [macos-latest, ubuntu-latest] python_version: - ["3.8", "3.9", "3.10", "3.11"] + ["3.8", "3.9", "3.10"] defaults: run: shell: bash -l {0} diff --git a/pyproject.toml b/pyproject.toml index a7d3ccc5..9fe9be79 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,7 +26,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3 :: Only", "Programming Language :: Rust", ] From ef5f33b67ae08d343b7e58b06b19f73e1ed64140 Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Tue, 9 May 2023 17:57:53 -0700 Subject: [PATCH 29/32] Update release.yaml. --- .github/workflows/release.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 72aacf1e..b13afb98 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -1,6 +1,13 @@ name: "[av2] Release" -on: [push, pull_request] +on: + push: + branches: + - main + tags: + - '*' + pull_request: + workflow_dispatch: concurrency: group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number || github.sha }} From 138b2ea0ad971c20bf3f33f260ce476dc6e106ef Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Tue, 9 May 2023 20:33:51 -0700 Subject: [PATCH 30/32] Disable windows. --- .github/workflows/release.yaml | 46 +++++++++++++++++----------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index b13afb98..e64c9085 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -38,29 +38,29 @@ jobs: name: wheels path: dist - windows: - runs-on: windows-latest - strategy: - matrix: - target: [x64, x86] - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 - with: - python-version: "3.10" - architecture: ${{ matrix.target }} - - name: Build wheels - uses: PyO3/maturin-action@v1 - with: - target: ${{ matrix.target }} - args: --release --out dist --find-interpreter - sccache: "true" - rust-toolchain: nightly - - name: Upload wheels - uses: actions/upload-artifact@v3 - with: - name: wheels - path: dist + # windows: + # runs-on: windows-latest + # strategy: + # matrix: + # target: [x64, x86] + # steps: + # - uses: actions/checkout@v3 + # - uses: actions/setup-python@v4 + # with: + # python-version: "3.10" + # architecture: ${{ matrix.target }} + # - name: Build wheels + # uses: PyO3/maturin-action@v1 + # with: + # target: ${{ matrix.target }} + # args: --release --out dist --find-interpreter + # sccache: "true" + # rust-toolchain: nightly + # - name: Upload wheels + # uses: actions/upload-artifact@v3 + # with: + # name: wheels + # path: dist macos: runs-on: macos-latest From 6c4d5cba081d80129b00d9d194fc43b5b2722823 Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Tue, 9 May 2023 20:34:27 -0700 Subject: [PATCH 31/32] Change needs. --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index e64c9085..5a56acef 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -119,7 +119,7 @@ jobs: name: Release runs-on: ubuntu-latest if: "startsWith(github.ref, 'refs/tags/')" - needs: [linux, windows, macos, sdist] + needs: [linux, macos, sdist] steps: - uses: actions/download-artifact@v3 with: From d0be0721f36b74f0bc4767a0189231b9fcac4001 Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Tue, 9 May 2023 21:16:19 -0700 Subject: [PATCH 32/32] Fix ci. --- .github/workflows/ci.yaml | 2 +- .github/workflows/ci.yml | 38 -------------------------------------- 2 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 812b99ae..37cda778 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,7 +12,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [macos-latest, ubuntu-latest, windows-latest] + os: [macos-latest, ubuntu-latest] python_version: ["3.8", "3.9", "3.10"] defaults: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml deleted file mode 100644 index 37cda778..00000000 --- a/.github/workflows/ci.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: CI - -on: [push, pull_request] - -concurrency: - group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number || github.sha }} - cancel-in-progress: true - -jobs: - test_and_build: - name: ${{ matrix.os }}_py${{ matrix.python_version }} - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [macos-latest, ubuntu-latest] - python_version: - ["3.8", "3.9", "3.10"] - defaults: - run: - shell: bash -l {0} - - steps: - - uses: actions/checkout@v3 - - uses: conda-incubator/setup-miniconda@v2 - with: - activate-environment: av2 - environment-file: conda/environment.yml - mamba-version: "*" - miniforge-version: latest - python-version: ${{ matrix.python_version }} - - - name: Build `av2`. - run: | - maturin develop --extras test - - - name: Run `pytest`. - run: | - pytest tests --cov src/av2