From 56ab5c4ebb429ac25f3d41345c9586293c965bb9 Mon Sep 17 00:00:00 2001 From: Gyeongjae Choi Date: Sat, 25 May 2024 10:32:38 +0900 Subject: [PATCH] Remove deploy dependencies from pyodide-build's pyproject.toml (#4752) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .circleci/config.yml | 4 ++-- .github/workflows/main.yml | 4 ++-- pyodide-build/pyproject.toml | 4 ---- requirements-deploy.txt | 4 ++++ requirements.txt | 4 +--- src/tests/test_console.py | 3 +-- 6 files changed, 10 insertions(+), 13 deletions(-) create mode 100644 requirements-deploy.txt diff --git a/.circleci/config.yml b/.circleci/config.yml index 6d4c9ec0b..407ecae57 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -507,7 +507,7 @@ jobs: - run: name: Install requirements command: | - python3 -m pip install -e "./pyodide-build[deploy]" + python3 -m pip install -r requirements-deploy.txt wget https://github.com/tcnksm/ghr/releases/download/v0.16.2/ghr_v0.16.2_linux_amd64.tar.gz tar xzf ghr_v0.16.2_linux_amd64.tar.gz @@ -582,7 +582,7 @@ jobs: - run: name: Install requirements command: | - python3 -m pip install -e "./pyodide-build[deploy]" + python3 -m pip install -r requirements-deploy.txt - run: name: Set PYODIDE_BASE_URL command: | diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ad43ec47e..d7e928f89 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,8 +33,8 @@ jobs: shell: bash -l {0} run: | mkdir test-results - cd pyodide-build && python3 -m pip install -e ".[test,deploy]" && cd .. - python3 -m pip install pytest-cov hypothesis pytz + cd pyodide-build && python3 -m pip install -e ".[test]" && cd .. + python3 -m pip install -r requirements.txt -r requirements-deploy.txt - name: Run tests shell: bash -l {0} run: | diff --git a/pyodide-build/pyproject.toml b/pyodide-build/pyproject.toml index 3f61c7cb9..f1dd9dbda 100644 --- a/pyodide-build/pyproject.toml +++ b/pyodide-build/pyproject.toml @@ -66,10 +66,6 @@ test = [ "pytest-httpserver", "packaging", ] -deploy = [ - "boto3", - "moto", -] [tool.hatch] version.path = "pyodide_build/__init__.py" diff --git a/requirements-deploy.txt b/requirements-deploy.txt new file mode 100644 index 000000000..a846a3fca --- /dev/null +++ b/requirements-deploy.txt @@ -0,0 +1,4 @@ +# used to deploy files to s3 +boto3 +moto +typer diff --git a/requirements.txt b/requirements.txt index 476a1e0cc..690e4d945 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,4 @@ -# build -cmake -ruamel.yaml + # lint pre-commit # testing diff --git a/src/tests/test_console.py b/src/tests/test_console.py index 041056c3f..6bd4ff4e6 100644 --- a/src/tests/test_console.py +++ b/src/tests/test_console.py @@ -119,8 +119,7 @@ def test_interactive_console(): assert await get_result("") is None assert await get_result("factorial(10)") == 3628800 - assert await get_result("import pytz") is None - assert await get_result("pytz.utc.zone") == "UTC" + assert await get_result("import pathlib") is None fut = shell.push("1+") assert fut.syntax_check == "syntax-error"