Merge branch 'master' into python-3.6-to-3.10

rocky · rocky · commit abe5e9805367 · 2025-10-14T05:37:59.000-04:00
diff --git a/admin-tools/checkout_common.sh b/admin-tools/checkout_common.sh
@@ -8,7 +8,7 @@ function setup_version {
     local repo=$1
     version=$2
     echo Running setup $version on $repo ...
-    (cd ./$repo && . ./admin-tools/setup-${version}.sh)
+    (cd ../$repo && . ./admin-tools/setup-${version}.sh)
     return $?
 }
 
diff --git a/xasm/version.py b/xasm/version.py
@@ -5,4 +5,4 @@
 # space around "=" below.
 
 # fmt: off
-__version__="1.2.1"  # noqa
+__version__="1.2.2.dev0"  # noqa

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ function setup_version {`
`8`	`8`	`local repo=$1`
`9`	`9`	`version=$2`
`10`	`10`	`echo Running setup $version on $repo ...`
`11`		`- (cd ./$repo && . ./admin-tools/setup-${version}.sh)`
	`11`	`+ (cd ../$repo && . ./admin-tools/setup-${version}.sh)`
`12`	`12`	`return $?`
`13`	`13`	`}`
`14`	`14`