Skip to content

Commit

Permalink
Python: Bump argo-client, mypy, cryptol versions
Browse files Browse the repository at this point in the history
This patch:

* Bumps the `mypy` lower bounds to avoid incurring a dependency on `typed-ast`,
  which is being EOL'd soon. See python/typed_ast#179.
* Bumps the `argo` submodule to bring in the changes from
  GaloisInc/argo#195, which makes corresponding changes on the `argo` side.
* Bumps the `cryptol` submodule to bring in the changes from
  GaloisInc/cryptol#1493, which makes the corresponding changes on the `cryptol`
  side.
  • Loading branch information
RyanGlScott committed Jan 31, 2023
1 parent fa5c505 commit 23cdc79
Show file tree
Hide file tree
Showing 5 changed files with 62 additions and 130 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,8 @@ jobs:
cd saw-remote-api/python/
poetry update
poetry install
poetry run mypy saw_client/
poetry run mypy --install-types --non-interactive saw_client/ || true
poetry run mypy --install-types --non-interactive saw_client/
os: macos-12
- name: Check docs
test: saw-remote-api/scripts/check_docs.sh
Expand All @@ -337,7 +338,7 @@ jobs:

- uses: actions/setup-python@v2
with:
python-version: '3.9'
python-version: '3.11'

- uses: abatilo/actions-poetry@v2.0.0
with:
Expand Down
2 changes: 1 addition & 1 deletion saw-remote-api/python/mypy.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[mypy]
no_implicit_optional = True
python_version = 3.7
python_version = 3.11
warn_return_any = True
warn_unused_configs = True
warn_unused_ignores = True
Expand Down
176 changes: 53 additions & 123 deletions saw-remote-api/python/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions saw-remote-api/python/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ include = [
python = "^3.8"
requests = "^2.25.1"
BitVector = "^3.4.9"
cryptol = "2.12.4" # { path = "../../deps/cryptol/cryptol-remote-api/python/", develop = true }
argo-client = "0.0.10"
cryptol = { path = "../../deps/cryptol/cryptol-remote-api/python/", develop = true }
argo-client = "0.0.11"

[tool.poetry.dev-dependencies]
mypy = "^0.812"
mypy = "^0.991"

[build-system]
requires = ["poetry>=1.1.4", "setuptools>=40.8.0"]
3 changes: 2 additions & 1 deletion saw-remote-api/scripts/run_rpc_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ poetry install

echo "Typechecking code with mypy..."
# Don't run mypy on tests/ yet, as it doesn't play well with mypy. See #1125.
run_test poetry run mypy saw_client/
run_test poetry run mypy --install-types --non-interactive saw_client/ || true
run_test poetry run mypy --install-types --non-interactive saw_client/

export SAW_SERVER=$(which saw-remote-api)
if [[ ! -x "$SAW_SERVER" ]]; then
Expand Down

0 comments on commit 23cdc79

Please sign in to comment.