Skip to content

Commit e1ab648

Browse files
Merge pull request GeoNode#2622 from GeoNode/unpin-versions
Don't pin versions in setup.py use >= or <=
2 parents c0d8204 + c24770b commit e1ab648

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

requirements.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ django-forms-bootstrap==3.0.1
2323
django-friendly-tag-loader==1.2.1
2424
django-geoexplorer==4.0.5
2525
django-guardian==1.4.1
26-
django-haystack==2.1.0
26+
django-haystack==2.4.1
2727
django-jsonfield==0.9.16
2828
django-leaflet==0.13.7
2929
django-modeltranslation==0.11
@@ -56,7 +56,7 @@ pillow==3.3.1
5656
pinax-theme-bootstrap==3.0a11
5757
pinax-theme-bootstrap-account==1.0b2
5858
pycsw==2.0.0
59-
pyelasticsearch==0.6.1
59+
elasticsearch==2.4.0
6060
pyflakes==1.2.3
6161
pyproj==1.9.5.1
6262
python-dateutil==2.5.3

setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ def fullsplit(path, result=None):
144144
"Shapely>=1.5.13",
145145

146146
# haystack/elasticsearch, uncomment to use
147-
"django-haystack==2.4.1",
148-
"elasticsearch==2.4.0",
147+
"django-haystack>=2.4.1",
148+
"elasticsearch>=2.4.0",
149149
"pyelasticsearch>=0.6.1",
150150
"celery>=3.1.17",
151151
"django-celery>=3.1.16",

0 commit comments

Comments
 (0)