Skip to content

Commit 024155e

Browse files
author
Franck Chauvel
committed
Config: Update dependencies for Docker image
- Debian 9 to Debian 10 - Python 3.5 to Python 3.7
1 parent 5489718 commit 024155e

File tree

4 files changed

+22
-7
lines changed

4 files changed

+22
-7
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
sed -ir "s/COMMIT_HASH = None/COMMIT_HASH = \"${CIRCLE_SHA1}\"/I" camp/__init__.py
1111
- run: |
1212
docker build --no-cache \
13-
--build-arg PYTHON_VERSION=3.5 \
13+
--build-arg PYTHON_VERSION=3.7 \
1414
--build-arg WITH_TESTS=--camp-with-tests \
1515
--build-arg Z3_VERSION=4.8.6 \
1616
--build-arg Z3_PLATFORM=x64-ubuntu-16.04 \

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
# of the MIT license. See the LICENSE file for details.
99
#
1010

11-
FROM debian:9-slim
11+
FROM debian:10-slim
1212

1313

1414
ARG DEBUG
15-
ARG PYTHON_VERSION=3.5
15+
ARG PYTHON_VERSION=3.7
1616
ARG WITH_TESTS
1717
ARG Z3_VERSION=4.8.4.d6df51951f4c
1818
ARG Z3_PLATFORM=x64-debian-8.11

docs/pages/changelog.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,17 @@ changes that were made.
1818
now specified using the option `--mode|-m [MODE]`, where
1919
`MODE` can be either of `all`, `covering` or `atomic`.
2020

21+
* Update dependencies:
22+
23+
* future 0.18.2
24+
* pyyaml 5.3.1
25+
* argparse 1.4.0
26+
* mock 4.0.2
27+
* deepdiff 4.3.2
28+
* green 3.2.0
29+
* Python 3.7 (Docker image)
30+
* Debian 10 (Docker image)
31+
2132
* CAMP v0.9
2233

2334
* CAMP v0.9.0 (Nov. 19, 2019)

install.sh

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ set -o nounset
88
DEBUG=false
99
LOG_FILE=install.log
1010

11+
# PIP Options to avoid SSL errors
12+
PIP_SSL_OPTIONS='--trusted-host pypi.org --trusted-host pypi.python.org --trusted-host files.pythonhosted.org'
13+
1114
# Default parameters values
1215

1316
PYTHON_VERSION=3.5
@@ -243,11 +246,12 @@ ensure_pip_available() {
243246
local -r PIP_VERSION="19.0.3"
244247
if ! type pip >> ${LOG_FILE} 2>&1;
245248
then
249+
install_packages python3-distutils
246250
ensure_curl_available
247251
printf "Installing Pip ${PIP_VERSION}.\n";
248252
local -r PIP_INSTALLER_URL=https://bootstrap.pypa.io/get-pip.py
249253
\curl -sS -L -k -O ${PIP_INSTALLER_URL};
250-
python get-pip.py -qq pip==$PIP_VERSION;
254+
python3 get-pip.py ${PIP_SSL_OPTIONS} -qq pip==$PIP_VERSION;
251255
rm get-pip.py
252256

253257
else
@@ -332,14 +336,14 @@ ensure_CAMP_available() {
332336

333337
if [[ "${CAMP_FROM_SOURCES}" == "true" ]]
334338
then
335-
pip install --upgrade setuptools >> ${LOG_FILE} 2>&1
336-
pip install .${CAMP_WITH_TESTS} >> ${LOG_FILE} 2>&1
339+
pip install ${PIP_SSL_OPTIONS} --upgrade setuptools >> ${LOG_FILE} 2>&1;
340+
pip install ${PIP_SSL_OPTIONS} .${CAMP_WITH_TESTS} >> ${LOG_FILE} 2>&1;
337341

338342
else
339343
local -r GITHUB_URL="https://github.com/STAMP-project/camp.git@%s#egg=camp"
340344
local -r CAMP_URL=$(printf ${GITHUB_URL} ${CAMP_VERSION})
341345

342-
pip install git+${CAMP_URL} >> ${LOG_FILE} 2>&1
346+
pip install ${PIP_SSL_OPTIONS} git+${CAMP_URL} >> ${LOG_FILE} 2>&1;
343347
if [ $? -eq 0 ]; then
344348
printf "CAMP (%s) ready.\n" "${CAMP_VERSION}"
345349
else

0 commit comments

Comments
 (0)