Skip to content
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
93 changes: 93 additions & 0 deletions .github/actions/wait-for-pypi-version/action.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
name: 'Wait for PyPI version'
description: 'Wait for a specific package version to become available on PyPI or TestPyPI'
inputs:
repository:
description: 'PyPI repository type: "pypi" or "testpypi"'
required: true
package:
description: 'Package name'
required: true
version:
description: 'Package version to wait for'
required: true
max_attempts:
description: 'Maximum number of retry attempts'
required: false
default: '30'
wait_seconds:
description: 'Seconds to wait between attempts'
required: false
default: '10'

runs:
using: composite
steps:
- name: Install requests
shell: bash
run: |
python -m pip install --upgrade pip
pip install requests

- name: Wait for version to be available
shell: python
env:
REPOSITORY: ${{ inputs.repository }}
PACKAGE: ${{ inputs.package }}
VERSION: ${{ inputs.version }}
MAX_ATTEMPTS: ${{ inputs.max_attempts }}
WAIT_SECONDS: ${{ inputs.wait_seconds }}
run: |
import os
import sys
import time

import requests

repository = os.environ["REPOSITORY"].strip().lower()
package = os.environ["PACKAGE"]
version = os.environ["VERSION"]
max_attempts = int(os.environ.get("MAX_ATTEMPTS", "30"))
wait_seconds = int(os.environ.get("WAIT_SECONDS", "10"))

if repository == "testpypi":
api_url = f"https://test.pypi.org/pypi/{package}/json"
repo_name = "TestPyPI"
elif repository == "pypi":
api_url = f"https://pypi.org/pypi/{package}/json"
repo_name = "PyPI"
else:
print(
f"ERROR: repository must be 'pypi' or 'testpypi', got {repository!r}",
file=sys.stderr,
)
sys.exit(1)

for attempt in range(max_attempts):
try:
r = requests.get(api_url, timeout=10)
r.raise_for_status()
data = r.json()
versions = data.get("releases", {})
keys = list(versions.keys())
print("Available versions:", keys[-10:]) # Show last 10 versions
if version in versions:
print(f"✓ Version {version} is available on {repo_name}")
print(f"Version {version} is now available on {repo_name}")
sys.exit(0)
print(f"✗ Version {version} is NOT available on {repo_name}")
except Exception as e:
print(f"Error checking version: {e}")

current = attempt + 1
print(
f"Attempt {current}/{max_attempts}: Version {version} not yet available "
f"on {repo_name}, waiting {wait_seconds} seconds..."
)
time.sleep(wait_seconds)

print(
f"ERROR: Version {version} did not become available on {repo_name} "
f"after {max_attempts} attempts",
file=sys.stderr,
)
sys.exit(1)
57 changes: 0 additions & 57 deletions .github/workflows/deploy.yaml

This file was deleted.

229 changes: 229 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,229 @@
name: PyPi Package Deployment

on:
push:
tags:
- "*"
release:
types:
- published

concurrency:
group: "${{ github.ref }}-${{ github.head_ref }}-${{ github.workflow }}"
cancel-in-progress: false

defaults:
run:
shell: bash -l {0}

jobs:
build:
name: Build package
runs-on: ubuntu-latest
outputs:
version: ${{ steps.extract-version.outputs.version }}
steps:
- name: Checkout
uses: actions/checkout@v6
with:
fetch-depth: 0
fetch-tags: true

- name: Set up Python
uses: actions/setup-python@v6
with:
python-version: "3.14"

- name: Install build dependencies
run: |
python -m pip install --upgrade pip
pip install build twine

- name: Build package (binary wheel and source distribution package)
run: python -m build

- name: Check package
run: twine check dist/*

- name: Extract package version
id: extract-version
run: |
WHEEL_FILE=$(ls dist/*.whl)
VERSION=$(basename "$WHEEL_FILE" | sed -n 's/mdanalysisdata-\([^-]*\)-.*/\1/p')
if [ -z "$VERSION" ]; then
python -m pip install --upgrade pip
pip install "$WHEEL_FILE" --quiet
VERSION=$(python -c "import MDAnalysisData; print(MDAnalysisData.__version__)")
pip uninstall -y MDAnalysisData --quiet
fi
echo "version=$VERSION" >> "$GITHUB_OUTPUT"
echo "Extracted version: $VERSION"

- name: Upload dist files
uses: actions/upload-artifact@v7
with:
name: dist-files
path: dist/
retention-days: 1

test-pytest:
name: Run tests
runs-on: ubuntu-latest
needs: build
steps:
- name: Set up Python
uses: actions/setup-python@v6
with:
python-version: "3.14"

- name: Download dist files
uses: actions/download-artifact@v8
with:
name: dist-files
path: dist/

- name: Install package with test dependencies and tests
run: |
python -m pip install --upgrade pip
WHEEL_FILE=$(ls dist/*.whl)
pip install "${WHEEL_FILE}[test]"

- name: Test import
run: |
python -c "import MDAnalysisData; print(f'Package {MDAnalysisData.__version__} imported successfully')"

- name: Run tests (without data file downloads)
run: |
pytest --verbose -m "not online" --pyargs MDAnalysisData

deploy-testpypi:
name: Deploy to TestPyPI
runs-on: ubuntu-latest
needs: [build, test-pytest]
if: |
github.repository == 'MDAnalysis/MDAnalysisData' &&
(github.event_name == 'push' && startsWith(github.ref, 'refs/tags/'))
environment:
name: testpypi
url: https://test.pypi.org/p/MDAnalysisData
permissions:
id-token: write # IMPORTANT: mandatory for trusted publishing
steps:
- name: Download dist files
uses: actions/download-artifact@v8
with:
name: dist-files
path: dist/

- name: Publish to TestPyPI
uses: pypa/gh-action-pypi-publish@v1.13.0
with:
repository-url: https://test.pypi.org/legacy/
verbose: true # useful debugging info (eg wrong classifiers)
skip-existing: true # allows repeated testing with same tag

deploy-pypi:
name: Deploy to PyPI
runs-on: ubuntu-latest
needs: [build, test-pytest]
if: |
github.repository == 'MDAnalysis/MDAnalysisData' &&
(github.event_name == 'release' && github.event.action == 'published')
environment:
name: pypi
url: https://pypi.org/p/MDAnalysisData
permissions:
id-token: write # IMPORTANT: mandatory for trusted publishing
steps:
- name: Download dist files
uses: actions/download-artifact@v8
with:
name: dist-files
path: dist/

- name: Publish to PyPI
uses: pypa/gh-action-pypi-publish@v1.13.0

test-deployed-testpypi:
name: Test deployed package (TestPyPI)
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest]
needs: [build, deploy-testpypi]
if: |
github.repository == 'MDAnalysis/MDAnalysisData' &&
(github.event_name == 'push' && startsWith(github.ref, 'refs/tags/'))
steps:
- name: Set up Python
uses: actions/setup-python@v6
with:
python-version: "3.14"

- name: Checkout repository for actions
uses: actions/checkout@v6
with:
path: source # put code under different path and do not cd to avoid interference with pytest invocation (missing authors.py)

- name: Wait for version to be available on TestPyPI
uses: ./source/.github/actions/wait-for-pypi-version
with:
repository: testpypi
package: MDAnalysisData
version: ${{ needs.build.outputs.version }}

- name: Install from TestPyPI
run: |
python -m pip install --upgrade pip
pip install --index-url https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/ "MDAnalysisData[test]==${{ needs.build.outputs.version }}"

- name: Test import
run: |
python -c "import MDAnalysisData; print(f'Package {MDAnalysisData.__version__} imported successfully from TestPyPi')"

- name: Run tests
run: |
pytest --verbose -m "not online" --pyargs MDAnalysisData

test-deployed-pypi:
name: Test deployed package (PyPI)
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest]
needs: [build, deploy-pypi]
if: |
github.repository == 'MDAnalysis/MDAnalysisData' &&
(github.event_name == 'release' && github.event.action == 'published')
steps:
- name: Set up Python
uses: actions/setup-python@v6
with:
python-version: "3.14"

- name: Checkout repository for actions
uses: actions/checkout@v6
with:
path: source # put code under different path and do not cd to avoid interference with pytest invocation (missing authors.py)

- name: Wait for version to be available on PyPI
uses: ./source/.github/actions/wait-for-pypi-version
with:
repository: pypi
package: MDAnalysisData
version: ${{ needs.build.outputs.version }}

- name: Install from PyPI
run: |
python -m pip install --upgrade pip
pip install "MDAnalysisData[test]==${{ needs.build.outputs.version }}"

- name: Test import
run: |
python -c "import MDAnalysisData; print(f'Package {MDAnalysisData.__version__} imported successfully from PyPi')"

- name: Run tests
run: |
pytest --verbose -m "not online" --pyargs MDAnalysisData
Loading
Loading