update conda and docker files, update version to 1.0.4

intel · Apr 13, 2018 · b20490e · b20490e
1 parent c3cc805
commit b20490e
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 252 deletions.
diff --git 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
@@ -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
@@ -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
diff --git a/docker/python2/Dockerfile_ubuntu b/docker/python2/Dockerfile_ubuntu
diff --git a/docker/python3/Dockerfile_centos b/docker/python3/Dockerfile_centos
diff --git a/docker/python3/Dockerfile_ubuntu b/docker/python3/Dockerfile_ubuntu
diff --git 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='',