Skip to content

Commit

Permalink
Merge pull request #79 from jeancochrane/update-dependencies
Browse files Browse the repository at this point in the history
Provide explicit version ranges for dependencies
  • Loading branch information
jeancochrane authored Jun 28, 2018
2 parents c55ce26 + bdd4129 commit d7e26fc
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ python:

addons:
postgresql: "9.4"
apt:
packages:
- postgresql-9.4-postgis-2.3

env:
- DJANGO_SETTINGS_MODULE='settings_travis'
Expand Down
5 changes: 5 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,10 @@ WORKDIR /opt/ashlar
RUN apt-get update
RUN apt-get -y autoremove && apt-get install -y libgeos-dev binutils libproj-dev gdal-bin

# --process-dependency-links is no longer a valid argument in pip 10. We should
# remove the external djsonb dependency eventually, but for now just install
# an earlier version of pip that can handle it.
RUN pip install pip==9.0.1

RUN pip install --process-dependency-links --allow-external djsonb -e .
CMD python run_tests.py
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
],
install_requires=[
'Django ==1.8.6',
'djangorestframework >=3.1.1',
'djangorestframework-gis >=0.8.1',
'django-filter >=0.9.2',
'djangorestframework >=3.1.1, <3.5.0',
'djangorestframework-gis >=0.8.1, <0.12.0',
'django-filter >=0.9.2, <0.14.0',
'djsonb >=0.2.2',
'jsonschema >=2.4.0',
'psycopg2 >=2.6',
Expand Down

0 comments on commit d7e26fc

Please sign in to comment.