Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix publishing #2437

Merged
merged 5 commits into from
Oct 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/wheel-universal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:

# https://github.com/pypa/gh-action-pypi-publish#trusted-publishing
- name: Publish package distributions to PyPI
uses: pypa/gh-action-pypi-publish@v1.9.0
uses: pypa/gh-action-pypi-publish@v1.10.2
if: startsWith(github.ref, 'refs/tags')
with:
skip-existing: true
36 changes: 20 additions & 16 deletions .github/workflows/wheel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ on:
- master
schedule:
- cron: "0 2 * * 1-5"
release:
types: [released, prereleased]
workflow_dispatch: # allows running workflow manually from the Actions tab

concurrency:
Expand Down Expand Up @@ -45,6 +43,7 @@ jobs:
pp*
cp38-win*
cp38-musllinux_aarch64
# the supported python versions are parsed from vaex-core setup.py python_requires
run: |
MATRIX_INCLUDE=$(
{
Expand All @@ -68,10 +67,6 @@ jobs:
matrix:
include: ${{ fromJson(needs.build_wheels_matrix.outputs.include) }}

permissions:
contents: write # softprops/action-gh-release
id-token: write # pypa/gh-action-pypi-publish

steps:
- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -115,21 +110,30 @@ jobs:
CIBW_ENVIRONMENT_LINUX: 'CFLAGS="-Wl,-strip-all" CXXFLAGS="-Wl,-strip-all" PATH="$HOME/.cargo/bin:$PATH"'
CIBW_ENVIRONMENT_MACOS: 'CFLAGS="-I/usr/local/include -L/usr/local/lib" CXXFLAGS="-I/usr/local/include -L/usr/local/lib" LDFLAGS="-L/usr/local/lib"'

- name: Upload release assets
if: github.event_name == 'release'
uses: softprops/[email protected]
with:
files: packages/vaex-core/dist/*

- uses: actions/upload-artifact@v4
with:
name: distribution-${{ matrix.only }}
name: dist-${{ matrix.only }}
path: packages/vaex-core/dist

publish:
if: startsWith(github.ref, 'refs/tags')
needs: [build_wheels]
runs-on: ubuntu-22.04

permissions:
id-token: write # pypa/gh-action-pypi-publish

steps:
- uses: actions/download-artifact@v4
with:
path: dist/
pattern: dist-*
merge-multiple: true

- run: ls -ltra dist/

# https://github.com/pypa/gh-action-pypi-publish#trusted-publishing
- name: Publish package distributions to PyPI
uses: pypa/[email protected]
if: startsWith(github.ref, 'refs/tags')
uses: pypa/[email protected]
with:
skip-existing: true
packages-dir: packages/vaex-core/dist
2 changes: 2 additions & 0 deletions packages/vaex-arrow/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
setup(name=name + '-arrow',
version=version,
description='Arrow support for vaex',
long_description='Arrow support for vaex',
long_description_content_type="text/markdown",
url=url,
author=author,
author_email=author_email,
Expand Down
2 changes: 2 additions & 0 deletions packages/vaex-astro/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
name=name + '-astro',
version=version,
description='Astronomy related transformations and FITS file support',
long_description="Astronomy related transformations and FITS file support",
long_description_content_type="text/markdown",
url=url,
author=author,
author_email=author_email,
Expand Down
2 changes: 2 additions & 0 deletions packages/vaex-contrib/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
setup(name=name + '-contrib',
version=version,
description='Community contributed modules to vaex',
long_description="Community contributed modules to vaex",
long_description_content_type="text/markdown",
url=url,
install_requires=install_requires_contrib,
extras_require={
Expand Down
2 changes: 2 additions & 0 deletions packages/vaex-core/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,8 @@ def __str__(self):
name=name + "-core",
version=version,
description="Core of vaex",
long_description="Core of vaex",
long_description_content_type="text/markdown",
url=url,
author=author,
author_email=author_email,
Expand Down
2 changes: 2 additions & 0 deletions packages/vaex-graphql/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
name=name + '-graphql',
version=version,
description='GraphQL support for accessing vaex DataFrame',
long_description="GraphQL support for accessing vaex DataFrame",
long_description_content_type="text/markdown",
url=url,
author=author,
author_email=author_email,
Expand Down
2 changes: 2 additions & 0 deletions packages/vaex-hdf5/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
setup(name=name + '-hdf5',
version=version,
description='hdf5 file support for vaex',
long_description="hdf5 file support for vaex",
long_description_content_type="text/markdown",
url=url,
author=author,
author_email=author_email,
Expand Down
2 changes: 2 additions & 0 deletions packages/vaex-jupyter/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
setup(name=name + '-jupyter',
version=version,
description='Jupyter notebook and Jupyter lab support for vaex',
long_description="Jupyter notebook and Jupyter lab support for vaex",
long_description_content_type="text/markdown",
url=url,
author=author,
author_email=author_email,
Expand Down
2 changes: 2 additions & 0 deletions packages/vaex-ml/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
setup(name=name + '-ml',
version=version,
description='Machine learning support for vaex',
long_description="Machine learning support for vaex",
long_description_content_type="text/markdown",
url=url,
author=author,
author_email=author_email,
Expand Down
2 changes: 2 additions & 0 deletions packages/vaex-server/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
setup(name=name + '-server',
version=version,
description='Webserver and client for vaex for a remote dataset',
long_description="Webserver and client for vaex for a remote dataset",
long_description_content_type="text/markdown",
url=url,
author=author,
author_email=author_email,
Expand Down
2 changes: 2 additions & 0 deletions packages/vaex-ui/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
setup(name=name + '-ui',
version=version,
description='Graphical user interface for vaex based on Qt',
long_description="Graphical user interface for vaex based on Qt",
long_description_content_type="text/markdown",
url=url,
author=author,
author_email=author_email,
Expand Down
2 changes: 2 additions & 0 deletions packages/vaex-viz/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
setup(name=name + '-viz',
version=version,
description='Visualization for vaex',
long_description="Visualization for vaex",
long_description_content_type="text/markdown",
url=url,
author=author,
author_email=author_email,
Expand Down
Loading