From 8aba260e3aa6c48ebf4d578ea6db2382620d87ec Mon Sep 17 00:00:00 2001
From: Phil Starkey <philipstarkey@users.noreply.github.com>
Date: Fri, 30 Oct 2020 18:22:37 +1100
Subject: [PATCH 1/2] Updated the default setuptools_scm version scheme to be
 release-branch-semver.

Also adds a minimum version requirement for setuptools_scm (required to support the version scheme).
---
 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index a7433e0..de1c070 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -31,7 +31,7 @@ install_requires =
   pyqtgraph>=0.11.0rc0
   qtutils>=2.2.3
   scipy
-  setuptools_scm
+  setuptools_scm>-4.1.2
   zprocess>=2.18.0
 
 [options.extras_require]
diff --git a/setup.py b/setup.py
index 66a147b..a12d0a0 100644
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,7 @@ def run(self):
 
 
 VERSION_SCHEME = {
-    "version_scheme": os.getenv("SCM_VERSION_SCHEME", "guess-next-dev"),
+    "version_scheme": os.getenv("SCM_VERSION_SCHEME", "release-branch-semver"),
     "local_scheme": os.getenv("SCM_LOCAL_SCHEME", "node-and-date"),
 }
 

From 570f5871f4e9ee1d1bd3396d1f0b0aeaedde3233 Mon Sep 17 00:00:00 2001
From: Phil Starkey <philipstarkey@users.noreply.github.com>
Date: Fri, 30 Oct 2020 18:41:46 +1100
Subject: [PATCH 2/2] Updated to match labscript-suite/labscript-suite#53

---
 .github/workflows/release.yml  | 2 --
 labscript_utils/__version__.py | 9 ++-------
 pyproject.toml                 | 6 +++++-
 setup.cfg                      | 2 +-
 setup.py                       | 7 +------
 5 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 63b4e03..351c460 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,8 +15,6 @@ defaults:
 
 env:
   PACKAGE_NAME: labscript-utils
-  SCM_VERSION_SCHEME: release-branch-semver
-  SCM_LOCAL_SCHEME: no-local-version
   ANACONDA_USER: labscript-suite
 
   # Configuration for a package with compiled extensions:
diff --git a/labscript_utils/__version__.py b/labscript_utils/__version__.py
index 414c4b3..f10de68 100644
--- a/labscript_utils/__version__.py
+++ b/labscript_utils/__version__.py
@@ -1,19 +1,14 @@
-import os
 from pathlib import Path
+
 try:
     import importlib.metadata as importlib_metadata
 except ImportError:
     import importlib_metadata
 
-VERSION_SCHEME = {
-    "version_scheme": os.getenv("SCM_VERSION_SCHEME", "guess-next-dev"),
-    "local_scheme": os.getenv("SCM_LOCAL_SCHEME", "node-and-date"),
-}
-
 root = Path(__file__).parent.parent
 if (root / '.git').is_dir():
     from setuptools_scm import get_version
-    __version__ = get_version(root, **VERSION_SCHEME)
+    __version__ = get_version(root, version_scheme="release-branch-semver")
 else:
     try:
         __version__ = importlib_metadata.version(__package__)
diff --git a/pyproject.toml b/pyproject.toml
index e6ca9c7..3a1c62a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,3 +1,7 @@
 [build-system]
-requires = ["setuptools", "wheel", "setuptools_scm"]
+requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=4.1.0"]
 build-backend = "setuptools.build_meta"
+
+[tool.setuptools_scm]
+version_scheme = "release-branch-semver"
+local_scheme = "node-and-date"
diff --git a/setup.cfg b/setup.cfg
index de1c070..7c93c95 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -31,7 +31,7 @@ install_requires =
   pyqtgraph>=0.11.0rc0
   qtutils>=2.2.3
   scipy
-  setuptools_scm>-4.1.2
+  setuptools_scm>-4.1.0
   zprocess>=2.18.0
 
 [options.extras_require]
diff --git a/setup.py b/setup.py
index a12d0a0..88857b7 100644
--- a/setup.py
+++ b/setup.py
@@ -16,9 +16,4 @@ def run(self):
                 self.copy_file('labscript-suite.pth', path)
 
 
-VERSION_SCHEME = {
-    "version_scheme": os.getenv("SCM_VERSION_SCHEME", "release-branch-semver"),
-    "local_scheme": os.getenv("SCM_LOCAL_SCHEME", "node-and-date"),
-}
-
-setup(use_scm_version=VERSION_SCHEME, cmdclass={'develop': develop_command})
+setup(cmdclass={'develop': develop_command})

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/labscript-suite/labscript-utils/pull/70.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/labscript-suite/labscript-utils/pull/70.patch" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/labscript-suite/labscript-utils/pull/70.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/labscript-suite/labscript-utils/pull/70.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>