From 2dd446a80f0a5a300ebe4efab6dbec133232f814 Mon Sep 17 00:00:00 2001
From: Jeong Yunwon <jeong@youknowone.org>
Date: Sun, 17 Jul 2022 03:18:53 +0900
Subject: [PATCH] remove pipenv

---
 .github/workflows/ci.yaml      | 16 ++--------------
 .github/workflows/cron-ci.yaml |  9 ++-------
 extra_tests/Pipfile            | 12 ------------
 extra_tests/requirements.txt   |  2 ++
 wasm/demo/package.json         |  2 +-
 wasm/notebook/package.json     |  2 +-
 wasm/tests/Pipfile             | 13 -------------
 wasm/tests/requirements.txt    |  2 ++
 8 files changed, 10 insertions(+), 48 deletions(-)
 delete mode 100644 extra_tests/Pipfile
 create mode 100644 extra_tests/requirements.txt
 delete mode 100644 wasm/tests/Pipfile
 create mode 100644 wasm/tests/requirements.txt

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index f4d0bc169..b94f9b077 100644
--- 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
index 01ba01012..4e8152c17 100644
--- 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
deleted file mode 100644
index 6f71ad25d..000000000
--- a/extra_tests/Pipfile
+++ /dev/null
@@ -1,12 +0,0 @@
-[[source]]
-url = "https://pypi.org/simple"
-verify_ssl = true
-name = "pypi"
-
-[packages]
-bytecode = "*"
-pytest = "*"
-
-[dev-packages]
-
-[requires]
diff --git a/extra_tests/requirements.txt b/extra_tests/requirements.txt
new file mode 100644
index 000000000..98105c451
--- /dev/null
+++ b/extra_tests/requirements.txt
@@ -0,0 +1,2 @@
+bytecode
+pytest
diff --git a/wasm/demo/package.json b/wasm/demo/package.json
index 46c6aa340..c87513250 100644
--- 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
index b5c592d05..2a730258c 100644
--- 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
deleted file mode 100644
index 547282c58..000000000
--- a/wasm/tests/Pipfile
+++ /dev/null
@@ -1,13 +0,0 @@
-[[source]]
-url = "https://pypi.org/simple"
-verify_ssl = true
-name = "pypi"
-
-[packages]
-pytest = "*"
-selenium = "*"
-
-[dev-packages]
-
-[requires]
-python_version = "3"
diff --git a/wasm/tests/requirements.txt b/wasm/tests/requirements.txt
new file mode 100644
index 000000000..dd98d256b
--- /dev/null
+++ b/wasm/tests/requirements.txt
@@ -0,0 +1,2 @@
+pytest
+selenium