Skip to content

Commit 6b14c97

Browse files
committed
use setup.py when creating dockerfile, requirements for editor/testing
1 parent d2b1b06 commit 6b14c97

File tree

4 files changed

+8
-11
lines changed

4 files changed

+8
-11
lines changed

Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@ RUN apt-get -q -q update && apt-get install -y --no-install-recommends \
1919

2020
# instal pyclowder2
2121
COPY pyclowder /tmp/pyclowder/pyclowder
22-
COPY setup.py requirements.txt description.rst /tmp/pyclowder/
22+
COPY setup.py description.rst /tmp/pyclowder/
2323

24-
RUN pip install --upgrade -r /tmp/pyclowder/requirements.txt \
25-
&& pip install --upgrade /tmp/pyclowder \
24+
RUN pip install --upgrade /tmp/pyclowder \
2625
&& rm -rf /tmp/pyclowder
2726

2827
# change folder

requirements-test.txt

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

requirements.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@ PyYAML==3.12
44
requests==2.18.4
55
wheel==0.24.0
66
urllib3==1.22
7+
pytest==3.0.3
8+
pytest-pep8==1.0.6

setup.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ def description():
3131
keywords=['clowder', 'data management system'],
3232

3333
install_requires=[
34-
'enum34>=1.1.6',
35-
'pika>=0.11.2',
36-
'PyYAML>=3.12',
37-
'requests>=2.18.4',
34+
'enum34==1.1.6',
35+
'pika==0.11.2',
36+
'PyYAML==3.12',
37+
'requests==2.18.4',
3838
],
3939

4040
include_package_data=True,

0 commit comments

Comments
 (0)