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

ENH: Configure isolated builds and set up cibuildwheel #15

Merged
merged 36 commits into from
Sep 19, 2023

Conversation

effigies
Copy link

@effigies effigies commented Sep 2, 2023

Builds on #13 and #14.

Incremental diff: effigies/gradunwarp@mnt/drop-fsl...enh/build

Closes #13.
Closes #14.

@effigies effigies force-pushed the enh/build branch 2 times, most recently from 573d5c8 to db219d2 Compare September 2, 2023 12:55
@effigies effigies force-pushed the enh/build branch 2 times, most recently from 2f53d0d to 8018c92 Compare September 2, 2023 14:10
@effigies
Copy link
Author

effigies commented Sep 3, 2023

I believe the test failure was a one-off corrupt download from PyPI. Restarting the CI job should check that. This is ready for review.

@effigies effigies marked this pull request as ready for review September 3, 2023 13:54
@coalsont
Copy link
Member

coalsont commented Sep 5, 2023

Looks reasonable as far as I can tell. Seems to still install with the old instructions on ubuntu 20.04/python3.8 at least (if the system numpy isn't installed, but that was already an issue in our version). Haven't tried anything more than the usage info.

@cyang31
Copy link

cyang31 commented Sep 6, 2023

Looks good to me. The replacement of the command line with the nibabel module is really nice. I created a local env on macos, installed this module using this PR, run the test_gradient_unwarp.py and it works on my end.

@effigies
Copy link
Author

effigies commented Sep 6, 2023

I should note that I added some machinery for bumping the version across the three locations it's found in. It uses bumpver, which can be installed with pip or run through something like pipx:

pipx run bumpver show         
INFO    - fetching tags from remote (to turn off use: -n / --no-fetch)
Current Version: 1.2.2.dev
PEP440         : 1.2.2.dev0

To update from a dev version, you can run bumpver update --tag final. Here I bump the minor version from 1.2 to 1.3 (using --dry to avoid making a commit or tag):

pipx run bumpver update --minor --tag final --dry
INFO    - fetching tags from remote (to turn off use: -n / --no-fetch)
INFO    - Old Version: 1.2.2.dev
INFO    - New Version: 1.3.0
--- gradunwarp/core/globals.py
+++ gradunwarp/core/globals.py
@@ -6,7 +6,7 @@
 ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ##
 import logging
 
-VERSION = '1.2.2.dev'
+VERSION = '1.3.0'
 
 usage = '''
 gradient_unwarp infile outfile manufacturer -g <coefficient file> [optional arguments]
--- pyproject.toml
+++ pyproject.toml
@@ -13,7 +13,7 @@
 build-backend = "setuptools.build_meta"
 
 [tool.bumpver]
-current_version = "1.2.2.dev"
+current_version = "1.3.0"
 version_pattern = "MAJOR.MINOR.PATCH[.TAG]"
 commit_message = "bump version {old_version} -> {new_version}"
 tag_message = "{new_version}"
--- version.txt
+++ version.txt
@@ -1,2 +1,2 @@
-v1.2.2.dev
+v1.3.0
 

Dropping the --minor would update from 1.2.2.dev to 1.2.2.

Post-release, I would then do something like the following to update the dev version again:

pipx run bumpver update --patch --tag dev --no-tag-commit

@effigies effigies force-pushed the enh/build branch 2 times, most recently from b7d5903 to 8789f25 Compare September 17, 2023 12:51
@effigies
Copy link
Author

Forgot that I planned to make sure pip install . works with and without pre-running pip install -r requirements.txt. Now included as a test and works across all listed versions.

@coalsont
Copy link
Member

I'm basically just waiting for this to stabilize before merging.

@effigies
Copy link
Author

Ah, I think this is good to go. If more things come up, more pull requests can be made.

@coalsont coalsont merged commit 6db666b into Washington-University:master Sep 19, 2023
22 checks passed
@effigies effigies deleted the enh/build branch September 19, 2023 22:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants