removed pipenv

INTO-CPS-Association · Mar 14, 2024 · ea655aa · ea655aa
1 parent 8b4540c
commit ea655aa
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 100 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -48,10 +48,6 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_VERSION }}
 
-      - name: Install Python Pipenv
-        run: |
-          python -m pip install --upgrade pip
-          python -m pip install pipenv
 
       - name: Put MSYS2_MinGW64 on PATH for windows
         if: ${{matrix.os == env.WINDOWS_VERSION }}
@@ -105,25 +101,28 @@ jobs:
       - name: Install Python Dependencies
         run: |
           cd external_tester
-          pipenv install
+          python -m pip install --upgrade pip
+         
+          if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+        
 
       - name: CLI Test
         timeout-minutes: 5
         run: |
           cd external_tester
-          pipenv run python maestro_cli_test.py --includeSlowTests
+          python maestro_cli_test.py --includeSlowTests
 
       - name: Web API Test
         timeout-minutes: 2
         run: |
           cd external_tester
-          pipenv run python webapi_test.py
+          python webapi_test.py
 
       - name: Legacy CLI Test
         timeout-minutes: 2
         run: |
           cd external_tester
-          pipenv run python cli_legacy_test.py
+          python cli_legacy_test.py
 
       #- name: Threaded Web API test
       #  timeout-minutes: 5

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -130,11 +130,6 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_VERSION }}
 
-      - name: Install Python Pipenv
-        run: |
-          python -m pip install --upgrade pip
-          python -m pip install pipenv
-
       - name: Put MSYS2_MinGW64 on PATH for windows
         if: ${{matrix.os == env.WINDOWS_VERSION }}
         # there is not yet an environment variable for this path from msys2/setup-msys2
@@ -161,25 +156,27 @@ jobs:
       - name: Install Python Dependencies
         run: |
           cd external_tester
-          pipenv install
+          python -m pip install --upgrade pip
+          
+          if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
 
       - name: CLI Test
         timeout-minutes: 5
         run: |
           cd external_tester
-          pipenv run python maestro_cli_test.py --includeSlowTests
+          python maestro_cli_test.py --includeSlowTests
 
       - name: Web API Test
         timeout-minutes: 2
         run: |
           cd external_tester
-          pipenv run python webapi_test.py
+          python webapi_test.py
 
       - name: Legacy CLI Test
         timeout-minutes: 2
         run: |
           cd external_tester
-          pipenv run python cli_legacy_test.py
+          python cli_legacy_test.py
 
 
   final:

diff --git a/external_tester/Pipfile b/external_tester/Pipfile
diff --git a/external_tester/Pipfile.lock b/external_tester/Pipfile.lock
diff --git a/external_tester/requirements.txt b/external_tester/requirements.txt
@@ -1,4 +1,4 @@
--i https://pypi.python.org/simple
+
 certifi==2021.5.30
 chardet==4.0.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
 idna==2.10; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'