Merge branch 'develop' into 'master'

Develop

See merge request namibsun/python/bundesliga-tippspiel!20

CHANGELOG

+V 1.0.0:
+  - Prepared code for bundesliga 2019/20 season
 V 0.20.1:
   - Fixed crashes on last matchday
 V 0.20.0:

bundesliga_tippspiel/config.py

@@ -75,7 +75,7 @@ db_key = resolve_env_variable("DB_KEY")
 The database key
 """
 
-openligadb_season = resolve_env_variable("OPENLIGADB_SEASON", default="2018")
+openligadb_season = resolve_env_variable("OPENLIGADB_SEASON", default="2019")
 """
 The openligadb.de season to populate the data with
 """

bundesliga_tippspiel/templates/components/footer.html

@@ -22,7 +22,7 @@ along with bundesliga-tippspiel.  If not, see <http://www.gnu.org/licenses/>.
     <div class="row footer-row">
         <div class="col-md-4 footer-col">
             <a href="mailto:hermann@krumreyh.com">
-                © 2017-2018 Hermann Krumrey
+                © 2017-2019 Hermann Krumrey
             </a>
         </div>
         <div class="col-md-4 footer-col">

bundesliga_tippspiel/templates/profile/profile.html

@@ -100,6 +100,23 @@ along with bundesliga-tippspiel.  If not, see <http://www.gnu.org/licenses/>.
 
     <hr>
 
+    <!--h2>Telegram Erinnerungen</h2>
+
+    Um Erinnerungen für Telegram zu aktivieren, schicke die folgende Nachricht
+    an den hk-tippspiel Bot:
+
+    <br>
+
+    /register {{ current_user.id }}
+
+    <br>
+
+    Anschließend kannst du den Zeitpunkt der Erinnerungen adjustieren und/oder
+    die Erinnerungen wieder deaktivieren. Schicke für weitere Informationen die
+    Nachricht "/help" an den Bot.-->
+
+    <hr>
+
     <h2>Account löschen</h2>
 
     <div class="container form-container">

bundesliga_tippspiel/templates/static/index.html

@@ -19,7 +19,7 @@ along with bundesliga-tippspiel.  If not, see <http://www.gnu.org/licenses/>.
 
 {% extends "components/base_layout.html" %}
 {% block body %}
-    <h1>Tippspiel zur Bundesliga Saison 2018/19</h1>
+    <h1>Tippspiel zur Bundesliga Saison 2019/20</h1>
     <p>
         Beim Bundesliga Tippspiel kannst du dein Fußballwissen (und dein Glück)
         mit deinen Freunden messen!

bundesliga_tippspiel/test/routes/TestIndexRoute.py

@@ -38,7 +38,7 @@ class TestIndexRoute(_RouteTestFramework):
                  None if no such page exists,
                  An indicator for if the page requires authentication or not
         """
-        return "/", ["GET"], "Tippspiel zur Bundesliga Saison 2018/19", False
+        return "/", ["GET"], "Tippspiel zur Bundesliga Saison 2019/20", False
 
     def test_successful_requests(self):
         """

bundesliga_tippspiel/test/utils/TestMatchDataGetter.py

@@ -17,6 +17,7 @@ You should have received a copy of the GNU General Public License
 along with bundesliga-tippspiel.  If not, see <http://www.gnu.org/licenses/>.
 LICENSE"""
 
+import time
 import requests
 # noinspection PyProtectedMember
 from bundesliga_tippspiel.test.TestFramework import _TestFramework
@@ -37,9 +38,9 @@ class TestMatchDataGetter(_TestFramework):
         Tests populating the database. Twice.
         :return: None
         """
-        update_db_data()
+        update_db_data(season="2018")
         self.assert_db_state()
-        update_db_data()
+        update_db_data(season="2018")
         self.assert_db_state()
 
     @_TestFramework.online_required
@@ -52,6 +53,9 @@ class TestMatchDataGetter(_TestFramework):
         for team in Team.query.all():
             for url in [team.icon_svg, team.icon_png]:
                 resp = requests.head(url)
+                if resp.status_code == 429:
+                    time.sleep(5)
+                    resp = requests.head(url)
                 self.assertEqual(resp.status_code, 200)
 
     def assert_db_state(self):

bundesliga_tippspiel/utils/match_data_getter.py

@@ -318,6 +318,18 @@ def get_team_data(team_name: str) -> Tuple[str, str, str, Tuple[str, str]]:
         "Werder Bremen": (
             "SV Werder Bremen", "Werder Bremen", "SVW",
             wikimedia_icon_urls("commons/b/be/SV-Werder-Bremen-Logo.svg")
+        ),
+        "1. FC Union Berlin": (
+            "1. FC Union Berlin", "Union Berlin", "SCU",
+            wikimedia_icon_urls("en/f/fe/1._FC_Union_Berlin_logo.svg")
+        ),
+        "SC Paderborn 07": (
+            "SC Paderborn 07", "Paderborn", "PAD",
+            wikimedia_icon_urls("en/b/b3/SC_Paderborn_07_logo.svg")
+        ),
+        "1. FC Köln": (
+            "1. FC Köln", "1. FC Köln", "FCK",
+            wikimedia_icon_urls("en/5/53/FC_Cologne_logo.svg")
         )
     }[team_name]
 

doc/sphinx/source/conf.py

@@ -24,7 +24,7 @@ import sphinx_rtd_theme
 from sphinx.ext.autodoc import between
 
 # noinspection PyShadowingBuiltins
-copyright = '2018 Hermann Krumrey'
+copyright = '2017 Hermann Krumrey'
 author = 'Hermann Krumrey'
 project = 'bundesliga-tippspiel'
 

version

-0.20.1
\ No newline at end of file
+1.0.0
\ No newline at end of file