diff options
| author | Mike Taves <mwtoews@gmail.com> | 2021-02-07 23:04:39 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-07 23:04:39 +1300 |
| commit | af7cbf0ad119d20813c242420d345c484995cd98 (patch) | |
| tree | 12c6e8c75381fdebcd3aeea5912075f10c8f935d | |
| parent | db2950e56ea26a0949b71378d73559a16fc40f26 (diff) | |
| download | PROJ-af7cbf0ad119d20813c242420d345c484995cd98.tar.gz PROJ-af7cbf0ad119d20813c242420d345c484995cd98.zip | |
CI: specify pip < 21.0; avoid using pip3 script (#2516)
| -rwxr-xr-x | .github/workflows/clang_linux/start.sh | 2 | ||||
| -rwxr-xr-x | .github/workflows/linux_gcc_32bit/start.sh | 2 | ||||
| -rwxr-xr-x | .github/workflows/linux_gcc_4_8/start.sh | 10 | ||||
| -rw-r--r-- | docs/docbuild/Dockerfile | 2 | ||||
| -rwxr-xr-x | travis/before_install_pip.sh | 8 |
5 files changed, 12 insertions, 12 deletions
diff --git a/.github/workflows/clang_linux/start.sh b/.github/workflows/clang_linux/start.sh index 83d2f8c2..a2b6c631 100755 --- a/.github/workflows/clang_linux/start.sh +++ b/.github/workflows/clang_linux/start.sh @@ -7,7 +7,7 @@ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ sudo autoconf automake libtool clang++-10 python3-clang-10 make cmake ccache pkg-config tar zip \ sqlite3 libsqlite3-dev libtiff-dev libcurl4-openssl-dev jq python3-pip -pip3 install --user jsonschema +python3 -m pip install --user jsonschema cd "$WORK_DIR" diff --git a/.github/workflows/linux_gcc_32bit/start.sh b/.github/workflows/linux_gcc_32bit/start.sh index ef12e2b5..81f1dc39 100755 --- a/.github/workflows/linux_gcc_32bit/start.sh +++ b/.github/workflows/linux_gcc_32bit/start.sh @@ -18,7 +18,7 @@ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends -o AP libsqlite3-dev:$ARCH libtiff-dev:$ARCH libcurl4-openssl-dev:$ARCH \ jq -pip3 install --user jsonschema +python3 -m pip install --user jsonschema export PATH=$HOME/.local/bin:$PATH export CXXFLAGS='-g -O2 -m32 -D_GLIBCXX_ASSERTIONS' diff --git a/.github/workflows/linux_gcc_4_8/start.sh b/.github/workflows/linux_gcc_4_8/start.sh index 2493ea1a..eb03d78d 100755 --- a/.github/workflows/linux_gcc_4_8/start.sh +++ b/.github/workflows/linux_gcc_4_8/start.sh @@ -15,11 +15,11 @@ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ libsqlite3-dev libtiff-dev libcurl4-openssl-dev \ jq lcov -pip3 install --user --upgrade pip -echo `pip3 --version` -pip3 config --user set global.progress_bar off -pip3 install --user jsonschema -pip3 install --user cmake==3.9.6 +python3 -m pip install --user --upgrade "pip < 21.0" +echo `python3 -m pip --version` +python3 -m pip config --user set global.progress_bar off +python3 -m pip install --user jsonschema +python3 -m pip install --user cmake==3.9.6 export PATH=$HOME/.local/bin:$PATH diff --git a/docs/docbuild/Dockerfile b/docs/docbuild/Dockerfile index 4f726930..95841d9c 100644 --- a/docs/docbuild/Dockerfile +++ b/docs/docbuild/Dockerfile @@ -6,7 +6,7 @@ RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ texlive-latex-extra git latex-cjk-all texlive-lang-all \ graphviz python3-matplotlib wget unzip enchant -RUN pip3 install Sphinx breathe \ +RUN python3 -m pip install Sphinx breathe \ sphinx_bootstrap_theme awscli sphinxcontrib-bibtex \ sphinx_rtd_theme recommonmark sphinx-markdown-tables \ sphinxcontrib-spelling diff --git a/travis/before_install_pip.sh b/travis/before_install_pip.sh index 30a7f767..3685bbf7 100755 --- a/travis/before_install_pip.sh +++ b/travis/before_install_pip.sh @@ -4,7 +4,7 @@ # "global" before_install script. # Configure Python pip -pip3 install --user --upgrade pip -echo `pip3 --version` -pip3 config --user set global.progress_bar off -pip3 install --user jsonschema +python3 -m pip install --user --upgrade "pip < 21.0" +echo `python3 -m pip --version` +python3 -m pip config --user set global.progress_bar off +python3 -m pip install --user jsonschema |