From 0e9a5eb4f427b3be662c9422cc7893b103d67eea Mon Sep 17 00:00:00 2001 From: Andrew Kent Date: Tue, 31 Aug 2021 08:43:25 -0700 Subject: [PATCH] chore: bump argo submodule, fixes rpc CI failures --- cryptol-remote-api/python/poetry.lock | 8 ++++---- .../python/tests/cryptol/test_CplxQNewtype.py | 2 +- .../python/tests/cryptol/test_cryptol_api.py | 4 ++-- .../python/tests/cryptol_eval/test_basics.py | 4 ++-- deps/argo | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cryptol-remote-api/python/poetry.lock b/cryptol-remote-api/python/poetry.lock index 1a99d63ba..a65f65db5 100644 --- a/cryptol-remote-api/python/poetry.lock +++ b/cryptol-remote-api/python/poetry.lock @@ -97,7 +97,7 @@ python-versions = "*" [[package]] name = "typing-extensions" -version = "3.10.0.0" +version = "3.10.0.2" description = "Backported and Experimental Type Hints for Python 3.5+" category = "main" optional = false @@ -205,9 +205,9 @@ typed-ast = [ {file = "typed_ast-1.4.3.tar.gz", hash = "sha256:fb1bbeac803adea29cedd70781399c99138358c26d05fcbd23c13016b7f5ec65"}, ] typing-extensions = [ - {file = "typing_extensions-3.10.0.0-py2-none-any.whl", hash = "sha256:0ac0f89795dd19de6b97debb0c6af1c70987fd80a2d62d1958f7e56fcc31b497"}, - {file = "typing_extensions-3.10.0.0-py3-none-any.whl", hash = "sha256:779383f6086d90c99ae41cf0ff39aac8a7937a9283ce0a414e5dd782f4c94a84"}, - {file = "typing_extensions-3.10.0.0.tar.gz", hash = "sha256:50b6f157849174217d0656f99dc82fe932884fb250826c18350e159ec6cdf342"}, + {file = "typing_extensions-3.10.0.2-py2-none-any.whl", hash = "sha256:d8226d10bc02a29bcc81df19a26e56a9647f8b0a6d4a83924139f4a8b01f17b7"}, + {file = "typing_extensions-3.10.0.2-py3-none-any.whl", hash = "sha256:f1d25edafde516b146ecd0613dabcc61409817af4766fbbcfb8d1ad4ec441a34"}, + {file = "typing_extensions-3.10.0.2.tar.gz", hash = "sha256:49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e"}, ] urllib3 = [ {file = "urllib3-1.22-py2.py3-none-any.whl", hash = "sha256:06330f386d6e4b195fbfc736b297f58c5a892e4440e54d294d7004e3a9bbea1b"}, diff --git a/cryptol-remote-api/python/tests/cryptol/test_CplxQNewtype.py b/cryptol-remote-api/python/tests/cryptol/test_CplxQNewtype.py index 7b7bb3183..31d9bbea9 100644 --- a/cryptol-remote-api/python/tests/cryptol/test_CplxQNewtype.py +++ b/cryptol-remote-api/python/tests/cryptol/test_CplxQNewtype.py @@ -7,7 +7,7 @@ class TestCplxQ(unittest.TestCase): def test_CplxQ(self): - c = cryptol.connect(reset_server=True, verify=False) + c = cryptol.connect(verify=False) c.load_file(str(Path('tests','cryptol','test-files', 'CplxQNewtype.cry'))) forty_two = c.eval("fortyTwo").result() diff --git a/cryptol-remote-api/python/tests/cryptol/test_cryptol_api.py b/cryptol-remote-api/python/tests/cryptol/test_cryptol_api.py index 14d2ea281..02e169546 100644 --- a/cryptol-remote-api/python/tests/cryptol/test_cryptol_api.py +++ b/cryptol-remote-api/python/tests/cryptol/test_cryptol_api.py @@ -223,10 +223,10 @@ def test_reset_with_many_usages_many_connections(self): self.assertEqual(x_val1, x_val2) c.reset() - def test_reset_server_with_many_usages_many_connections(self): + def test_server_with_many_usages_many_connections(self): for i in range(0,100): time.sleep(.05) - c = cryptol.connect(url=self.url, reset_server=True, verify=False) + c = cryptol.connect(url=self.url, verify=False) c.load_file(str(Path('tests','cryptol','test-files', 'Foo.cry'))) x_val1 = c.evaluate_expression("x").result() x_val2 = c.eval("Id::id x").result() diff --git a/cryptol-remote-api/python/tests/cryptol_eval/test_basics.py b/cryptol-remote-api/python/tests/cryptol_eval/test_basics.py index 731a6f56c..ffaac2472 100644 --- a/cryptol-remote-api/python/tests/cryptol_eval/test_basics.py +++ b/cryptol-remote-api/python/tests/cryptol_eval/test_basics.py @@ -102,10 +102,10 @@ def test_reset_with_many_usages_many_connections(self): self.assertEqual(res, [BV(size=8,value=0xff), BV(size=8,value=0xff)]) c.reset() - def test_reset_server_with_many_usages_many_connections(self): + def test_server_with_many_usages_many_connections(self): for i in range(0,100): time.sleep(.05) - c = cryptol.connect(url=self.url, reset_server=True) + c = cryptol.connect(url=self.url) res = c.call('f', BV(size=8,value=0xff)).result() self.assertEqual(res, [BV(size=8,value=0xff), BV(size=8,value=0xff)]) diff --git a/deps/argo b/deps/argo index 37ce3b288..101cad520 160000 --- a/deps/argo +++ b/deps/argo @@ -1 +1 @@ -Subproject commit 37ce3b28832ff1fad0bf18630aeed59777a36fd4 +Subproject commit 101cad520fc353a8673f9ba9d71b70e2f9ec59d9