Update default setuptools_scm version scheme to release-branch-semver

labscript-suite / blacs

𝗯𝗹𝗮𝗰𝘀 supervises the execution of experiments controlled by the 𝘭𝘢𝘣𝘴𝘤𝘳𝘪𝘱𝘵 𝘴𝘶𝘪𝘵𝘦. It manages experiment queuing and hardware-timed execution, and provides manual control over devices between shots.

http://labscriptsuite.org

Other

4 stars 48 forks source link

Update default setuptools_scm version scheme to release-branch-semver #82

Closed dihm closed 3 years ago

dihm commented 3 years ago

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

philipstarkey commented 3 years ago

Great! I think the only thing missing (that is in labscript_utils) is the specific version in setup.cfg for setuptools_scm

philipstarkey commented 3 years ago

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!

dihm commented 3 years ago

Great! I think the only thing missing (that is in labscript_utils) is the specific version in setup.cfg for setuptools_scm

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?

Note that labscript-suite/labscript-suite#55 is sort of a blocker for this as our GitHub builds are completely broken at the moment.

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.

dihm commented 3 years ago

Rebased onto master to pick up fix from #83. Also added the explicit version requirement on setuptools-scm.

chrisjbillington commented 3 years ago

Sorry for the slowness on this. I've merged it, but with a few changes:

Not specifying [toml] or setuptools>=42 in pyproject.toml
Still using an environment variable for the local version in __version__.py - this should be consistent with the setup.py version which still uses the environment variable, in case the module actually gets imported in CI we would want this to agree.