diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 1acdd866..32784f38 100644 --- 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 index f114598a..f84e7841 100644 --- 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 deleted file mode 100644 index 6cdb038b..00000000 --- a/external_tester/Pipfile +++ /dev/null @@ -1,13 +0,0 @@ -[[source]] -url = "https://pypi.python.org/simple" -verify_ssl = true -name = "pypi" - -[packages] -requests = "*" -websocket-client = "*" - -[dev-packages] - -[requires] -python_version = "3.9" diff --git a/external_tester/Pipfile.lock b/external_tester/Pipfile.lock deleted file mode 100644 index 4564385c..00000000 --- a/external_tester/Pipfile.lock +++ /dev/null @@ -1,69 +0,0 @@ -{ - "_meta": { - "hash": { - "sha256": "a932d33a44a4bd1a6c3a7a8d8dcb1a421a8a3f38a8be68eab4ee9bc9c89a5adb" - }, - "pipfile-spec": 6, - "requires": { - "python_version": "3.9" - }, - "sources": [ - { - "name": "pypi", - "url": "https://pypi.python.org/simple", - "verify_ssl": true - } - ] - }, - "default": { - "certifi": { - "hashes": [ - "sha256:2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee", - "sha256:50b1e4f8446b06f41be7dd6338db18e0990601dce795c2b1686458aa7e8fa7d8" - ], - "version": "==2021.5.30" - }, - "chardet": { - "hashes": [ - "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa", - "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5" - ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", - "version": "==4.0.0" - }, - "idna": { - "hashes": [ - "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6", - "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0" - ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", - "version": "==2.10" - }, - "requests": { - "hashes": [ - "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804", - "sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e" - ], - "index": "pypi", - "version": "==2.25.1" - }, - "urllib3": { - "hashes": [ - "sha256:34b97092d7e0a3a8cf7cd10e386f401b3737364026c45e622aa02903dffe0f07", - "sha256:f8ecc1bba5667413457c529ab955bf8c67b45db799d159066261719e328580a0" - ], - "index": "pypi", - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'", - "version": "==1.26.18" - }, - "websocket-client": { - "hashes": [ - "sha256:b68e4959d704768fa20e35c9d508c8dc2bbc041fd8d267c0d7345cffe2824568", - "sha256:e5c333bfa9fa739538b652b6f8c8fc2559f1d364243c8a689d7c0e1d41c2e611" - ], - "index": "pypi", - "version": "==1.1.0" - } - }, - "develop": {} -} diff --git a/external_tester/requirements.txt b/external_tester/requirements.txt index 0fd49de5..cf37c469 100644 --- 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'