diff options
| author |   Sawyer Bergeron <sbergeron@iol.unh.edu> | 2021-10-15 17:03:58 -0400 |
|---|---|---|
| committer | Sawyer Bergeron <sbergeron@iol.unh.edu> | 2021-10-28 15:32:26 -0400 |
| commit | 104470ee008817df4a3b78d24e524e8c92eac9a0 (patch) | |
| tree | a4a6b70043f34c37b568bbe6a4b6e72d8c619716 /requirements.txt | |
| parent | afcee3cad5c091e78e909b83f8df49accf1af5b6 (diff) | |
WIP merge of master into cobblercobbler
Squashed commit of the following:
commit 35b9f39178cc502a5283a1b37a65f7dd0838ae05
Author: Sawyer Bergeron <sbergeron@iol.unh.edu>
Date: Fri Oct 15 14:14:46 2021 -0400
Merge User Booking API Rev 1 (Try 3)
Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
Change-Id: Ie1eee0a59929f8da39f16bb6bc17ae3de4f1cba9
Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
commit b3ed8ebcf536c021330e7ccbc0376f6b89189348
Author: Jacob Hodgdon <jhodgdon@iol.unh.edu>
Date: Tue Jul 20 09:55:04 2021 -0400
Additional changes for rebrand
Signed-off-by: Jacob Hodgdon <jhodgdon@iol.unh.edu>
Change-Id: Ibd525f966b3ed3aebdbe688e5ee5daa4ea1cf294
Signed-off-by: Jacob Hodgdon <jhodgdon@iol.unh.edu>
Signed-off-by: Raven Hodgdon <jhodgdon@iol.unh.edu>
commit 17b6c7809771ac8bf3879add033d2169f671591a
Author: Jacob Hodgdon <jhodgdon@iol.unh.edu>
Date: Fri May 14 15:42:56 2021 -0400
Color fixes for rebrand
Signed-off-by: Jacob Hodgdon <jhodgdon@iol.unh.edu>
Change-Id: I5cf4ede598afa377db7ecec17d8dfef085e130ac
Change-Id: I55494d24bcef74def85236b09168508e428d368e
Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
Diffstat (limited to 'requirements.txt')
| -rw-r--r-- | requirements.txt | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/requirements.txt b/requirements.txt index d93ac7c..4f4c6f7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,19 +1,18 @@ -celery==3.1.23 -cryptography==2.6.1 +celery==5.1.2 +cryptography==3.4.7 Django==2.2 django-bootstrap4==0.0.8 django-filter==2.0.0 djangorestframework==3.8.2 -gunicorn==19.6.0 -jira==1.0.7 +gunicorn==20.1.0 oauth2==1.9.0.post1 -oauthlib==1.1.2 -pika==0.10.0 -psycopg2==2.8.4 -PyJWT==1.4.2 -requests==2.22.0 +oauthlib==3.1.1 +pika==1.2.0 +psycopg2==2.8.6 +PyJWT==2.1.0 +requests==2.26.0 django-fernet-fields==0.6 -pyyaml==3.13 -pytz==2018.5 -mozilla-django-oidc==1.2.3 deepmerge==0.3 +pyyaml==5.4.1 +pytz==2021.1 +mozilla-django-oidc==2.0.0 |