Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Initial Update #1101

Merged
merged 18 commits into from
Mar 4, 2017
Merged

Initial Update #1101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
786bd83
Pin raven to latest version 6.0.0
pyup-bot Mar 2, 2017
28d401b
Update pymysql from 0.7.9 to 0.7.10
pyup-bot Mar 2, 2017
e664ca8
Update sqlalchemy from 1.1.4 to 1.1.6
pyup-bot Mar 2, 2017
b207a12
Update rq-dashboard from 0.3.7 to 0.3.8
pyup-bot Mar 2, 2017
5c1aa09
Update flask-login from 0.3.2 to 0.4.0
pyup-bot Mar 2, 2017
2e3f6be
Update lockfile from 0.10.2 to 0.12.2
pyup-bot Mar 2, 2017
2dd0154
Update flask-wtf from 0.13.1 to 0.14.2
pyup-bot Mar 2, 2017
3bc7423
Update flask-sqlalchemy from 2.1 to 2.2
pyup-bot Mar 2, 2017
a20ae9c
Update flask-migrate from 2.0.0 to 2.0.3
pyup-bot Mar 2, 2017
f4fb828
Pin arrow to latest version 0.10.0
pyup-bot Mar 2, 2017
df86ba9
Update requests from 2.12 to 2.13.0
pyup-bot Mar 2, 2017
d95a4c4
Update hashids from 1.1.0 to 1.2.0
pyup-bot Mar 2, 2017
7ac8783
Update pygments from 2.1.3 to 2.2.0
pyup-bot Mar 2, 2017
8633ae4
Update mccabe from 0.5.3 to 0.6.1
pyup-bot Mar 2, 2017
8d98a81
Update pytest-cov from 2.3.1 to 2.4.0
pyup-bot Mar 2, 2017
e7bf590
Update selenium from 3.0.0 to 3.0.2
pyup-bot Mar 2, 2017
d02181f
rq-dashboard 0.3.7 because 0.3.8 can not be found
Sumukh Mar 2, 2017
f99bbe2
CSRFProtect
Sumukh Mar 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ jinja2==2.9.5
gunicorn==19.6.0

# Errors
raven[flask]
raven[flask]==6.0.0

# Database
pymysql==0.7.9
sqlalchemy==1.1.4
pymysql==0.7.10
sqlalchemy==1.1.6

# Caching
redis==2.10.5
Expand All @@ -28,10 +28,10 @@ Flask-Assets>=0.12,<0.12.99
https://github.com/okpy/webassets/archive/978b8063ce80c7f91c6bf080872dafe4eecf2454.zip

Flask-Caching>=1.1
Flask-Login==0.3.2
Flask-Login==0.4.0

# File Storage
lockfile==0.10.2 # For local storage
lockfile==0.12.2 # For local storage
apache-libcloud==1.5.0

# OAuth
Expand All @@ -41,33 +41,33 @@ oauthlib==2.0.1
# OAuthlib version that logs errors - use until Flask-OAuthlib > 0.9.3 is published
https://github.com/lepture/flask-oauthlib/archive/d62bf665fa2a4ab71327cd665334fdec25ade116.zip

Flask-WTF==0.13.1
Flask-WTF==0.14.2
Flask-RESTful==0.3.5
Flask-Testing>=0.5.0,<1.0
Flask-RQ==0.2

# Flask DB Extensions
Flask-SQLAlchemy==2.1
Flask-SQLAlchemy==2.2
Flask-SQLAlchemy-Cache==0.1.5
Flask-Migrate==2.0.0
Flask-Migrate==2.0.3

# Timezones
pytz==2016.10
arrow
arrow==0.10.0

# Emailing
sendgrid==3.6.3
pynliner<1.0

# Autograder Interface
requests==2.12
requests==2.13.0

# Front end
itsdangerous==0.24
cssmin==0.2.0
jsmin==2.2.1
hashids==1.1.0
pygments==2.1.3
hashids==1.2.0
pygments==2.2.0
humanize==0.5.1
markdown>=2.6,<2.7
pygal>=2.3,<2.4
Expand All @@ -79,15 +79,15 @@ gcloud==0.18.3
# Development
Flask-DebugToolbar==0.10.1
Flask-Script==2.0.5
mccabe==0.5.3
mccabe==0.6.1
flake8>=2.5.4
pylint>=1.5.2
names==0.3.0

# Testing
pytest>=3.0.0,<3.1
pytest-cov==2.3.1
selenium==3.0.0
pytest-cov==2.4.0
selenium==3.0.2

# until version 1.0.6 is on pypi
https://github.com/neta79/loremipsum/archive/py3_unicode_fix.zip
4 changes: 2 additions & 2 deletions server/extensions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from flask_caching import Cache
from flask_wtf.csrf import CsrfProtect
from flask_wtf.csrf import CSRFProtect
from flask_debugtoolbar import DebugToolbarExtension
from flask_assets import Environment
from flask_oauthlib.provider import OAuth2Provider
Expand All @@ -10,7 +10,7 @@
# Setup flask cache
cache = Cache()

csrf = CsrfProtect()
csrf = CSRFProtect()

# oAuth Provider (not client)
oauth_provider = OAuth2Provider()
Expand Down