Update default setuptools_scm version scheme to release-branch-semver - #82
Conversation
|
Great! I think the only thing missing (that is in labscript_utils) is the specific version in setup.cfg for setuptools_scm |
|
Note that labscript-suite/labscript-suite#55 is sort of a blocker for this as our GitHub builds are completely broken at the moment. I'm uncertain off the top of my head how this interacts with readthedocs builds. It probably doesn't break them as I don't think readthedocs relies on development builds on labscript dependencies...but it would be preferable to merge this after fixing the build issues so we can make sure this doesn't introduce separate build issues! |
I actually noticed that one while working on this and forgot to bring it up. I was going to add the change as well but noticed that both labscript-devices and blacs depend on labscript-utils (which in turn depends on the correct version of setuptools-scm) and figured I would leave it be. I presume I should favor more explicit version requirements in each package over relying on chains of dependencies?
Sure thing! I think I agree that the RTD builds are still nominally OK, but the high level github builds magic is fairly new territory for me. |
This fixes the circular dependency issue between blacs and labscript-devices.
Adds setuptools-scm with required version.
|
Rebased onto master to pick up fix from #83. Also added the explicit version requirement on setuptools-scm. |
| @@ -1,3 +1,3 @@ | |||
| [build-system] | |||
| requires = ["setuptools", "wheel", "setuptools_scm"] | |||
| requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=4.1.0"] | |||
There was a problem hiding this comment.
@dihm What's the reason for the toml requirement?
Seems to me that it shouldn't be necessary since setuptools_scm only uses toml to read its configuration from pyproject.toml. Since we still need to set its config in setup.py based on an environment variable, we aren't using that.
There was a problem hiding this comment.
Ah, looks like you were probably copying from the recommended usage here: https://pypi.org/project/setuptools-scm/
including the requirement to use setuptools > 42.
I'm going to leave these changes out for simplicity.
|
Sorry for the slowness on this. I've merged it, but with a few changes:
|
This fixes the circular dependency issue between blacs and labscript-devices that is preventing #80 from building. By extension, allows for proper pip develop installs locally, where this circular dependency issue is manifesting.
Pretty sure I got all the tweaks from labscript-utils, but best to make sure I didn't miss anything, especially where the workflows/RTD stuff is concerned since that is harder to test locally.
This should be merged at same time as labscript-suite/labscript-devices#73