Skip to content

Commit d2b1b06

Browse files
committed
Fixed build errors, updated python packages
1 parent e591226 commit d2b1b06

File tree

4 files changed

+13
-11
lines changed

4 files changed

+13
-11
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ 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 /tmp/pyclowder/
22+
COPY setup.py requirements.txt description.rst /tmp/pyclowder/
2323

2424
RUN pip install --upgrade -r /tmp/pyclowder/requirements.txt \
2525
&& pip install --upgrade /tmp/pyclowder \

requirements-test.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
-r requirements.txt
2+
3+
pytest==3.0.3
4+
pytest-pep8==1.0.6

requirements.txt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
enum34==1.1.6
2-
pika==0.10.0
3-
PyYAML==3.11
4-
requests==2.10.0
2+
pika==0.11.2
3+
PyYAML==3.12
4+
requests==2.18.4
55
wheel==0.24.0
6-
pytest==3.0.3
7-
pytest-pep8==1.0.6
8-
urllib3==1.14
6+
urllib3==1.22

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',
35-
'pika',
36-
'PyYAML',
37-
'requests',
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)