Merge pull request #8 from SpongePowered/master

Merge from Upstream

.github/workflows/build.yml

@@ -10,7 +10,7 @@ jobs:
       matrix:
         python-version: [ '3.x' ]
         node-version: [ '12' ]
-        tox-env: ['py36-cov', 'lint']
+        tox-env: ['py3-cov', 'lint']
 
     services:
       postgres:

.mergify.yml

@@ -3,7 +3,7 @@ pull_request_rules:
     conditions:
       - "author~=^(pyup-bot|dependabot\\[bot\\])$"
       - "-merged"
-      - "status-success=test (3.x, 12, py36-cov)"
+      - "status-success=test (3.x, 12, py3-cov)"
       - "status-success=test (3.x, 12, lint)"
     actions:
       merge:
@@ -14,7 +14,7 @@ pull_request_rules:
     conditions:
       - "author~=^(pyup-bot|dependabot)$"
       - "-merged"
-      - "status-failure=test (3.x, 12, py36-cov)"
+      - "status-failure=test (3.x, 12, py3-cov)"
     actions:
       request_reviews:
         users: [lukegb, felixoi]
@@ -25,7 +25,7 @@ pull_request_rules:
       - "author~=^(pyup-bot|dependabot)$"
       - "-merged"
       - "status-failure=test (3.x, 12, lint)"
-      - "-status-failure=test (3.x, 12, py36-cov)"
+      - "-status-failure=test (3.x, 12, py3-cov)"
     actions:
       request_reviews:
         users: [lukegb, felixoi]

LICENSE → LICENSE.txt

@@ -1,6 +1,6 @@
-This file is part of SpongeAuth, licensed under the MIT License (MIT).
+The MIT License (MIT)
 
-Copyright (c) SpongePowered.org <http://www.spongepowered.org>
+Copyright (c) SpongePowered <https://www.spongepowered.org>
 Copyright (c) contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

package.json

@@ -6,12 +6,12 @@
     "author": "The PowerNukkit Ore Team",
     "license": "MIT",
     "devDependencies": {
-        "@babel/core": "^7.12.13",
-        "@babel/preset-env": "^7.12.13",
-        "@babel/register": "^7.12.13",
+        "@babel/core": "^7.13.14",
+        "@babel/preset-env": "^7.13.12",
+        "@babel/register": "^7.13.14",
         "bootstrap-sass": "3.4.1",
         "font-awesome": "^4.7.0",
-        "google-closure-compiler": "^20210202.0.0",
+        "google-closure-compiler": "^20210302.0.0",
         "gulp": "^4.0.2",
         "gulp-babel": "^8.0.0",
         "gulp-clean-css": "^4.3.0",

requirements/base.txt

@@ -1,12 +1,12 @@
-Django==3.1.6
+Django==3.1.7
 -e git+https://github.com/lukegb/django-user-sessions.git#egg=django-user-sessions
-Pillow==8.1.0
+Pillow==8.1.2
 oauth2client==4.1.3
-django-crispy-forms==1.11.0
+django-crispy-forms==1.11.2
 django-model-utils==4.1.1
 qrcode==6.1
 pytz==2021.1
 requests==2.25.1
 psycopg2-binary==2.8.6
-django-autocomplete-light==3.8.1
+django-autocomplete-light==3.8.2
 django-rq==2.4.0

requirements/dev.txt

@@ -3,9 +3,9 @@
 pytest-django==4.1.0
 prospector==1.3.1
 factory_boy==3.2.0
-Faker==6.1.1
+Faker==7.0.1
 django-debug-toolbar==3.2
 pylint==2.5.3
 black==20.8b1
-pre-commit==2.10.1
-fakeredis==1.4.5
+pre-commit==2.11.1
+fakeredis==1.5.0

requirements/prod.txt

@@ -1,4 +1,4 @@
 -r base.txt
 
-sentry-sdk==0.19.5
-gunicorn==20.0.4
+sentry-sdk==1.0.0
+gunicorn==20.1.0

requirements/test.txt

@@ -1,4 +1,4 @@
 -r dev.txt
 
-coveralls==2.2.0
+coveralls==3.0.1
 pytest-cov==2.11.1

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py37,lint
+envlist = py3,lint
 skipsdist = True
 
 [testenv]
@@ -13,7 +13,7 @@ deps = -r{toxinidir}/requirements/test.txt
 changedir = {toxinidir}/spongeauth
 commands =
     py.test --cov-config=../.coveragerc --cov-report= --cov=. {posargs}
-    cov: coveralls
+    cov: coveralls --service=github
 
 [testenv:lint]
 changedir = {toxinidir}