Skip to content

Commit c974753

Browse files
authored
Merge pull request #458 from effigies/tox-uv
chore: Adopt src/ layout and tox
2 parents e2f720d + f911418 commit c974753

File tree

81 files changed

+456
-268
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+456
-268
lines changed

.circleci/config.yml

Lines changed: 0 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -346,64 +346,6 @@ jobs:
346346
file: /tmp/data/pytest_cov.xml
347347
flags: pytest
348348

349-
test_deploy_pypi:
350-
<<: *python_defaults
351-
steps:
352-
- checkout
353-
- run:
354-
name: Update build tools
355-
command: pip install --upgrade build twine hatch
356-
- run:
357-
name: Build sMRIPrep
358-
command: python -m build
359-
- run:
360-
name: Twine check smriprep
361-
command: twine check dist/*
362-
- run:
363-
name: Pre-run hatch version
364-
command: hatch version
365-
- store_artifacts:
366-
path: /tmp/src/smriprep/dist
367-
- run:
368-
name: Check sdist distribution
369-
command: |
370-
THISVERSION=$( hatch version )
371-
THISVERSION=${CIRCLE_TAG:-$THISVERSION}
372-
virtualenv --python=python sdist
373-
source sdist/bin/activate
374-
python -m pip install --upgrade pip
375-
python -m pip install dist/smriprep*.tar.gz
376-
which smriprep | grep sdist\\/bin
377-
INSTALLED_VERSION=$(smriprep --version)
378-
INSTALLED_VERSION=${INSTALLED_VERSION%$'\r'}
379-
INSTALLED_VERSION=${INSTALLED_VERSION#*"smriprep v"}
380-
echo "VERSION: \"$THISVERSION\""
381-
echo "INSTALLED: \"$INSTALLED_VERSION\""
382-
test "$INSTALLED_VERSION" = "$THISVERSION"
383-
- run:
384-
name: Check wheel distribution
385-
command: |
386-
THISVERSION=$( hatch version )
387-
THISVERSION=${CIRCLE_TAG:-$THISVERSION}
388-
virtualenv --python=python wheel
389-
source wheel/bin/activate
390-
python -m pip install dist/smriprep*.whl
391-
which smriprep | grep wheel\\/bin
392-
INSTALLED_VERSION=$(smriprep --version)
393-
INSTALLED_VERSION=${INSTALLED_VERSION%$'\r'}
394-
INSTALLED_VERSION=${INSTALLED_VERSION#*"smriprep v"}
395-
echo "VERSION: \"$THISVERSION\""
396-
echo "INSTALLED: \"$INSTALLED_VERSION\""
397-
test "$INSTALLED_VERSION" = "$THISVERSION"
398-
- run:
399-
name: Build smriprep-docker
400-
command: python -m build wrapper
401-
- run:
402-
name: Twine check wrapper
403-
command: twine check wrapper/dist/*
404-
- store_artifacts:
405-
path: /tmp/src/smriprep/wrapper/dist
406-
407349
ds005:
408350
<<: *machine_defaults
409351
working_directory: /tmp/ds005
@@ -743,23 +685,6 @@ jobs:
743685
path: ./docs/_build/html
744686
destination: versioned
745687

746-
deploy_pypi:
747-
<<: *python_defaults
748-
steps:
749-
- checkout
750-
- run:
751-
name: Update build tools
752-
command: pip install --upgrade build twine
753-
- run:
754-
name: Build sMRIPrep
755-
command: python -m build
756-
- run:
757-
name: Build smriprep-docker
758-
command: python -m build wrapper/
759-
- run:
760-
name: Upload packages to PyPI
761-
command: python -m twine upload dist/smriprep* wrapper/dist/smriprep*
762-
763688
deploy_docker:
764689
<<: *machine_defaults
765690
working_directory: *src
@@ -826,17 +751,6 @@ workflows:
826751
tags:
827752
only: /.*/
828753

829-
- test_deploy_pypi:
830-
context:
831-
- nipreps-common
832-
filters:
833-
branches:
834-
only:
835-
- /rel\/.*/
836-
- /maint\/.*/
837-
tags:
838-
only: /.*/
839-
840754
- test:
841755
context:
842756
- nipreps-common
@@ -909,25 +823,13 @@ workflows:
909823
- build_docs
910824
- ds005
911825
- ds054
912-
- test_deploy_pypi
913826
- test
914827
filters:
915828
branches:
916829
ignore: /.*/
917830
tags:
918831
only: /.*/
919832

920-
- deploy_pypi:
921-
context:
922-
- nipreps-common
923-
requires:
924-
- deploy_docs_tag
925-
filters:
926-
branches:
927-
ignore: /.*/
928-
tags:
929-
only: /.*/
930-
931833
- deploy_docker:
932834
context:
933835
- nipreps-common

.dockerignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ smriprep.egg-info
1515
pip-wheel-metadata/**/*
1616
pip-wheel-metadata
1717

18-
# pip installs
19-
src/**/*
20-
src/
21-
2218
# other
2319
work/**/*
2420
work

0 commit comments

Comments
 (0)