Skip to content

Build: setuptools-related fix #455

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

Merged
merged 6 commits into from
Sep 1, 2020
Merged

Build: setuptools-related fix #455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a46882c
Build: setuptools-related fix
rafie Aug 31, 2020
316f97b
fixes 1
rafie Aug 31, 2020
563ea8d
fixes 2
rafie Aug 31, 2020
90780e1
fixes 3
rafie Aug 31, 2020
a8d9b5f
fixes 4
rafie Sep 1, 2020
b9d81f1
fixes 5
rafie Sep 1, 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
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ COPY --from=redis /usr/local/ /usr/local/
COPY ./opt/ opt/
COPY ./test/test_requirements.txt test/

RUN PIP=19.3.1 FORCE=1 ./opt/readies/bin/getpy3
RUN PIP=1 FORCE=1 ./opt/readies/bin/getpy3
RUN ./opt/system-setup.py

ARG DEPS_ARGS=""
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.gpu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ COPY --from=redis /usr/local/ /usr/local/
COPY ./opt/ opt/
COPY ./test/test_requirements.txt test/

RUN PIP=19.3.1 FORCE=1 ./opt/readies/bin/getpy3
RUN PIP=1 FORCE=1 ./opt/readies/bin/getpy3
RUN ./opt/system-setup.py

ARG DEPS_ARGS=""
Expand Down
3 changes: 1 addition & 2 deletions Dockerfile.gpu-test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ COPY --from=redis /usr/local/ /usr/local/
COPY ./opt/ opt/
COPY ./test/test_requirements.txt test/

RUN PIP=19.3.1 ./opt/readies/bin/getpy3
RUN python3 -m pip install virtualenv
RUN PIP=1 VENV=1 FORCE=1 ./opt/readies/bin/getpy3

RUN set -e ;\
python3 -m virtualenv venv --system-site-packages ;\
Expand Down
2 changes: 1 addition & 1 deletion opt/readies
Open in desktop
Submodule readies updated 4 files
+3 −0 bin/getpy2
+3 −0 bin/getpy3
+19 −0 bin/lastver
+6 −2 paella/setup.py
5 changes: 3 additions & 2 deletions opt/system-setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,16 @@ def common_first(self):
self.install_downloaders()
self.setup_pip()
self.pip_install("wheel virtualenv")
self.pip_install("setuptools --upgrade")
# if self.osnick == 'xenial':
# self.pip_install("setuptools --upgrade")
# self.pip_install("-IU --force-reinstall setuptools")

if self.os == 'linux':
self.install("ca-certificates")
self.install("git unzip wget patchelf")
self.install("coreutils") # for realpath

def debian_compat(self):
self.pip_install("-IU --force-reinstall setuptools")
self.install("gawk")
self.install("build-essential cmake")
self.install("python3-regex")
Expand Down