Updated the default setuptools_scm version scheme to be release-branch-semver. #70
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…h-semver. Also adds a minimum version requirement for setuptools_scm (required to support the version scheme).
Merged
|
Just (re)discovered labscript-suite/labscript-suite#53. This PR is likely incomplete and should be updated to match that. EDIT: updated PR to match. |
philipstarkey
added a commit
to philipstarkey/labscript-utils
that referenced
this pull request
Nov 2, 2020
labscript-suite/labscript-suite#53 erroenously removed the env var that removed the local version (required for uploading to test PyPI). Contrary to my statements in labscript-suite#62, the packaging library does not seem to be a dependency of setuptools. Instead they have vendored it as an internal submodule. Rather than rely on that, packaging is now a dependency of labscript-utils directly.
philipstarkey
added a commit
that referenced
this pull request
Nov 2, 2020
Bugfixes for the mistakes in #70
philipstarkey
added a commit
to philipstarkey/labscript-utils
that referenced
this pull request
Nov 2, 2020
labscript-suite#70 introduced changes to the pyproject.toml file. These settings supersede those in setup.py, and cannot depend on environment variables. However, we need to suppress the local version when building for test PyPI (but not when running locally). As such, I see no way to utilise pyproject.toml for these settings, and am reverting to using the configuration specified in setup.py (restored in labscript-suite#71)
philipstarkey
added a commit
that referenced
this pull request
Nov 2, 2020
commit 4581953 Merge: d6335b2 eaa13a0 Author: Phil Starkey <philipstarkey@users.noreply.github.com> Date: Mon Nov 2 16:27:23 2020 +1100 Merge pull request #72 from philipstarkey/feature/versions-module-docs Added API docs for versions submodule added in #65 commit eaa13a0 Author: Phil Starkey <philipstarkey@users.noreply.github.com> Date: Mon Nov 2 16:24:02 2020 +1100 Second attempt at fixing the missing site package functions. This time we explicitly mock the missing functions using a lambda that returns an empty version of whatever types the methods usually return (hard coded into conf.py) commit d6335b2 Merge: f1c0962 720003b Author: Phil Starkey <philipstarkey@users.noreply.github.com> Date: Mon Nov 2 15:58:56 2020 +1100 Merge pull request #73 from philipstarkey/bugfix/setuptools_scm Removes setuptools_scm configuration from pyproject.toml commit 720003b Author: Phil Starkey <philipstarkey@users.noreply.github.com> Date: Mon Nov 2 15:57:33 2020 +1100 Removes setuptools_scm configuration from pyproject.toml As such, I see no way to utilise pyproject.toml for these settings, and am reverting to using the configuration specified in setup.py (restored in #71) commit f1c0962 Merge: dce6ac8 fa2654c Author: Phil Starkey <philipstarkey@users.noreply.github.com> Date: Mon Nov 2 13:06:10 2020 +1100 Merge pull request #71 from philipstarkey/bugfix/setuptools_scm Bugfixes for the mistakes in #70 commit 83c6ded Author: Phil Starkey <philipstarkey@users.noreply.github.com> Date: Mon Nov 2 13:04:42 2020 +1100 Attempt to fix the site module issue on readthedocs. commit 2c433e2 Author: Phil Starkey <philipstarkey@users.noreply.github.com> Date: Mon Nov 2 12:51:48 2020 +1100 Added API docs for versions submodule added in #65 Formatted docstrings to match sphinx Doogle style and added rst file to docs to display them. commit fa2654c Author: Phil Starkey <philipstarkey@users.noreply.github.com> Date: Mon Nov 2 11:09:10 2020 +1100 Bugfixes for the mistakes in #70 labscript-suite/labscript-suite#53 erroenously removed the env var that removed the local version (required for uploading to test PyPI). Contrary to my statements in #62, the packaging library does not seem to be a dependency of setuptools. Instead they have vendored it as an internal submodule. Rather than rely on that, packaging is now a dependency of labscript-utils directly.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Also adds a minimum version requirement for setuptools_scm (required to support the version scheme).