Merge pull request #292 from slaclab/pre-release

Release Candidate v4.7.2
slaclab · Apr 4, 2023 · 7b76a20 · 7b76a20
2 parents 220a07a + b70a31a
commit 7b76a20
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,6 +34,7 @@ build.info
 
 # Build directories 
 build*
+images*
 bin*
 .Xil*
 .obj*

diff --git a/scripts/firmwareRelease.py b/scripts/firmwareRelease.py
@@ -336,7 +336,7 @@ def buildCondaFiles(cfg,zipFile,ver,relName, relData):
     tmpTxt += 'requirements:\n'
     tmpTxt += '  build:\n'
     tmpTxt += '    - rogue\n'
-    tmpTxt += '    - python<3.8\n'
+    tmpTxt += '    - python\n'
     tmpTxt += '    - setuptools\n'
 
     if 'LibDir' in relData:
@@ -346,7 +346,7 @@ def buildCondaFiles(cfg,zipFile,ver,relName, relData):
     tmpTxt += '\n'
     tmpTxt += '  host:\n'
     tmpTxt += '    - rogue\n'
-    tmpTxt += '    - python<3.8\n'
+    tmpTxt += '    - python\n'
     tmpTxt += '    - setuptools\n'
     tmpTxt += '\n'
     tmpTxt += '  run:\n'
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,6 +34,7 @@ build.info @@
     # Build directories
     build*
+    images*
     bin*
     .Xil*
     .obj*
@@ Expand Down @@