From b20490ec04e1472a30a6cc32ec58b9ca8cd8ae1a Mon Sep 17 00:00:00 2001 From: mingxiaoh Date: Sat, 14 Apr 2018 06:16:51 +0800 Subject: [PATCH] update conda and docker files, update version to 1.0.4 --- conda/conda_build_config.yaml | 5 --- conda/meta.yaml | 22 +---------- docker/python/Dockerfile | 11 ++++++ docker/python2/Dockerfile_centos | 55 -------------------------- docker/python2/Dockerfile_ubuntu | 52 ------------------------ docker/python3/Dockerfile_centos | 68 -------------------------------- docker/python3/Dockerfile_ubuntu | 50 ----------------------- python/setup.py | 2 +- 8 files changed, 13 insertions(+), 252 deletions(-) create mode 100644 docker/python/Dockerfile delete mode 100644 docker/python2/Dockerfile_centos delete mode 100644 docker/python2/Dockerfile_ubuntu delete mode 100644 docker/python3/Dockerfile_centos delete mode 100644 docker/python3/Dockerfile_ubuntu diff --git a/conda/conda_build_config.yaml b/conda/conda_build_config.yaml index 2e43583f..27160cc4 100644 --- a/conda/conda_build_config.yaml +++ b/conda/conda_build_config.yaml @@ -1,12 +1,7 @@ -protobuf: - - 3.4.1 numpy: - 1.13 pin_run_as_build: - protobuf: - min_pin: x.x - max_pin: x.x numpy: min_pin: x.x max_pin: x.x diff --git a/conda/meta.yaml b/conda/meta.yaml index 57d161dd..ea16c497 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.0.3" %} +{% set version = "1.0.4" %} package: name: ideep4py @@ -13,31 +13,11 @@ build: requirements: build: - - cmake - - git - - curl - - pcre - - setuptools - numpy - - gflags - - opencv - python - - protobuf - - six - - openssl run: - - cmake - - git - - curl - - pcre - - setuptools - numpy - - gflags - - opencv - - protobuf - python - - six - - openssl test: imports: diff --git a/docker/python/Dockerfile b/docker/python/Dockerfile new file mode 100644 index 00000000..f39b0591 --- /dev/null +++ b/docker/python/Dockerfile @@ -0,0 +1,11 @@ +FROM ubuntu:16.04 + +RUN apt-get update -y && \ + apt-get install -y --no-install-recommends \ + python-dev \ + python-pip \ + python-wheel \ + python-setuptools && \ + rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/* + +RUN pip install ideep4py diff --git a/docker/python2/Dockerfile_centos b/docker/python2/Dockerfile_centos deleted file mode 100644 index b3427676..00000000 --- a/docker/python2/Dockerfile_centos +++ /dev/null @@ -1,55 +0,0 @@ -FROM centos:7 - -USER root - -RUN yum -y install epel-release &&\ - yum upgrade -y - -RUN yum install -y \ - redhat-rpm-config \ - cmake \ - git \ - wget \ - ssh \ - gcc-c++ \ - boost-devel \ - gflags-devel \ - glog-devel \ - hdf5-devel \ - opencv-devel \ - protobuf-devel \ - liblapack-dev \ - libssl-dev \ - protobuf-compiler \ - python-devel \ - python-numpy \ - python-pip \ - python-setuptools \ - openssl \ - gcc-gfortran \ - pcre \ - pcre-devel - -RUN yum clean all - - -RUN mkdir Downloads && \ - cd Downloads && \ - wget https://nchc.dl.sourceforge.net/project/swig/swig/swig-3.0.12/swig-3.0.12.tar.gz && \ - tar -xf swig-3.0.12.tar.gz && \ - cd swig-3.0.12/ && \ - ./configure && \ - make -j && \ - make install && \ - cd ../../ - - -RUN pip install --default-timeout=10000 six \ - h5py \ - nose \ - protobuf \ - Pillow \ - filelock - - -RUN pip install ideep4py diff --git a/docker/python2/Dockerfile_ubuntu b/docker/python2/Dockerfile_ubuntu deleted file mode 100644 index 290675fe..00000000 --- a/docker/python2/Dockerfile_ubuntu +++ /dev/null @@ -1,52 +0,0 @@ -FROM ubuntu:16.04 - - -RUN apt-get update -y && \ - apt-get install -y --no-install-recommends \ - build-essential \ - cmake \ - git \ - wget \ - vim \ - ssh \ - libboost-all-dev \ - libgflags-dev \ - libgoogle-glog-dev \ - libhdf5-serial-dev \ - libopencv-dev \ - libprotobuf-dev \ - liblapack-dev \ - libssl-dev \ - protobuf-compiler \ - python-dev \ - python-numpy \ - python-pip \ - python-setuptools \ - openssl \ - curl && \ - rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/* - - -RUN mkdir Downloads && \ - cd Downloads && \ - wget https://nchc.dl.sourceforge.net/project/swig/swig/swig-3.0.12/swig-3.0.12.tar.gz && \ - tar -xf swig-3.0.12.tar.gz && \ - cd swig-3.0.12/ && \ - ./configure && \ - make -j && \ - make install && \ - cd ../../ - -RUN pip install --upgrade pip setuptools - -RUN pip install --default-timeout=10000 wheel \ - six \ - h5py \ - nose \ - protobuf \ - Pillow \ - filelock \ - distribute - - -RUN pip install ideep4py diff --git a/docker/python3/Dockerfile_centos b/docker/python3/Dockerfile_centos deleted file mode 100644 index f798136c..00000000 --- a/docker/python3/Dockerfile_centos +++ /dev/null @@ -1,68 +0,0 @@ -FROM centos:7 - -USER root - - -RUN yum -y install epel-release &&\ - yum upgrade -y - -RUN yum install -y \ - redhat-rpm-config \ - cmake \ - git \ - wget \ - ssh \ - gcc-c++ \ - boost-devel \ - gflags-devel \ - glog-devel \ - hdf5-devel \ - protobuf-devel \ - liblapack-dev \ - libssl-dev \ - protobuf-compiler \ - openssl \ - openssl-devel \ - bzip2-devel \ - expat-devel \ - gdbm-devel \ - readline-devel \ - sqlite-devel \ - gcc-gfortran \ - pcre \ - pcre-devel \ - -RUN yum clean all - - -RUN mkdir Downloads && \ - cd Downloads && \ - wget https://www.python.org/ftp/python/3.5.2/Python-3.5.2.tgz && \ - tar -zxvf Python-3.5.2.tgz && \ - cd Python-3.5.2 && \ - ./configure --prefix=/usr/local/python3.5 --enable-optimizations && \ - make -j && \ - make install && \ - ln -s /usr/local/python3.5/bin/python3 /usr/bin/python3 && \ - ln -s /usr/local/python3.5/bin/pip3.5 /usr/bin/pip3 && \ - cd ../ - - -RUN wget https://nchc.dl.sourceforge.net/project/swig/swig/swig-3.0.12/swig-3.0.12.tar.gz && \ - tar -xf swig-3.0.12.tar.gz && \ - cd swig-3.0.12/ && \ - ./configure && \ - make -j && \ - make install && \ - cd ../../ - - -RUN pip3 install --default-timeout=10000 six \ - h5py \ - nose \ - protobuf \ - Pillow \ - filelock - - -RUN pip3 install ideep4py diff --git a/docker/python3/Dockerfile_ubuntu b/docker/python3/Dockerfile_ubuntu deleted file mode 100644 index 2933eb69..00000000 --- a/docker/python3/Dockerfile_ubuntu +++ /dev/null @@ -1,50 +0,0 @@ -FROM ubuntu:16.04 - - -RUN apt-get update -y && \ - apt-get install -y --no-install-recommends \ - build-essential \ - cmake \ - git \ - wget \ - ssh \ - libboost-all-dev \ - libgflags-dev \ - libgoogle-glog-dev \ - libhdf5-serial-dev \ - libopencv-dev \ - libprotobuf-dev \ - liblapack-dev \ - libssl-dev \ - protobuf-compiler \ - python3-dev \ - python3-numpy \ - python3-pip \ - python3-setuptools \ - openssl \ - curl && \ - rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/* - -RUN mkdir Downloads && \ - cd Downloads && \ - wget https://nchc.dl.sourceforge.net/project/swig/swig/swig-3.0.12/swig-3.0.12.tar.gz && \ - tar -xf swig-3.0.12.tar.gz && \ - cd swig-3.0.12/ && \ - ./configure && \ - make -j && \ - make install && \ - cd ../../ - -RUN pip3 install --upgrade pip setuptools - -RUN pip3 install --default-timeout=10000 wheel \ - six \ - h5py \ - nose \ - protobuf \ - Pillow \ - filelock \ - distribute - - -RUN pip3 install ideep4py diff --git a/python/setup.py b/python/setup.py index f93c547b..9c704362 100644 --- a/python/setup.py +++ b/python/setup.py @@ -167,7 +167,7 @@ def run(self): setup( name='ideep4py', - version='1.0.3', + version='1.0.4', description='ideep4py is a wrapper for iDeep library.', author='Intel', author_email='',