Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix failing jobs #81

Merged
merged 3 commits into from
Aug 14, 2020
Merged

Fix failing jobs #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f397011
Ignore installed distlib 0.3.0
radarhere Aug 14, 2020
14049a1
Upgrade setuptools
radarhere Aug 14, 2020
8bc5a7b
Archived Python 3.5 jobs
radarhere Aug 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,10 @@ matrix:
env: DOCKER="fedora-31-amd64"
- name: "fedora-32-amd64 stable"
env: DOCKER="fedora-32-amd64"
- name: "ubuntu-16.04-xenial-amd64 stable"
env: DOCKER="ubuntu-16.04-xenial-amd64"
- name: "ubuntu-18.04-bionic-amd64 stable"
env: DOCKER="ubuntu-18.04-bionic-amd64"
- name: "ubuntu-20.04-focal-amd64 stable"
env: DOCKER="ubuntu-20.04-focal-amd64"
- name: "debian-9-stretch-x86 stable"
env: DOCKER="debian-9-stretch-x86"
- name: "debian-10-buster-x86 stable"
env: DOCKER="debian-10-buster-x86"
- name: "alpine latest"
Expand All @@ -53,14 +49,10 @@ matrix:
env: DOCKER="fedora-31-amd64" LATEST="true"
- name: "fedora-32-amd64 latest"
env: DOCKER="fedora-32-amd64" LATEST="true"
- name: "ubuntu-16.04-xenial-amd64 latest"
env: DOCKER="ubuntu-16.04-xenial-amd64" LATEST="true"
- name: "ubuntu-18.04-bionic-amd64 latest"
env: DOCKER="ubuntu-18.04-bionic-amd64" LATEST="true"
- name: "ubuntu-20.04-focal-amd64 latest"
env: DOCKER="ubuntu-20.04-focal-amd64" LATEST="true"
- name: "debian-9-stretch-x86 latest"
env: DOCKER="debian-9-stretch-x86" LATEST="true"
- name: "debian-10-buster-x86 latest"
env: DOCKER="debian-10-buster-x86" LATEST="true"
install:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
TARGETS = alpine arch amazon-1-amd64 amazon-2-amd64 ubuntu-16.04-xenial-amd64 ubuntu-18.04-bionic-amd64 ubuntu-20.04-focal-amd64 debian-9-stretch-x86 debian-10-buster-x86 fedora-31-amd64 fedora-32-amd64 centos-6-amd64 centos-7-amd64 centos-8-amd64
TARGETS = alpine arch amazon-1-amd64 amazon-2-amd64 ubuntu-18.04-bionic-amd64 ubuntu-20.04-focal-amd64 debian-10-buster-x86 fedora-31-amd64 fedora-32-amd64 centos-6-amd64 centos-7-amd64 centos-8-amd64


BUILDDIRS = $(TARGETS:%=build-%)
Expand Down
3 changes: 2 additions & 1 deletion alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@ ADD depends /depends
RUN cd /depends && ./install_webp.sh && ./install_imagequant.sh && ./install_raqm.sh

RUN /usr/sbin/adduser -D pillow && \
pip3 install virtualenv && virtualenv /vpy3 && \
pip3 install -I virtualenv && virtualenv /vpy3 && \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

    -I                    don't match patterns in binary files

What exactly is this doing?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The longer version of the flag is '--ignore-installed' - https://stackoverflow.com/q/51913361/4093019

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, thanks. The above was the help text for grep, I searched my console for -i and got the wrong one!

Real one:

  -I, --ignore-installed      Ignore the installed packages, overwriting them. This can break your system if the existing package is
                              of a different version or was installed with a different package manager!

/vpy3/bin/pip install --upgrade pip && \
/vpy3/bin/pip install --upgrade setuptools>=49.3.2 && \
/vpy3/bin/pip install olefile pytest pytest-cov && \
/vpy3/bin/pip install numpy --only-binary=:all: || true && \
chown -R pillow:pillow /vpy3
Expand Down
1 change: 1 addition & 0 deletions amazon-2-amd64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ RUN useradd --uid 1000 pillow
RUN bash -c "/usr/bin/pip3 install virtualenv && \
/usr/bin/python3 -mvirtualenv -p /usr/bin/python3 --system-site-packages /vpy3 && \
/vpy3/bin/pip install --upgrade pip && \
/vpy3/bin/pip install --upgrade setuptools>=49.3.2 && \
/vpy3/bin/pip install cffi olefile pytest pytest-cov && \
/vpy3/bin/pip install numpy --only-binary=:all: || true && \
chown -R pillow:pillow /vpy3"
Expand Down
0 debian-9-stretch-x86/Dockerfile → archive/debian-9-stretch-x86/Dockerfile
View file
Open in desktop
File renamed without changes.
0 debian-9-stretch-x86/LICENSE → archive/debian-9-stretch-x86/LICENSE
View file
Open in desktop
File renamed without changes.
0 debian-9-stretch-x86/Makefile → archive/debian-9-stretch-x86/Makefile
View file
Open in desktop
File renamed without changes.
0 debian-9-stretch-x86/README.txt → archive/debian-9-stretch-x86/README.txt
View file
Open in desktop
File renamed without changes.
0 debian-9-stretch-x86/test.sh → archive/debian-9-stretch-x86/test.sh
View file
Open in desktop
File renamed without changes.
0 debian-9-stretch-x86/update.sh → archive/debian-9-stretch-x86/update.sh
View file
Open in desktop
File renamed without changes.
0 ubuntu-16.04-xenial-amd64/Dockerfile → archive/ubuntu-16.04-xenial-amd64/Dockerfile
View file
Open in desktop
File renamed without changes.
0 ubuntu-16.04-xenial-amd64/Makefile → archive/ubuntu-16.04-xenial-amd64/Makefile
View file
Open in desktop
File renamed without changes.
0 ubuntu-16.04-xenial-amd64/test.sh → archive/ubuntu-16.04-xenial-amd64/test.sh
View file
Open in desktop
File renamed without changes.
0 ubuntu-16.04-xenial-amd64/update.sh → archive/ubuntu-16.04-xenial-amd64/update.sh
View file
Open in desktop
File renamed without changes.