From 6f7b8b9fc30040c503ecd7a1349be965d42e21fd Mon Sep 17 00:00:00 2001 From: Connor Osborn Date: Tue, 18 Sep 2018 09:25:59 -0700 Subject: [PATCH 1/2] Upgrade django-cyverse-auth from 1.1.6 to 1.1.7 In 1.1.6, there was usage of an undefined value breaking OAuth --- dev_requirements.txt | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev_requirements.txt b/dev_requirements.txt index 19ccda8a4..adedd057b 100644 --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -42,7 +42,7 @@ defusedxml==0.5.0 deprecation==1.0.1 django-celery-beat==1.0.1 django-cors-headers==2.1.0 -django-cyverse-auth==1.1.6 +django-cyverse-auth==1.1.7 django-debug-toolbar==1.8 django-filter==1.0.4 django-jenkins==0.110.0 diff --git a/requirements.txt b/requirements.txt index 1fa22c77c..2be2a191e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -32,7 +32,7 @@ defusedxml==0.5.0 # via djangorestframework-xml deprecation==1.0.1 # via openstacksdk django-celery-beat==1.0.1 django-cors-headers==2.1.0 -django-cyverse-auth==1.1.6 +django-cyverse-auth==1.1.7 django-filter==1.0.4 django-memoize==2.1.0 django-redis-cache==1.7.1 From 0b9a3d622d2ebf738b46e84e3c70e1420f9ab289 Mon Sep 17 00:00:00 2001 From: Connor Osborn Date: Tue, 18 Sep 2018 09:32:47 -0700 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 64b3591d3..852b4686e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) ### Fixed - Fix reference to deleted model ProviderDNSServerIP ([#673](https://github.com/cyverse/atmosphere/pull/673)) + - Upgrade to django-cyverse-auth 1.1.7 from 1.1.6 to avoid error in OAuth + ([#674](https://github.com/cyverse/atmosphere/pull/674)) ## [v34-0](https://github.com/cyverse/atmosphere/compare/v33-0...v34-0) - 2018-09-17 ### Added