Skip to content

Commit b20490e

Browse files
author
mingxiaoh
committed
update conda and docker files, update version to 1.0.4
1 parent c3cc805 commit b20490e

File tree

8 files changed

+13
-252
lines changed

8 files changed

+13
-252
lines changed

conda/conda_build_config.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
1-
protobuf:
2-
- 3.4.1
31
numpy:
42
- 1.13
53

64
pin_run_as_build:
7-
protobuf:
8-
min_pin: x.x
9-
max_pin: x.x
105
numpy:
116
min_pin: x.x
127
max_pin: x.x

conda/meta.yaml

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% set version = "1.0.3" %}
1+
{% set version = "1.0.4" %}
22

33
package:
44
name: ideep4py
@@ -13,31 +13,11 @@ build:
1313

1414
requirements:
1515
build:
16-
- cmake
17-
- git
18-
- curl
19-
- pcre
20-
- setuptools
2116
- numpy
22-
- gflags
23-
- opencv
2417
- python
25-
- protobuf
26-
- six
27-
- openssl
2818
run:
29-
- cmake
30-
- git
31-
- curl
32-
- pcre
33-
- setuptools
3419
- numpy
35-
- gflags
36-
- opencv
37-
- protobuf
3820
- python
39-
- six
40-
- openssl
4121

4222
test:
4323
imports:

docker/python/Dockerfile

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
FROM ubuntu:16.04
2+
3+
RUN apt-get update -y && \
4+
apt-get install -y --no-install-recommends \
5+
python-dev \
6+
python-pip \
7+
python-wheel \
8+
python-setuptools && \
9+
rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
10+
11+
RUN pip install ideep4py

docker/python2/Dockerfile_centos

Lines changed: 0 additions & 55 deletions
This file was deleted.

docker/python2/Dockerfile_ubuntu

Lines changed: 0 additions & 52 deletions
This file was deleted.

docker/python3/Dockerfile_centos

Lines changed: 0 additions & 68 deletions
This file was deleted.

docker/python3/Dockerfile_ubuntu

Lines changed: 0 additions & 50 deletions
This file was deleted.

python/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ def run(self):
167167

168168
setup(
169169
name='ideep4py',
170-
version='1.0.3',
170+
version='1.0.4',
171171
description='ideep4py is a wrapper for iDeep library.',
172172
author='Intel',
173173
author_email='',

0 commit comments

Comments
 (0)