Merge branch version/0-47-1-RC1 to adopt changes from PR ActiveState#3651

Author: as-builds

pkg/buildscript/marshal.go

@@ -22,6 +22,7 @@ const (
 	ltFuncName  = "Lt"
 	lteFuncName = "Lte"
 	andFuncName = "And"
+	anyFuncName = "Any"
 )
 
 // Marshal returns this structure in AScript, suitable for writing to disk.

pkg/buildscript/marshal_buildexpression.go

@@ -153,6 +153,10 @@ func marshalReq(fn *funcCall) ([]byte, error) {
 							return errs.Wrap(err, "Could not marshal additional requirement")
 						}
 					}
+				case anyFuncName:
+					// We can ignore the `version = Any()` argument; omitting it is an equivalent statement.
+					// As mentioned in this function's comment, once buildexpressions support requirements as
+					// functions, we won't need to do any of this anymore.
 				default:
 					return errs.New("Unknown version comparator: %s", name)
 				}

test/integration/buildscript_int_test.go

@@ -162,6 +162,30 @@ main = wheel
 	suite.Contains(files, "sample_activestate-1.0.0.dist-info/WHEEL")
 }
 
+func (suite *BuildScriptIntegrationTestSuite) TestBuildScriptRequirementVersionAny() {
+	suite.OnlyRunForTags(tagsuite.BuildScripts)
+	ts := e2e.New(suite.T(), false)
+	defer ts.Close()
+
+	cp := ts.Spawn("config", "set", constants.AsyncRuntimeConfig, "true")
+	cp.ExpectExitCode(0)
+
+	// Enable as part of DX-3230.
+	//cp = ts.Spawn("config", "set", constants.OptinBuildscriptsConfig, "true")
+	//cp.ExpectExitCode(0)
+
+	// This project's build expression has a requirement whose version is the "Any()" function.
+	// Make sure we can successfully checkout and modify this project.
+	// Previously, no version would be given for such a requirement.
+	cp = ts.Spawn("checkout", "ActiveState/python3-MacOS#b6aac9cf-a758-42d6-9574-78ec513ad8e9", ".")
+	cp.Expect("Checked out project")
+	cp.ExpectExitCode(0)
+
+	cp = ts.Spawn("install", "dotenv")
+	cp.Expect("Added: language/python/dotenv@Auto")
+	cp.ExpectExitCode(0)
+}
+
 func TestBuildScriptIntegrationTestSuite(t *testing.T) {
 	suite.Run(t, new(BuildScriptIntegrationTestSuite))
 }