Skip to content

Commit a0c33ad

Browse files
elsanderStephen Hoover
authored andcommitted
MAINT update ubuntu version and version in ENV (civisanalytics#67)
Update ubuntu version and version in ENV. Explicitly install locales package, and move local environment variable setting to after `locales` installation.
1 parent 6ba7ebc commit a0c33ad

File tree

3 files changed

+22
-19
lines changed

3 files changed

+22
-19
lines changed

.circleci/config.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ jobs:
2424
- run:
2525
name: Check that numpy imports from bash shell
2626
command: docker run -t ds-python /bin/bash -c "python -c 'import numpy'"
27+
- run:
28+
name: Check that tensorflow imports from bash shell
29+
command: docker run ds-python /bin/bash -c "python -c 'import tensorflow'"
2730
- run:
2831
name: Verify that numpy does not link to MKL
2932
command: docker run ds-python python -c "from numpy.distutils import system_info; assert system_info.get_info('mkl') == {}"

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Version number changes (major.minor.micro) in this package denote the following:
1111

1212
## [5.0.0] - 2019-03-12
1313
### Changed
14+
- Ubuntu 14.04 -> 18.04 (#67)
1415
- python 3.6.4 -> 3.7.1
1516
- conda 4.3.30 -> 4.6.8
1617

@@ -61,9 +62,9 @@ Version number changes (major.minor.micro) in this package denote the following:
6162
- requests-toolbelt 0.8.0 -> 0.9.1
6263
- tensorflow 1.7.0 -> 1.13.1
6364

64-
6565
### Maintenance
6666
- Update CircleCI config to v2 (#62).
67+
- Test that tensorflow imports successfully (#67).
6768

6869
## [4.2.0] - 2018-04-26
6970
### Package Updates

Dockerfile

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,9 @@
1-
FROM ubuntu:14.04
1+
FROM ubuntu:18.04
22
MAINTAINER support@civisanalytics.com
33

4-
# Ensure UTF-8 locale.
5-
RUN locale-gen en_US.UTF-8
6-
7-
# Set environment variables for UTF-8, conda, and shell environments
8-
ENV LANG=en_US.UTF-8 \
9-
LANGUAGE=en_US:en \
10-
LC_ALL=en_US.UTF-8 \
11-
CONDARC=/opt/conda/.condarc \
12-
BASH_ENV=/etc/profile \
13-
PATH=/opt/conda/bin:$PATH \
14-
CIVIS_MINICONDA_VERSION=4.5.12 \
15-
CIVIS_CONDA_VERSION=4.6.8 \
16-
CIVIS_PYTHON_VERSION=3.7.1
17-
184
RUN DEBIAN_FRONTEND=noninteractive apt-get update -y --no-install-recommends && \
5+
apt-get install -y --no-install-recommends locales && \
6+
locale-gen en_US.UTF-8 && \
197
apt-get install -y --no-install-recommends software-properties-common && \
208
apt-get install -y --no-install-recommends \
219
make \
@@ -34,6 +22,17 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -y --no-install-recommends &&
3422
apt-get clean -y && \
3523
rm -rf /var/lib/apt/lists/*
3624

25+
# Set environment variables for UTF-8, conda, and shell environments
26+
ENV LANG=en_US.UTF-8 \
27+
LANGUAGE=en_US:en \
28+
LC_ALL=en_US.UTF-8 \
29+
CONDARC=/opt/conda/.condarc \
30+
BASH_ENV=/etc/profile \
31+
PATH=/opt/conda/bin:$PATH \
32+
CIVIS_MINICONDA_VERSION=4.5.12 \
33+
CIVIS_CONDA_VERSION=4.6.8 \
34+
CIVIS_PYTHON_VERSION=3.7.1
35+
3736
# Conda install.
3837
#
3938
# Everything is installed in the root environment. This allows for
@@ -107,7 +106,7 @@ RUN jupyter nbextension enable --py widgetsnbextension
107106
# https://github.com/joblib/joblib/blob/0.11/joblib/parallel.py#L328L342
108107
ENV JOBLIB_TEMP_FOLDER=/tmp
109108

110-
ENV VERSION=4.2.0 \
111-
VERSION_MAJOR=4 \
112-
VERSION_MINOR=2 \
109+
ENV VERSION=5.0.0 \
110+
VERSION_MAJOR=5 \
111+
VERSION_MINOR=0 \
113112
VERSION_MICRO=0

0 commit comments

Comments
 (0)