-
Notifications
You must be signed in to change notification settings - Fork 4
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
PR to support a more flexible camera naming. #16
Conversation
The version handling here broke for some reason, which is why the CI is failing |
This might be related to the comment zach made in #9 about Our cookiecutter is setup to have a |
Playing around with this locally, I think this breaks because the tag format is not recognized by > /cds/group/pcds/pyps/conda/py39/envs/pcds-5.8.4/lib/python3.9/site-packages/setuptools_scm/version.py(210)meta()
208 node_date: date | None = None,
209 ) -> ScmVersion:
--> 210 parsed_version = _parse_tag(tag, preformatted, config)
211 log.info("version %s -> %s", tag, parsed_version)
212 assert parsed_version is not None, "Can't parse version %s" % tag
ipdb> tag
'R1.0.0'
ipdb> _parse_tag('1.0.0', preformatted, config)
<Version('1.0.0')> Are we committed to |
If prefixing with 'R' is problematic, then I'm happy to change it. I just used the 'Rx.y.z' format because that's historically how we've tagged our IOC releases. We can still name the release directory "R.x.y.z" if we want. |
Unfortunately the 'Rx.y.z' format isn't seen anywhere else from what I've seen. Changing the release tag format is the best path forward for this python repo at least. For the purposes of this PR, we can ignore the CI and bypass the checks |
Thanks! I'll make this ready for review then and make a new tag without the 'R' after the merge. |
Requesting a review from @ZLLentz to double check my opinion on the tag / versioning issue |
Co-authored-by: Robert Tang-Kong <35379409+tangkong@users.noreply.github.com>
Co-authored-by: Robert Tang-Kong <35379409+tangkong@users.noreply.github.com>
RE: tag/versioning issue, python has a strict, explicit spec for version identifiers. Details here: https://packaging.python.org/en/latest/specifications/version-specifiers Summary:
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You should add this file exactly as-is: https://github.com/pcdshub/pcdsdevices/blob/master/pcdsdevices/version.py
To act as version proxy between installed/dev versions
pyproject.toml
Outdated
@@ -23,7 +23,7 @@ file = "LICENSE.md" | |||
[project.scripts] | |||
|
|||
[tool.setuptools_scm] | |||
write_to = "btms_ui/_version.py" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change should be undone
The core change here is 👍 just the packaging stuff |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think everything is good here, if you merge and tag we can see if the tag build has similar issues or not
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
Thanks. It seems like I do not possess the power to merge without approving review and passing tests |
Builds after the new, compliant tag name look good. Now only failing on a pypi / conda deployment we haven't setup 🎉 |
Description
Modify the btms to use a new property of the btms_config.SourcePosition class, introduced in this PR on pcdsdevices: pcdshub/pcdsdevices#1265
Motivation and Context
closes #15
How Has This Been Tested?
Tested interactively in the laser hall.
Where Has This Been Documented?
This PR.