Merge pull request #3907 from youknowone/remove-pipenv

youknowone · web-flow · commit 256bbef8d037 · 2022-07-17T12:43:23.000+09:00
remove pipenv
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -165,15 +165,8 @@ jobs:
       - uses: actions/setup-python@v2
         with:
           python-version: "3.10"
-      - name: Install pipenv
-        run: |
-          python -V
-          python -m pip install --upgrade pip
-          python -m pip install pipenv
-      - run: pipenv install --python "3.10"
-        working-directory: ./extra_tests
       - name: run snippets
-        run: pipenv run pytest -v
+        run: python -m pip install -r requirements.txt && pytest -v
         working-directory: ./extra_tests
       - if: runner.os == 'Linux'
         name: run cpython platform-independent tests
@@ -277,12 +270,7 @@ jobs:
       - uses: actions/setup-python@v2
         with:
           python-version: "3.10"
-      - name: Install pipenv
-        run: |
-          python -V
-          python -m pip install --upgrade pip
-          python -m pip install pipenv
-      - run: pipenv install
+      - run: python -m pip install -r requirements.txt
         working-directory: ./wasm/tests
       - uses: actions/setup-node@v1
       - name: run test
diff --git a/.github/workflows/cron-ci.yaml b/.github/workflows/cron-ci.yaml
@@ -24,15 +24,10 @@ jobs:
       - uses: actions/setup-python@v2
         with:
           python-version: "3.10"
-      - name: Install pipenv
-        run: |
-          python -V
-          python -m pip install --upgrade pip
-          python -m pip install pipenv
-      - run: pipenv install
+      - run: python -m pip install pytest
         working-directory: ./extra_tests
       - name: run snippets
-        run: LLVM_PROFILE_FILE="$PWD/snippet-%p.profraw" pipenv run pytest -v
+        run: LLVM_PROFILE_FILE="$PWD/snippet-%p.profraw" pytest -v
         working-directory: ./extra_tests
       - name: run cpython tests
         run: LLVM_PROFILE_FILE="$PWD/regrtest.profraw" target/release/rustpython -m test -v
diff --git a/extra_tests/Pipfile b/extra_tests/Pipfile
diff --git a/extra_tests/requirements.txt b/extra_tests/requirements.txt
@@ -0,0 +1,2 @@
+bytecode
+pytest
diff --git a/wasm/demo/package.json b/wasm/demo/package.json
@@ -24,7 +24,7 @@
         "dev": "webpack-dev-server -d",
         "build": "webpack",
         "dist": "webpack --mode production",
-        "test": "webpack --mode production && cd ../tests && pipenv run pytest"
+        "test": "webpack --mode production && cd ../tests && pytest"
     },
     "repository": {
         "type": "git",
diff --git a/wasm/notebook/package.json b/wasm/notebook/package.json
@@ -27,7 +27,7 @@
         "dev": "webpack-dev-server -d",
         "build": "webpack",
         "dist": "webpack --mode production",
-        "test": "webpack --mode production && cd ../tests && pipenv run pytest"
+        "test": "webpack --mode production && cd ../tests && pytest"
     },
     "repository": {
         "type": "git",
diff --git a/wasm/tests/Pipfile b/wasm/tests/Pipfile
diff --git a/wasm/tests/requirements.txt b/wasm/tests/requirements.txt
@@ -0,0 +1,2 @@
+pytest
+selenium
