summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikela Clemmons <glassresistor@gmail.com>2014-08-25 20:03:36 (GMT)
committerMikela Clemmons <glassresistor@gmail.com>2014-08-25 20:03:36 (GMT)
commit8dc84e675d373ecd09880a1d25c60ef21a2ecf37 (patch)
tree38b367e2a624aca93623b2c28482411602370ad8
parentcc06cf0b26fa7b26e521ad6aafa2b3a9eee13350 (diff)
downloaddjango-oauth2-provider-8dc84e675d373ecd09880a1d25c60ef21a2ecf37.zip
django-oauth2-provider-8dc84e675d373ecd09880a1d25c60ef21a2ecf37.tar.gz
django-oauth2-provider-8dc84e675d373ecd09880a1d25c60ef21a2ecf37.tar.bz2
added updated to req and setup and test
-rw-r--r--requirements.txt2
-rw-r--r--setup.py2
-rwxr-xr-xtest.sh2
3 files changed, 3 insertions, 3 deletions
diff --git a/requirements.txt b/requirements.txt
index a79a5d9..df0d9db 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,2 @@
Django>=1.4
-shortuuid>=0.3
+shortuuid>=0.4
diff --git a/setup.py b/setup.py
index f9f55b8..6a257d1 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ setup(
'Framework :: Django',
],
install_requires=[
- "shortuuid>=0.3"
+ "shortuuid>=0.4"
],
include_package_data=True,
zip_safe=False,
diff --git a/test.sh b/test.sh
index 094e309..1bf50b0 100755
--- a/test.sh
+++ b/test.sh
@@ -5,7 +5,7 @@ DJ_VERSION=$(django-admin.py --version)
# exit if fail
[[ "$?" -ne "0" ]] && exit;
-IS_16=$(echo $DJ_VERSION | grep "1.6")
+IS_16=$(echo $DJ_VERSION | grep -E "1\.6|1\.7|1\.8|dev")
# if django version is not 1.6 (non-0 exit) we have to pass different
# app names to test runner