[ARVADOS] updated: 2.1.0-934-g4f8c22816

[Git user]

Summary of changes:
 sdk/cwl/setup.py                      | 3 ++-
 services/arv-git-httpd/server_test.go | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

       via  4f8c228165ed062ffb6daaec38d0895aab96d411 (commit)
       via  d174f686d4cccd6f694d5f42884b4e6ecadd57ad (commit)
      from  7c9ae0db020e291964bd9d259bc403417cc9940a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 4f8c228165ed062ffb6daaec38d0895aab96d411
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Fri Jul 9 10:54:30 2021 -0400

    Pin networkx to avoid new version that pulls in scipy/numpy
    
    refs #17879
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index 1a701f258..34fe0c15d 100644
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -43,7 +43,8 @@ setup(name='arvados-cwl-runner',
           'schema-salad==7.1.20210611090601',
           'arvados-python-client{}'.format(pysdk_dep),
           'setuptools',
-          'ciso8601 >= 2.0.0'
+          'ciso8601 >= 2.0.0',
+          'networkx < 2.6'
       ],
       extras_require={
           ':os.name=="posix" and python_version<"3"': ['subprocess32 >= 3.5.1'],

commit d174f686d4cccd6f694d5f42884b4e6ecadd57ad
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Fri Jul 9 10:53:39 2021 -0400

    Back out some undesired test changes refs #17817
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/services/arv-git-httpd/server_test.go b/services/arv-git-httpd/server_test.go
index 386205d37..cba82fe3f 100644
--- a/services/arv-git-httpd/server_test.go
+++ b/services/arv-git-httpd/server_test.go
@@ -39,7 +39,7 @@ func (s *GitSuite) TestPathVariants(c *check.C) {
 func (s *GitSuite) TestReadonly(c *check.C) {
 	err := s.RunGit(c, spectatorToken, "fetch", "active/foo.git")
 	c.Assert(err, check.Equals, nil)
-	err = s.RunGit(c, spectatorToken, "push", "active/foo.git", "main:newbranchfail")
+	err = s.RunGit(c, spectatorToken, "push", "active/foo.git", "master:newbranchfail")
 	c.Assert(err, check.ErrorMatches, `.*HTTP (code = )?403.*`)
 	_, err = os.Stat(s.tmpRepoRoot + "/zzzzz-s0uqq-382brsig8rp3666.git/refs/heads/newbranchfail")
 	c.Assert(err, check.FitsTypeOf, &os.PathError{})
@@ -48,7 +48,7 @@ func (s *GitSuite) TestReadonly(c *check.C) {
 func (s *GitSuite) TestReadwrite(c *check.C) {
 	err := s.RunGit(c, activeToken, "fetch", "active/foo.git")
 	c.Assert(err, check.Equals, nil)
-	err = s.RunGit(c, activeToken, "push", "active/foo.git", "main:newbranch")
+	err = s.RunGit(c, activeToken, "push", "active/foo.git", "master:newbranch")
 	c.Assert(err, check.Equals, nil)
 	_, err = os.Stat(s.tmpRepoRoot + "/zzzzz-s0uqq-382brsig8rp3666.git/refs/heads/newbranch")
 	c.Assert(err, check.Equals, nil)
@@ -104,7 +104,7 @@ func (s *GitSuite) makeArvadosRepo(c *check.C) {
 	msg, err := exec.Command("git", "init", "--bare", s.tmpRepoRoot+"/zzzzz-s0uqq-arvadosrepo0123.git").CombinedOutput()
 	c.Log(string(msg))
 	c.Assert(err, check.Equals, nil)
-	msg, err = exec.Command("git", "--git-dir", s.tmpRepoRoot+"/zzzzz-s0uqq-arvadosrepo0123.git", "fetch", "../../.git", "HEAD:main").CombinedOutput()
+	msg, err = exec.Command("git", "--git-dir", s.tmpRepoRoot+"/zzzzz-s0uqq-arvadosrepo0123.git", "fetch", "../../.git", "HEAD:master").CombinedOutput()
 	c.Log(string(msg))
 	c.Assert(err, check.Equals, nil)
 }

-----------------------------------------------------------------------


hooks/post-receive
--