diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2019-11-04 09:57:39 -0800 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-02-13 19:09:15 +0000 |
| commit | 116305f8eae5d6eec7434f55efad326956444f16 (patch) | |
| tree | 145b0a2ac4195f541dbabff9236053c79d4417c1 | |
| parent | 288e7b3b74a88e5cfa6a7fe26d52bf093e16365f (diff) | |
CI: remove six from installed packages
I didn't bump the gitlab CI version because having six wont hurt
anything, so causing the docker image to rebuild just to remove it
seemed like an annoyance; especially since it could be pulled in as a
dependency of something else anyway. However, when the image needs to be
bumped for real then six won't be installed again (explicitly).
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/piglit/merge_requests/223>
| -rw-r--r-- | .gitlab-ci/debian-install.sh | 1 | ||||
| -rw-r--r-- | appveyor.yml | 2 | ||||
| -rw-r--r-- | tox.ini | 1 |
3 files changed, 0 insertions, 4 deletions
diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh index 04980701c..0e8633247 100644 --- a/.gitlab-ci/debian-install.sh +++ b/.gitlab-ci/debian-install.sh @@ -53,7 +53,6 @@ apt-get install -y \ python3-pytest-mock \ python3-pytest-timeout \ python3-setuptools \ - python3-six \ python3-wheel \ tox \ waffle-utils diff --git a/appveyor.yml b/appveyor.yml index 56f0d5a57..55f5703a0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -51,8 +51,6 @@ install: # Setup Python 3 - set Path=%PYTHON_HOME%;%PYTHON_HOME%\Scripts;%Path% - pip --version -# Install Six -- pip install six # Install Mako - pip install Mako==1.0.6 # Install Numpy @@ -24,7 +24,6 @@ deps = pytest-pythonpath pytest-raises pytest-timeout==1.2.1 - six==1.5.2 {accel,noaccel,streams}: jsonschema streams: jsonstreams>=0.4.1 commands = |