diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b21c8b0e7..31f0eed4b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -125,7 +125,6 @@ jobs: run: | sudo pip install -U wheel pipenv pipenv install --dev - pipenv run pip install -r e2e/requirements.txt - name: Prepare Chrome node run: | cd e2e diff --git a/Pipfile b/Pipfile index 69ed42c56..5f3a4e2d3 100644 --- a/Pipfile +++ b/Pipfile @@ -56,6 +56,7 @@ pylint-django = "*" unittest-xml-reporting = "*" black = "*" selenium = "*" +docker = "*" [pipenv] allow_prereleases = true diff --git a/Pipfile.lock b/Pipfile.lock index ede50ef06..c6e9ee81b 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "541f26a45f249fb2e61a597af7be7dee51eb8b40aa1035ae4081a455168128cc" + "sha256": "e1e229f3276f2f76787b55050506f86e65579bc5aab5c7fca8caa319adb7f3d8" }, "pipfile-spec": 6, "requires": { @@ -913,6 +913,13 @@ ], "version": "==1.14.0" }, + "chardet": { + "hashes": [ + "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae", + "sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691" + ], + "version": "==3.0.4" + }, "click": { "hashes": [ "sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a", @@ -1005,6 +1012,14 @@ "index": "pypi", "version": "==2.2" }, + "docker": { + "hashes": [ + "sha256:380a20d38fbfaa872e96ee4d0d23ad9beb0f9ed57ff1c30653cbeb0c9c0964f2", + "sha256:672f51aead26d90d1cfce84a87e6f71fca401bbc2a6287be18603583620a28ba" + ], + "index": "pypi", + "version": "==4.2.1" + }, "gitdb": { "hashes": [ "sha256:91f36bfb1ab7949b3b40e23736db18231bf7593edada2ba5c3a174a7b23657ac", @@ -1174,6 +1189,14 @@ ], "version": "==2020.6.8" }, + "selenium": { + "hashes": [ + "sha256:5f5489a0c5fe2f09cc6bc3f32a0d53441ab36882c987269f2afe805979633ac1", + "sha256:a9779ddc69cf03b75d94062c5e948f763919cf3341c77272f94cd05e6b4c7b32" + ], + "index": "pypi", + "version": "==4.0.0a6.post2" + }, "six": { "hashes": [ "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259", @@ -1255,6 +1278,13 @@ "markers": null, "version": "==1.25.9" }, + "websocket-client": { + "hashes": [ + "sha256:0fc45c961324d79c781bab301359d5a1b00b13ad1b10415a4780229ef71a5549", + "sha256:d735b91d6d1692a6a181f2a8c9e0238e5f6373356f561bb9dc4c7af36f452010" + ], + "version": "==0.57.0" + }, "wrapt": { "hashes": [ "sha256:b62ffa81fb85f4332a4f609cab4ac40709470da05643a082ec1eb88e6d9b97d7" diff --git a/e2e/requirements.txt b/e2e/requirements.txt deleted file mode 100644 index c87e8eb53..000000000 --- a/e2e/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -selenium -docker diff --git a/e2e/setup.sh b/e2e/setup.sh index 7859a76e9..7eb5e4116 100755 --- a/e2e/setup.sh +++ b/e2e/setup.sh @@ -16,5 +16,4 @@ cd e2e sudo docker-compose up -d cd .. pipenv sync --dev -pipenv run pip install -r e2e/requirements.txt pipenv shell