Merge branch 'master' into master

Author: mikeckennedy

days/001-004-flask-intro/code/requirements.txt

@@ -1,7 +1,7 @@
 click==6.7
 Flask==1.0.2
 itsdangerous==0.24
-Jinja2==2.10
+Jinja2>=2.10.1
 MarkupSafe==1.0
 python-dotenv==0.9.1
 Werkzeug==0.14.1

days/009-012-modern-apis-starred/demo/requirements.txt

@@ -1,2 +1,2 @@
-apistar==0.5.41
+apistar>=0.5.41,<0.5.1000
 pytest

days/017-020-flask-call-apis/code/demo.py

@@ -1 +1,4 @@
 from program import app
+
+if __name__ == '__main__':
+    app.run(load_dotenv=False)

days/017-020-flask-call-apis/code/program/routes.py

@@ -1,25 +1,30 @@
-from flask import render_template, request
-from program import app
 from datetime import datetime
-from pprint import pprint
+
 import requests
+from flask import render_template, request
+
+from program import app
+
+time_now = str(datetime.today())
 
-timenow = str(datetime.today())
 
 @app.route('/')
 @app.route('/index')
 def index():
-    return render_template('index.html', title='Template Demo', time=timenow)
+    return render_template('index.html', title='Template Demo', time=time_now)
+
 
 @app.route('/100Days')
 def p100days():
     return render_template('100Days.html')
 
+
 @app.route('/chuck')
 def chuck():
     joke = get_chuck_joke()
     return render_template('chuck.html',
-                            joke=joke)
+                           joke=joke)
+
 
 @app.route('/pokemon', methods=['GET', 'POST'])
 def pokemon():
@@ -28,19 +33,21 @@ def pokemon():
         colour = request.form.get('pokecolour')
         pokemon = get_poke_colours(colour)
     return render_template('pokemon.html',
-                            pokemon=pokemon)
+                           pokemon=pokemon)
+
 
 def get_chuck_joke():
     r = requests.get('https://api.chucknorris.io/jokes/random')
     data = r.json()
     return data['value']
 
+
 def get_poke_colours(colour):
     r = requests.get('https://pokeapi.co/api/v2/pokemon-color/' + colour.lower())
     pokedata = r.json()
     pokemon = []
 
     for i in pokedata['pokemon_species']:
         pokemon.append(i['name'])
-    
+
     return pokemon

days/017-020-flask-call-apis/code/requirements.txt

@@ -4,9 +4,9 @@ Click==7.0
 Flask==1.0.2
 idna==2.7
 itsdangerous==0.24
-Jinja2==2.10
+Jinja2>=2.10.1
 MarkupSafe==1.0
 python-dotenv==0.9.1
-requests==2.19.1
-urllib3==1.23
+requests>=2.21.0
+urllib3==1.24.2
 Werkzeug==0.14.1

days/041-044-react/demo/tips/src/App.js

@@ -78,7 +78,7 @@ class App extends Component {
     })
   }
 
-  filterTips = (filterStr) => {
+  filterTips(filterStr){
     let tips = []
     for(const tip of this.state.orgTips){
       if(tip.tip && tip.tip.toLowerCase().includes(filterStr) ||

days/051-twilio/code/requirements.txt

@@ -7,4 +7,4 @@ pytz==2019.1
 requests==2.21.0
 six==1.12.0
 twilio==6.26.1
-urllib3==1.24.1
+urllib3==1.24.2

days/065-068-heroku-deployment/code/requirements.txt

@@ -2,7 +2,7 @@ Click==7.0
 Flask==1.0.2
 gunicorn==19.9.0
 itsdangerous==1.1.0
-Jinja2==2.10
+Jinja2>=2.10.1
 MarkupSafe==1.1.1
 python-http-client==3.1.0
 sendgrid==5.6.0