Skip to content

Bugfixes for the mistakes in #70 #71

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Nov 2, 2020
Merged

Bugfixes for the mistakes in #70 #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ defaults:

env:
PACKAGE_NAME: labscript-utils
SCM_LOCAL_SCHEME: no-local-version
ANACONDA_USER: labscript-suite

# Configuration for a package with compiled extensions:
Expand Down
1 change: 1 addition & 0 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ install_requires =
importlib_metadata>=1.0
h5py>=2.9
numpy>=1.15
packaging>=20.4
pyqtgraph>=0.11.0rc0
qtutils>=2.2.3
scipy
Expand Down
7 changes: 6 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,9 @@ def run(self):
self.copy_file('labscript-suite.pth', path)


setup(cmdclass={'develop': develop_command})
VERSION_SCHEME = {
"version_scheme": os.getenv("SCM_VERSION_SCHEME", "release-branch-semver"),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can probably just be "version_scheme": "release-branch-semver", as:

  • SCM_LOCAL_SCHEME is used for local_scheme only so the local version is removed (required for uploading to test PyPI), i.e. using no-local-version rather than node-and-date; and
  • SCM_VERSION_SCHEME was used as release_branch_semver required using a git-installed setuptools_scm in the GitHub action prior to version 4.1.0.

"local_scheme": os.getenv("SCM_LOCAL_SCHEME", "node-and-date"),
}

setup(use_scm_version=VERSION_SCHEME, cmdclass={'develop': develop_command})