Update to 2020.0

.travis.yml

@@ -3,8 +3,6 @@ language: python
 # We use env to test the configurations in parallel. 
 # Add new configurations here
 env:
-        - IDP_CONF=intelpython2_core
-        - IDP_CONF=intelpython2_full
         - IDP_CONF=intelpython3_core
         - IDP_CONF=intelpython3_full
 

LICENSE

@@ -1 +1,3 @@
-See https://software.intel.com/en-us/license/intel-simplified-software-license
+By downloading and using this container and the included software, you 
+agree to the terms and conditions of the software license agreements located 
+at: https://software.intel.com/en-us/license/intel-simplified-software-license

configs/intelpython3_core/Dockerfile

@@ -23,15 +23,15 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-FROM continuumio/miniconda3:4.5.4
+FROM continuumio/miniconda3:4.7.12
 MAINTAINER Robert Cohn <Robert.S.Cohn@intel.com>
 
 # This file is automatically generated from tpl.Dockerfile
 
 ENV ACCEPT_INTEL_PYTHON_EULA=yes
 
 RUN conda config --add channels intel\
-    && conda install  -y -q intelpython3_core=2019.4 python=3 \
+    && conda install  -y -q intelpython3_core=2020.0 python=3 \
     && conda clean --all \
     && apt-get update -qqq \
     && apt-get install -y -q g++ \

configs/intelpython3_core/README.md

@@ -4,14 +4,12 @@ The image defaults to starting with a bash shell. Intel Python is on the path. T
 
 Images:
 
-* intelpython2_core
-* intelpython2_full
 * intelpython3_core
 * intelpython3_full
 
 You usually want the 'latest' tag, but the docker image tag can be used to request a specific package. For example:
 
-        docker pull intelpython2_core:2017.0.3-1
+        docker pull intelpython3_core:2017.0.3-1
 
 Will get an image that uses the conda package: intelpython3_core-2017.0.3-1
 
@@ -30,4 +28,4 @@ Tags:
 * 2017.0.3-0
 * 2017.0.2-0, 2017.0.2
 * 2017.0.1-1, 2017.0.1
-* 2017.0.0-2, 2017.0.0
+* 2017.0.0-2, 2017.0.0

configs/intelpython3_core/hooks/post_push

@@ -1,7 +1,7 @@
 #! /bin/bash
 
-docker tag $DOCKER_REPO:$DOCKER_TAG $DOCKER_REPO:2019.4
-docker push $DOCKER_REPO:2019.4
+docker tag $DOCKER_REPO:$DOCKER_TAG $DOCKER_REPO:2020.0
+docker push $DOCKER_REPO:2020.0
 
 docker tag $DOCKER_REPO:$DOCKER_TAG $DOCKER_REPO:latest
 docker push $DOCKER_REPO:latest

configs/intelpython3_full/Dockerfile

@@ -23,15 +23,15 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-FROM continuumio/miniconda3:4.5.4
+FROM continuumio/miniconda3:4.7.12
 MAINTAINER Robert Cohn <Robert.S.Cohn@intel.com>
 
 # This file is automatically generated from tpl.Dockerfile
 
 ENV ACCEPT_INTEL_PYTHON_EULA=yes
 
 RUN conda config --add channels intel\
-    && conda install  -y -q intelpython3_full=2019.4 python=3 \
+    && conda install  -y -q intelpython3_full=2020.0 python=3 \
     && conda clean --all \
     && apt-get update -qqq \
     && apt-get install -y -q g++ \

configs/intelpython3_full/hooks/post_push

@@ -1,7 +1,7 @@
 #! /bin/bash
 
-docker tag $DOCKER_REPO:$DOCKER_TAG $DOCKER_REPO:2019.4
-docker push $DOCKER_REPO:2019.4
+docker tag $DOCKER_REPO:$DOCKER_TAG $DOCKER_REPO:2020.0
+docker push $DOCKER_REPO:2020.0
 
 docker tag $DOCKER_REPO:$DOCKER_TAG $DOCKER_REPO:latest
 docker push $DOCKER_REPO:latest

images.py

@@ -80,7 +80,7 @@ def __init__(self,pyver=None,package=None,build_number=None,name=None):
         self['package'] = package
         # github tag & docker tag is update_number-build_number, e.g. 2017.0.1-1
         # conda package spec is update_number=build_number, e.g. intelpython2_core=2017.0.1=1
-        self['update_number'] = '2019.4'
+        self['update_number'] = '2020.0'
         if build_number:
             self['build_number'] = '=' + str(build_number)
 
@@ -104,9 +104,7 @@ def test(self):
         subprocess.check_call(cmd, shell=True)
 
 # Add new configurations here
-all_confs = [Conf(2,'core',0),
-             Conf(2,'full',0),
-             Conf(3,'core',0),
+all_confs = [Conf(3,'core',0),
              Conf(3,'full',0)
 ]
 

tpls/tpl.README.md

@@ -4,20 +4,20 @@ The image defaults to starting with a bash shell. Intel Python is on the path. T
 
 Images:
 
-* intelpython2_core
-* intelpython2_full
 * intelpython3_core
 * intelpython3_full
 
 You usually want the 'latest' tag, but the docker image tag can be used to request a specific package. For example:
 
-        docker pull intelpython2_core:2017.0.3-1
+        docker pull intelpython3_core:2017.0.3-1
 
 Will get an image that uses the conda package: intelpython3_core-2017.0.3-1
 
 Tags:
 
-* 2019.4, latest
+* 2020.0
+* 2019.5
+* 2019.4
 * 2019.3
 * 2019.1-0
 * 2019.0.0-0b, 2019.0.0-0a, 2019.0.0-0, 2019.0.0