Skip to content

Commit

Permalink
Update version 0.0.24
Browse files Browse the repository at this point in the history
  • Loading branch information
knjcode committed May 23, 2019
1 parent 487c0a2 commit ed0f798
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 16 deletions.
7 changes: 4 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.6.6-slim-stretch
FROM python:3.6.8-slim-stretch

WORKDIR /app

Expand All @@ -12,7 +12,7 @@ RUN apt-get update \
# install ngt
RUN git clone https://github.com/yahoojapan/NGT.git \
&& cd NGT \
&& git checkout v1.4.5 \
&& git checkout v1.7.4 \
&& mkdir build && cd build \
&& cmake .. \
&& make \
Expand All @@ -21,7 +21,7 @@ RUN git clone https://github.com/yahoojapan/NGT.git \
&& cd ../python \
&& pip install pybind11 \
&& python setup.py sdist \
&& pip install dist/ngt-1.2.0.tar.gz
&& pip install dist/ngt-1.3.1.tar.gz

# install hnsw
RUN git clone https://github.com/nmslib/hnsw.git \
Expand All @@ -32,6 +32,7 @@ RUN git clone https://github.com/nmslib/hnsw.git \
# install faiss
RUN git clone https://github.com/facebookresearch/faiss.git \
&& cd faiss \
&& git checkout v1.4.0 \
&& ./configure \
&& make \
&& make install \
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ default: build

build:
python setup.py sdist
docker pull python:3.6.6-slim-stretch
docker pull python:3.6.8-slim-stretch
docker build --build-arg VERSION=$(DOCKER_IMAGE_VERSION) -t $(DOCKER_IMAGE_TAGNAME) .
docker tag $(DOCKER_IMAGE_TAGNAME) $(DOCKER_IMAGE_NAME):latest

rebuild:
python setup.py sdist
docker pull python:3.6.6-slim-stretch
docker pull python:3.6.8-slim-stretch
docker build --build-arg VERSION=$(DOCKER_IMAGE_VERSION) --no-cache -t $(DOCKER_IMAGE_TAGNAME) .
docker tag $(DOCKER_IMAGE_TAGNAME) $(DOCKER_IMAGE_NAME):latest

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ Use `--query` option to specify a query image file.
```bash
$ imgdupes --recursive target_dir --query target_dir/airplane_0583.jpg phash 4
Query: sample_airplane.png

target_dir/airplane_0583.jpg
target_dir/airplane_0800.jpg
```
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.0.23
0.0.24
18 changes: 9 additions & 9 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
future==0.16.0
future==0.17.1
ImageHash==4.0
joblib==0.12.5
numpy==1.15.2
opencv-python==3.4.3.18
joblib==0.13.2
numpy==1.16.3
opencv-python==4.1.0.25
orderedset==2.0.1
pathlib==1.0.1
pathos==0.2.2.1
Pillow==5.3.0
scipy==1.1.0
six==1.11.0
pathos==0.2.3
Pillow==6.0.0
scipy==1.3.0
six==1.12.0
termcolor==1.1.0
tqdm==4.28.1
tqdm==4.32.1
webcolors==1.8.1
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
'ImageHash',
'joblib',
'numpy',
'scipy',
'opencv-python',
'orderedset',
'pathlib',
'pathos',
'Pillow',
'scipy',
'six',
'termcolor',
'tqdm',
Expand Down

0 comments on commit ed0f798

Please sign in to comment.