Skip to content

Commit

Permalink
- Fix dev dependencies for OWSLib and django-user-accounts on requir…
Browse files Browse the repository at this point in the history
…ements.txt and setup.py
  • Loading branch information
Alessio Fabiani committed Sep 11, 2017
1 parent 3e47c5b commit 3533e41
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
6 changes: 4 additions & 2 deletions requirements.txt
@@ -1,8 +1,10 @@
Django==1.8.7
six==1.10.0
MultipartPostHandler==0.1.0
https://github.com/geopython/OWSLib/archive/master.zip#egg=OWSLib-0.14-dev
# we can't use django-user-account until upstream merge changes for geonode.
# this is temporary solution
# OWSLib==0.14.0
git+git://github.com/geopython/OWSLib@master#egg=OWSLib-0.14-dev
Paver==1.2.4
Unidecode==0.4.19
amqp==1.4.9
Expand Down Expand Up @@ -50,7 +52,7 @@ geonode-dialogos==0.7
pinax-notifications<4.0
# we can't use django-user-account until upstream merge changes for geonode.
# this is temporary solution
https://github.com/cezio/django-user-accounts/archive/252_255_mixed.zip#egg=django-user-accounts-2.0.2dev
git+git://github.com/cezio/django-user-accounts@252_255_mixed
geonode_user_messages==0.1.6
gisdata==0.5.4
gsconfig==1.0.6
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Expand Up @@ -89,6 +89,8 @@

# geopython dependencies
"pyproj==1.9.5.1", # python-pyproj (1.9.5)
# we can't use OWSLib 0.14 until upstream merge changes for geonode.
# this is temporary solution
"OWSLib==0.14-dev", # python-owslib (0.10.3) FIXME
"pycsw==2.0.3", # python-pycsw (1.10.1, 2.0.0 in ppa) FIXME
"%s" % shapely_dep, # python-shapely (1.5.13)
Expand Down Expand Up @@ -117,7 +119,6 @@
"django-user-accounts==2.0.2dev",
# we can't use django-user-account until upstream merge changes for geonode.
# this is temporary solution
# "git+https://github.com/cezio/django-user-accounts/archive/252_255_mixed.zip",
"geonode-arcrest>=10.2",
"geonode-dialogos>=0.5",
"gsconfig==1.0.6", # (1.0.3 in ppa) FIXME
Expand Down

0 comments on commit 3533e41

Please sign in to comment.