Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Provide explicit version ranges for dependencies #79

Merged
merged 2 commits into from
Jun 28, 2018
Merged

Provide explicit version ranges for dependencies #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6d0684
Add explicit version ranges for DRF and django-filter dependencies an…
jeancochrane Jun 11, 2018
bdd4129
Pin pip to 9.0.1 and install postgis in Travis
jeancochrane Jun 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .travis.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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