Merge branch 'release/v9.79'

requirements.txt

@@ -8,13 +8,13 @@ atomicwrites==1.3.0
 attrs==19.1.0
 backcall==0.1.0
 beautifulsoup4==4.7.1
-billiard==3.6.0.0
+billiard==3.5.0.5
 bleach==3.1.0
 bokeh==1.0.4
 boto==2.49.0
 braintree==3.51.0
 cairocffi==1.0.2
-celery==4.3.0
+celery==4.2.2
 certifi==2019.3.9
 cffi==1.12.2
 chardet==3.0.4
@@ -46,10 +46,9 @@ django-leaflet==0.24.0
 django-mailbox==4.7.1
 django-oauth-toolkit==1.2.0
 django-oauth2-provider==0.2.6.1
-django-redis==4.10.0
 django-rest-framework==0.1.0
 django-rest-swagger==2.2.0
-django-rq==1.3.1
+django-rq==2.0
 django-rq-dashboard==0.3.3
 django-ses==0.8.10
 django-shell-plus==1.1.7
@@ -67,9 +66,7 @@ Faker==1.0.4
 fitparse==1.1.0
 Flask==1.0.2
 future==0.17.1
-GDAL==2.3.3
 geocoder==1.38.1
-geos==0.2.1
 holoviews==1.11.3
 html5lib==1.0.1
 htmlmin==0.1.12
@@ -99,7 +96,7 @@ jupyterlab==0.35.4
 jupyterlab-server==0.3.0
 keyring==18.0.0
 kiwisolver==1.0.1
-kombu==4.5.0
+kombu==4.3.0
 lxml==4.3.2
 Markdown==3.0.1
 MarkupSafe==1.1.1
@@ -134,6 +131,7 @@ prometheus-client==0.6.0
 prompt-toolkit==2.0.9
 ptyprocess==0.6.0
 py==1.8.0
+pycairo==1.18.0
 pycparser==2.19
 Pygments==2.3.1
 pyparsing==2.3.1
@@ -159,9 +157,10 @@ ratelim==0.1.6
 redis==3.2.1
 requests==2.21.0
 requests-oauthlib==1.2.0
-rowingdata==2.2.6
+rowingdata==2.2.7
 rowingphysics==0.5.0
-rq==0.13.0
+rq==1.0
+rq-dashboard==0.4.0
 scipy==1.2.1
 SecretStorage==3.1.1
 Send2Trash==1.5.0
@@ -189,9 +188,8 @@ VerbalExpressions==0.0.2
 vine==1.3.0
 wcwidth==0.1.7
 webencodings==0.5.1
-Werkzeug==0.15.1
+Werkzeug==0.15.2
 widgetsnbextension==3.4.2
-winkerberos==0.7.0
 xmltodict==0.12.0
 yamjam==0.1.7
 yamllint==1.15.0

rowers/dataprep.py

@@ -2231,7 +2231,7 @@ def dataprep(rowdatadf, id=0, bands=True, barchart=True, otwpower=True,
         time_increments = rowdatadf.loc[:, ' ElapsedTime (sec)'].diff()
         try:
             time_increments.iloc[0] = time_increments.iloc[1]
-        except KeyError:
+        except (KeyError, IndexError):
             time_increments.iloc[0] = 1.
             
         time_increments = 0.5 * time_increments + 0.5 * np.abs(time_increments)

rowers/templates/subscription_create_email.html

@@ -15,10 +15,7 @@
 </p>
 
 <p>
-  The subscription will keep running until you change or stop it. At any point in time you
+  The subscription will keep running until you change or stop it. 
-  can change the automatically renewing subscription to a "one year only" subscription through
-  <a href="{{ siteurl}}/rowers/upgrade/">the upgrade page</a>. On this page, you can also
-  upgrade your subscription. 
 </p>
 
 {% else %}

rowers/templates/workout_delete_confirm.html

@@ -28,7 +28,7 @@
   <li class="grid_2">
     <form action="" method="post">
       {% csrf_token %}
-      <input class="button red" type="submit" value="Confirm">
+      <input type="submit" value="Confirm">
     </form>
   </li>
 </ul>

rowers/views/workoutviews.py

@@ -1801,7 +1801,7 @@ def workout_downloadwind_view(request,id=0,
         try:
             row.notes += "\n"+message
         except TypeError:
-            if message:
+            if message and row.notes:
                 row.notes += message
                 
         row.save()