Merge branch 'develop' into feature-errorgen-propagation-refactors

Author: sserita

Diff for: .flake8-critical

@@ -16,15 +16,18 @@
 # This list may be expanded in the future
 select=E9,F63,F7,F82
 
-exclude=
+per-file-ignores=
 	# Known issues with rb tests. Currently skipped, but technically have F821 errors
-	test/unit/extras/rb/test_analysis.py
-	test/unit/extras/rb/test_group.py
-	test/unit/extras/rb/test_sample.py
-	test/unit/extras/rb/test_theory.py
-	test/unit/tools/test_internalgates.py
-	test/test_packages/extras/test_rb.py
-	# F821 error. Should nPossible be nLocal?
-	test/test_packages/drivers/nqubitconstruction.py
-	# F821 error. Likely results existed in a deleted cell
-	scripts/profiling/gaugeopt/3Q_example.py
+	test/unit/extras/rb/test_analysis.py:F821
+	test/unit/extras/rb/test_group.py:F821
+	test/unit/extras/rb/test_sample.py:F821
+	test/unit/extras/rb/test_theory.py:F821
+	test/unit/tools/test_internalgates.py:F821
+	test/test_packages/extras/test_rb.py:F821
+	# Should nPossible be nLocal?
+	test/test_packages/drivers/nqubitconstruction.py:F821
+	# Likely results existed in a deleted cell
+	scripts/profiling/gaugeopt/3Q_example.py:F821
+	# New with flake 7.2.0, should go back to these
+	pygsti/forwardsims/termforwardsim_calc_generic.py:F824
+	pygsti/baseobjs/basisconstructors.py:F824

Diff for: setup.py

@@ -15,13 +15,11 @@
 # Configure setuptools_scm to build a custom version (for more info,
 # see https://stackoverflow.com/a/78657279 and https://setuptools-scm.readthedocs.io/en/latest/extending)
 # If on a clean release, it uses no local scheme
-# Otherwise, it uses g{commit hash}.{branch}.[clean | d{date}] for the local scheme,
-# where the last entry is "clean" if everything is committed and otherwise the date of last commit
+# Otherwise, it uses g{commit hash}.{branch}.[CLEAN | d{date}] for the local scheme,
+# where the last entry is "CLEAN" if everything is committed and otherwise the date of last commit
 def custom_version(version):
     from setuptools_scm.version import get_local_node_and_date
 
-    b = version.branch if version.branch and version.branch != "master" else None
-
     local_scheme = ""
     if version.dirty or version.distance:
         node_and_date = get_local_node_and_date(version)
@@ -30,11 +28,9 @@ def custom_version(version):
             node, date = node_and_date.split('.')
         else:
             node = node_and_date
-            date = "clean"
+            date = "CLEAN"
 
-        local_scheme = node + (f'.{b}.' if b else 'master') + date
-    elif b:
-        local_scheme = f"+{b}"
+        local_scheme = node + f'.{version.branch}.' + date
 
     return local_scheme
 
@@ -65,7 +61,7 @@ def setup_with_extensions(extensions=None):
         use_scm_version={'version_scheme': 'no-guess-dev', 'version_file': "pygsti/_version.py", 'local_scheme': custom_version},
         cmdclass={'build_ext': build_ext_compiler_check},
         ext_modules=extensions or [],
-        packages=find_packages(),
+        packages=find_packages(where='.', include=['pygsti']),
         package_data={
             'pygsti.tools': ['fastcalc.pyx'],
             'pygsti.evotypes': [