diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4987515d87..76557cbc23 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -346,64 +346,6 @@ jobs:
file: /tmp/data/pytest_cov.xml
flags: pytest
- test_deploy_pypi:
- <<: *python_defaults
- steps:
- - checkout
- - run:
- name: Update build tools
- command: pip install --upgrade build twine hatch
- - run:
- name: Build sMRIPrep
- command: python -m build
- - run:
- name: Twine check smriprep
- command: twine check dist/*
- - run:
- name: Pre-run hatch version
- command: hatch version
- - store_artifacts:
- path: /tmp/src/smriprep/dist
- - run:
- name: Check sdist distribution
- command: |
- THISVERSION=$( hatch version )
- THISVERSION=${CIRCLE_TAG:-$THISVERSION}
- virtualenv --python=python sdist
- source sdist/bin/activate
- python -m pip install --upgrade pip
- python -m pip install dist/smriprep*.tar.gz
- which smriprep | grep sdist\\/bin
- INSTALLED_VERSION=$(smriprep --version)
- INSTALLED_VERSION=${INSTALLED_VERSION%$'\r'}
- INSTALLED_VERSION=${INSTALLED_VERSION#*"smriprep v"}
- echo "VERSION: \"$THISVERSION\""
- echo "INSTALLED: \"$INSTALLED_VERSION\""
- test "$INSTALLED_VERSION" = "$THISVERSION"
- - run:
- name: Check wheel distribution
- command: |
- THISVERSION=$( hatch version )
- THISVERSION=${CIRCLE_TAG:-$THISVERSION}
- virtualenv --python=python wheel
- source wheel/bin/activate
- python -m pip install dist/smriprep*.whl
- which smriprep | grep wheel\\/bin
- INSTALLED_VERSION=$(smriprep --version)
- INSTALLED_VERSION=${INSTALLED_VERSION%$'\r'}
- INSTALLED_VERSION=${INSTALLED_VERSION#*"smriprep v"}
- echo "VERSION: \"$THISVERSION\""
- echo "INSTALLED: \"$INSTALLED_VERSION\""
- test "$INSTALLED_VERSION" = "$THISVERSION"
- - run:
- name: Build smriprep-docker
- command: python -m build wrapper
- - run:
- name: Twine check wrapper
- command: twine check wrapper/dist/*
- - store_artifacts:
- path: /tmp/src/smriprep/wrapper/dist
-
ds005:
<<: *machine_defaults
working_directory: /tmp/ds005
@@ -743,23 +685,6 @@ jobs:
path: ./docs/_build/html
destination: versioned
- deploy_pypi:
- <<: *python_defaults
- steps:
- - checkout
- - run:
- name: Update build tools
- command: pip install --upgrade build twine
- - run:
- name: Build sMRIPrep
- command: python -m build
- - run:
- name: Build smriprep-docker
- command: python -m build wrapper/
- - run:
- name: Upload packages to PyPI
- command: python -m twine upload dist/smriprep* wrapper/dist/smriprep*
-
deploy_docker:
<<: *machine_defaults
working_directory: *src
@@ -826,17 +751,6 @@ workflows:
tags:
only: /.*/
- - test_deploy_pypi:
- context:
- - nipreps-common
- filters:
- branches:
- only:
- - /rel\/.*/
- - /maint\/.*/
- tags:
- only: /.*/
-
- test:
context:
- nipreps-common
@@ -909,7 +823,6 @@ workflows:
- build_docs
- ds005
- ds054
- - test_deploy_pypi
- test
filters:
branches:
@@ -917,17 +830,6 @@ workflows:
tags:
only: /.*/
- - deploy_pypi:
- context:
- - nipreps-common
- requires:
- - deploy_docs_tag
- filters:
- branches:
- ignore: /.*/
- tags:
- only: /.*/
-
- deploy_docker:
context:
- nipreps-common
diff --git a/.dockerignore b/.dockerignore
index 5dbcd18830..20494a3986 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -15,10 +15,6 @@ smriprep.egg-info
pip-wheel-metadata/**/*
pip-wheel-metadata
-# pip installs
-src/**/*
-src/
-
# other
work/**/*
work
diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml
new file mode 100644
index 0000000000..5286ba6c6d
--- /dev/null
+++ b/.github/workflows/build_test_deploy.yml
@@ -0,0 +1,273 @@
+name: Build-Test-Deploy
+
+on:
+ push:
+ branches:
+ - main
+ - master
+ - maint/*
+ tags:
+ - "*"
+ pull_request:
+ branches:
+ - main
+ - master
+ - maint/*
+ schedule:
+ # 8am EST / 9am EDT Mondays
+ - cron: "0 13 * * 1"
+ workflow_dispatch:
+
+defaults:
+ run:
+ shell: bash
+
+concurrency:
+ group: ${{ github.workflow }}-${{ github.ref }}
+ cancel-in-progress: true
+
+permissions:
+ contents: read
+
+env:
+ # Force tox and pytest to use color
+ FORCE_COLOR: true
+ TEMPLATEFLOW_HOME: /tmp/templateflow
+
+jobs:
+ build:
+ name: Build & verify package
+ runs-on: ubuntu-latest
+ permissions:
+ attestations: write
+ id-token: write
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ fetch-depth: 0
+ persist-credentials: false
+ ## Stuck on https://github.com/astral-sh/uv/issues/5450
+ ## or https://github.com/hynek/build-and-inspect-python-package/issues/155
+ # - uses: hynek/build-and-inspect-python-package@v2
+ # with:
+ # upload-name-suffix: -main
+ # attest-build-provenance-github: ${{ github.event_name != 'pull_request' }}
+ # - uses: hynek/build-and-inspect-python-package@v2
+ # with:
+ # path: wrapper
+ # upload-name-suffix: -wrapper
+ # attest-build-provenance-github: ${{ github.event_name != 'pull_request' }}
+ ## Manually reproducing with pyproject-build
+ ## Probably slightly slower
+ - name: Install the latest version of uv
+ uses: astral-sh/setup-uv@v4
+ - name: Build smriprep
+ run: uvx --from=build pyproject-build --installer uv .
+ - name: Upload smriprep as Packages-main
+ uses: actions/upload-artifact@v4
+ with:
+ name: Packages-main
+ path: dist/
+
+ - name: Show package contents hierarchically, including metadata.
+ shell: bash
+ run: |
+ echo -e '\nSDist contents
\n' >> $GITHUB_STEP_SUMMARY
+ tar -tvzf dist/*.tar.gz | sed 's/^/ /' | tee -a $GITHUB_STEP_SUMMARY
+ echo -e '\nWheel contents
\n' >> $GITHUB_STEP_SUMMARY
+ unzip -l dist/*.whl | sed 's/^/ /' | tee -a $GITHUB_STEP_SUMMARY
+ echo -e '\nMetadata
\n' >> $GITHUB_STEP_SUMMARY
+ tar --wildcards -xOf dist/*.tar.gz "*/PKG-INFO" | sed 's/^/ /' | tee -a $GITHUB_STEP_SUMMARY
+ echo -e '\nSDist contents
\n' >> $GITHUB_STEP_SUMMARY
+ tar -tvzf wrapper/dist/*.tar.gz | sed 's/^/ /' | tee -a $GITHUB_STEP_SUMMARY
+ echo -e '\nWheel contents
\n' >> $GITHUB_STEP_SUMMARY
+ unzip -l wrapper/dist/*.whl | sed 's/^/ /' | tee -a $GITHUB_STEP_SUMMARY
+ echo -e '\nMetadata
\n' >> $GITHUB_STEP_SUMMARY
+ tar --wildcards -xOf wrapper/dist/*.tar.gz "*/PKG-INFO" | sed 's/^/ /' | tee -a $GITHUB_STEP_SUMMARY
+ echo -e '\n