sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'feature/thinkpad' into develop

Browse Source
This commit is contained in:
Sander Roosendaal
2019-02-08 21:38:36 +01:00
parent 60d56383d6 7a6965fa9f
commit dd2d69d9d0
43 changed files with 82417 additions and 9560 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+4
View File
@@ -52,3 +52,7 @@ config.yaml
# test data
# virtualenv
/venv/
/py27/
/py2/
dump.rdb
BIN
View File
Binary file not shown.
requirements.txt
+221
View File
@@ -0,0 +1,221 @@
alabaster==0.7.7
amqp==1.4.9
anyjson==0.3.3
appdirs==1.4.3
argcomplete==1.0.0
arrow==0.12.1
asn1crypto==0.23.0
astropy==1.1.2
atomicwrites==1.3.0
attrs==18.2.0
awscli==1.14.57
Babel==2.2.0
backports-abc==0.4
backports.functools-lru-cache==1.5
backports.shutil-get-terminal-size==1.0.0
backports.ssl-match-hostname==3.4.0.2
beautifulsoup4==4.6.0
billiard==3.3.0.23
bitarray==0.8.1
blaze==0.9.1
bleach==2.0.0
bokeh==0.12.3
boto==2.48.0
boto3==1.6.6
botocore==1.9.10
bottle==0.12.9
Bottleneck==1.0.0
braintree==3.50.0
cairocffi==0.7.2
celery==3.1.23
certifi==2017.11.5
cffi==1.11.2
chardet==3.0.4
chest==0.2.3
click==6.6
cloudpickle==0.1.1
clyent==1.2.1
colorama==0.3.7
comtypes==1.1.7
configobj==5.0.6
coreapi==2.0.9
cryptography==2.1.3
cycler==0.10.0
Cython==0.23.4
cytoolz==0.7.5
dask==0.8.1
datashape==0.5.1
decorator==4.0.9
dill==0.2.4
Django==1.9.5
django-analytical==2.2.2
django-analytics==0.0.1
django-async-messages==0.3.1
django-braces==1.8.1
django-celery==3.1.17
django-classy-tags==0.8.0
django-cookie-law==1.0.12
django-cors-headers==1.1.0
django-cors-middleware==1.3.1
django-countries==5.3.2
django-datetime-widget==0.9.3
django-debug-toolbar==1.4
django-durationfield==0.5.2
django-extensions==1.7.5
django-filter==1.0.0
django-geckoboard==2.0.0
django-geojson==2.10.0
django-htmlmin==0.10.0
django-leaflet==0.22.0
django-mailbox==4.6.0
django-modelcluster==1.1
django-oauth-toolkit==0.10.0
django-oauth2-provider==0.2.6.1
django-rest-swagger==2.1.0
django-rq==0.8.0
django-rq-dashboard==0.3.0
django-ses==0.8.5
django-social-share==1.1.2
django-suit==0.2.25
django-suit-rq==1.0.1
django-taggit==0.18.1
django-translation-manager==0.3.4
django-treebeard==4.0
django-tz-detect==0.2.8
djangorestframework==3.5.3
docopt==0.6.2
docutils==0.12
enum34==1.1.2
et-xmlfile==1.0.1
Factory==1.2
fastcache==1.0.2
filemagic==1.6
fitparse==1.0.1
Flask==0.10.1
Flask-Cors==2.1.2
Flask-Login==0.3.2
Flask-OpenID==1.2.5
Flask-Uploads==0.2.0
flower==0.9.1
funcsigs==1.0.2
functools32==3.2.3.post2
future==0.16.0
futures==3.0.5
geocoder==1.37.0
geopy==1.11.0
gevent==1.1.0
greenlet==0.4.9
grin==1.2.1
gunicorn==19.4.5
HeapDict==1.0.0
honcho==0.6.6
html5lib==1.0.1
httplib2==0.9.2
icalendar==4.0.3
idna==2.6
ipaddress==1.0.14
ipython==4.2.0
ipython-genutils==0.1.0
iso8601==0.1.12
isodate==0.6.0
itsdangerous==0.24
itypes==1.1.0
Jinja2==2.8
jmespath==0.9.3
jsonschema==2.5.1
kiwisolver==1.0.1
kombu==3.0.35
lxml==4.2.1
Markdown==2.6.7
MarkupSafe==0.23
matplotlib==2.2.2
mechanize==0.3.6
MiniMockTest==0.5
mock==2.0.0
more-itertools==5.0.0
mpld3==0.2
mpmath==0.19
multipledispatch==0.4.8
networkx==1.11
nose==1.3.7
nose-parameterized==0.6.0
numpy==1.14.2
oauth2==1.9.0.post1
oauthlib==1.0.3
odo==0.4.2
openapi-codec==1.1.7
packaging==16.8
pandas==0.22.0
pathlib2==2.3.3
pathspec==0.5.5
pbr==5.1.2
pexpect==4.0.1
pickleshare==0.7.2
Pillow==3.2.0
pluggy==0.8.1
polib==1.0.7
psutil==4.1.0
ptyprocess==0.5.1
py==1.7.0
pyasn1==0.1.9
pycparser==2.14
pycrypto==2.6.1
PyMySQL==0.7.4
pync==1.6.1
pyparsing==2.2.0
pytest==4.2.0
pytest-sugar==0.9.2
python-dateutil==2.7.2
python-memcached==1.58
python-metar==1.4.0
python-openid==2.2.5
python-twitter==3.2
pytz==2018.4
PyYAML==3.12
pyzmq==15.2.0
ratelim==0.1.6
redis==2.10.5
req==1.0.0
requests==2.12.3
requests-oauthlib==0.7.0
rowingdata==2.0.0
rowingphysics==0.3.10
rq==0.6.0
rq-dashboard==0.3.7
rsa==3.4.2
s3transfer==0.1.13
scandir==1.6
scikit-image==0.12.3
scikit-learn==0.17.1
scipy==1.0.1
seaborn==0.7.0
Shapely==1.6.1
shortuuid==0.4.3
simplegeneric==0.8.1
simplejson==3.10.0
singledispatch==3.4.0.3
six==1.11.0
SQLAlchemy==1.0.12
sqlparse==0.1.19
-e git+git@bitbucket.org:sanderroosendaal/rowsandall.git@c9695a9f8f5ee0e459de066007a5ef4cef58255b#egg=stravalib
subprocess32==3.2.7
sympy==1.0
termcolor==1.1.0
timestring==1.6.2
timezonefinder==2.1.2
toolz==0.7.4
tornado==4.4.2
tqdm==4.23.0
traitlets==4.2.1
tzwhere==3.0.3
Unidecode==0.4.19
units==0.6
uritemplate==3.0.0
urllib3==1.22
VerbalExpressions==0.0.1
webencodings==0.5.1
Werkzeug==0.11.8
xlrd==1.0.0
xmltodict==0.11.0
yamjam==0.1.7
yamllint==1.8.1
rowers/tasks.py
+1
View File
@@ -128,6 +128,7 @@ def handle_c2_import_stroke_data(c2token,
return 1
else:
url = "https://log.concept2.com/api/users/me/results/"+str(c2id)
s = requests.get(url,headers=headers)
if s.status_code == 200:
rowers/tests/statements.py
+11 -1
View File
@@ -1,3 +1,13 @@
try:
WindowsError
except NameError:
WindowsError = None
try:
OSError
except NameError:
OSError = None
import pytest
pytestmark = pytest.mark.django_db
@@ -88,7 +98,7 @@ def get_random_file(filename='rowers/tests/testdata/testdata.csv',name=''):
row = rdata(filename)
totaldist = row.df['cum_dist'].max()
totaltime = row.df['TimeStamp (sec)'].max()-row.df['TimeStamp (sec)'].min()
totaltime = totaltime+row.df.ix[0,' ElapsedTime (sec)']
totaltime = totaltime+row.df.loc[row.df.index[0],' ElapsedTime (sec)']
hours = int(totaltime/3600.)
rowers/tests/test_analysis.py
+9 -9
View File
@@ -26,7 +26,7 @@ class WorkoutCompareTest(TestCase):
for workout in self.user_workouts:
try:
os.remove(workout.csvfilename)
except (IOError, WindowsError):
except (IOError, WindowsError,OSError):
pass
@patch('rowers.dataprep.create_engine')
@@ -91,7 +91,7 @@ class BoxPlotTest(TestCase):
for workout in self.user_workouts:
try:
os.remove(workout.csvfilename)
except (IOError, WindowsError):
except (IOError, WindowsError,OSError):
pass
@patch('rowers.dataprep.create_engine')
@@ -188,7 +188,7 @@ class ListWorkoutTest(TestCase):
for workout in self.user_workouts:
try:
os.remove(workout.csvfilename)
except (IOError, WindowsError):
except (IOError, WindowsError,OSError):
pass
@patch('rowers.dataprep.create_engine')
@@ -244,7 +244,7 @@ class PlannedSessionTests(TestCase):
for workout in self.user_workouts:
try:
os.remove(workout.csvfilename)
except (IOError, WindowsError):
except (IOError, WindowsError,OSError):
pass
def test_ics_download(self):
@@ -289,7 +289,7 @@ class ForcecurveTest(TestCase):
for workout in self.user_workouts:
try:
os.remove(workout.csvfilename)
except (IOError, WindowsError):
except (IOError, WindowsError,OSError):
pass
@patch('rowers.dataprep.getsmallrowdata_db',side_effect = mocked_getempowerdata_db)
@@ -323,7 +323,7 @@ class CumStatsTest(TestCase):
for workout in self.user_workouts:
try:
os.remove(workout.csvfilename)
except (IOError, WindowsError):
except (IOError, WindowsError,OSError):
pass
@patch('rowers.dataprep.read_cols_df_sql', side_effect = mocked_read_df_cols_sql_multistats)
@@ -360,7 +360,7 @@ class CumFlexTest(TestCase):
for workout in self.user_workouts:
try:
os.remove(workout.csvfilename)
except (IOError, WindowsError):
except (IOError, WindowsError,OSError):
pass
@patch('rowers.dataprep.read_cols_df_sql', side_effect = mocked_read_df_cols_sql_multiflex)
@@ -465,7 +465,7 @@ class MultiFlexTest(TestCase):
for workout in self.user_workouts:
try:
os.remove(workout.csvfilename)
except (IOError, WindowsError):
except (IOError, WindowsError,OSError):
pass
@patch('rowers.dataprep.read_cols_df_sql', side_effect = mocked_read_df_cols_sql_multiflex)
@@ -567,7 +567,7 @@ class HistoTest(TestCase):
for workout in self.user_workouts:
try:
os.remove(workout.csvfilename)
except (IOError, WindowsError):
except (IOError, WindowsError,OSError):
pass
@patch('rowers.dataprep.create_engine')
rowers/tests/test_basicrower.py
+1 -1
View File
@@ -28,7 +28,7 @@ class SimpleViewTest(TestCase):
for workout in self.user_workouts:
try:
os.remove(workout.csvfilename)
except (IOError, WindowsError):
except (IOError, WindowsError,OSError):
pass
def start_protrial(self):
rowers/tests/test_cpchart.py
+5 -2
View File
@@ -71,12 +71,15 @@ class OTWCPChartTest(TestCase):
pass
def tearDown(self):
try:
for filename in os.listdir('rowers/tests/testdata/otwcp/temp'):
path = os.path.join('rowers/tests/testdata/otwcp/temp/',filename)
if not os.path.isdir(path):
try:
os.remove(path)
except (IOError,WindowsError):
except (IOError,WindowsError,OSError):
pass
except (IOError,WindowsError,OSError):
pass
@patch('rowers.dataprep.getsmallrowdata_db',side_effect=mocked_cpraw)
@@ -153,7 +156,7 @@ class CPChartTest(TestCase):
for workout in self.user_workouts:
try:
os.remove(workout.csvfilename)
except (IOError, WindowsError):
except (IOError, WindowsError,OSError):
pass
def test_analytics_page(self):
rowers/tests/test_emails.py
+6 -6
View File
@@ -32,7 +32,7 @@ workout run
""")
m.save()
a2 = 'media/mailbox_attachments/colin3.csv'
copyfile('rowers/tests/testdata/emails/colin.csv',a2)
copy('rowers/tests/testdata/emails/colin.csv',a2)
a = MessageAttachment(message=m,document=a2[6:])
a.save()
@@ -42,7 +42,7 @@ workout run
if not os.path.isdir(path):
try:
os.remove(path)
except (IOError,WindowsError):
except (IOError,WindowsError,OSError):
pass
@patch('rowers.dataprep.create_engine')
@@ -100,7 +100,7 @@ boattype: 4x
""")
m.save()
a2 = 'media/mailbox_attachments/'+filename
copyfile(u'rowers/tests/testdata/emails/'+filename,a2)
copy(u'rowers/tests/testdata/emails/'+filename,a2)
a = MessageAttachment(message=m,document=a2[6:])
a.save()
@@ -112,7 +112,7 @@ workout water
""")
m.save()
a2 = 'media/mailbox_attachments/colin2.csv'
copyfile('rowers/tests/testdata/emails/colin.csv',a2)
copy('rowers/tests/testdata/emails/colin.csv',a2)
a = MessageAttachment(message=m,document=a2[6:])
a.save()
@@ -131,7 +131,7 @@ race 1
if not os.path.isdir(path):
try:
os.remove(path)
except (IOError,WindowsError):
except (IOError,WindowsError,OSError):
pass
@patch('rowers.dataprep.create_engine')
@@ -191,7 +191,7 @@ race 1
if not os.path.isdir(path):
try:
os.remove(path)
except (IOError,WindowsError):
except (IOError,WindowsError,OSError):
pass
@patch('rowers.dataprep.create_engine')
rowers/tests/test_imports.py
+1 -1
View File
@@ -777,7 +777,7 @@ boattype: 2x
if not os.path.isdir(path):
try:
os.remove(path)
except WindowsError:
except (WindowsError,OSError):
pass
@patch('rowers.tpstuff.requests.post', side_effect=mocked_requests)
rowers/tests/test_plans.py
+6 -6
View File
@@ -26,7 +26,7 @@ class TrainingPlanTest(TestCase):
for workout in self.user_workouts:
try:
os.remove(workout.csvfilename)
except (IOError, WindowsError):
except (IOError, WindowsError,OSError):
pass
def test_createplan(self):
@@ -209,7 +209,7 @@ class SessionLinkTest(TestCase):
for workout in self.user_workouts:
try:
os.remove(workout.csvfilename)
except (IOError, WindowsError):
except (IOError, WindowsError,OSError):
pass
def test_plannedsessions(self):
@@ -437,7 +437,7 @@ class SessionCompleteTest(TestCase):
def tearDown(self):
try:
os.remove(self.w1.csvfilename)
except (IOError, WindowsError):
except (IOError, WindowsError,OSError):
pass
def test_session1_complete(self):
@@ -672,7 +672,7 @@ class ChallengeCompleteTest(TestCase):
def tearDown(self):
try:
os.remove(self.w1.csvfilename)
except (IOError, WindowsError):
except (IOError, WindowsError,OSError):
pass
def test_challenge1_complete(self):
@@ -895,7 +895,7 @@ class MandatoryTestCompleteTest(TestCase):
def tearDown(self):
try:
os.remove(self.w1.csvfilename)
except (IOError, WindowsError):
except (IOError, WindowsError,OSError):
pass
def test_mandatorytest1_complete(self):
@@ -1216,7 +1216,7 @@ class PlannedSessionsView(TestCase):
def tearDown(self):
try:
os.remove(self.w1.csvfilename)
except (IOError, WindowsError):
except (IOError, WindowsError,OSError):
pass
def test_clone_view(self):
rowers/tests/test_rowerplans.py
+1 -1
View File
@@ -24,7 +24,7 @@ class TrialsTest(TestCase):
for workout in self.user_workouts:
try:
os.remove(workout.csvfilename)
except (IOError, WindowsError):
except (IOError, WindowsError,OSError):
pass
def test_basictrial(self):
rowers/tests/test_simplefunctions.py
+1 -1
View File
@@ -28,7 +28,7 @@ class SimpleViewTest(TestCase):
for workout in self.user_workouts:
try:
os.remove(workout.csvfilename)
except (IOError, WindowsError):
except (IOError, WindowsError,OSError):
pass
rowers/tests/test_staticcharts.py
+21 -21
View File
@@ -67,7 +67,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
except WindowsError:
except (WindowsError,OSError):
pass
plotnr = 1
@@ -80,7 +80,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
except WindowsError:
except (WindowsError,OSError):
pass
plotnr = 2
@@ -93,7 +93,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
except WindowsError:
except (WindowsError,OSError):
pass
plotnr = 3
@@ -106,7 +106,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
except WindowsError:
except (WindowsError,OSError):
pass
plotnr = 4
@@ -119,7 +119,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
except WindowsError:
except (WindowsError,OSError):
pass
plotnr = 5
@@ -132,7 +132,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
except WindowsError:
except (WindowsError,OSError):
pass
plotnr = 6
@@ -145,7 +145,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
except WindowsError:
except (WindowsError,OSError):
pass
plotnr = 7
@@ -158,7 +158,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
except WindowsError:
except (WindowsError,OSError):
pass
plotnr = 8
@@ -171,7 +171,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
except WindowsError:
except (WindowsError,OSError):
pass
plotnr = 13
@@ -184,7 +184,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
except WindowsError:
except (WindowsError,OSError):
pass
@patch('rowers.tasks.rdata')
@@ -206,7 +206,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
except WindowsError:
except (WindowsError,OSError):
pass
plotnr = 1
@@ -219,7 +219,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
except WindowsError:
except (WindowsError,OSError):
pass
plotnr = 2
@@ -232,7 +232,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
except WindowsError:
except (WindowsError,OSError):
pass
plotnr = 3
@@ -245,7 +245,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
except WindowsError:
except (WindowsError,OSError):
pass
plotnr = 4
@@ -258,7 +258,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
except WindowsError:
except (WindowsError,OSError):
pass
plotnr = 5
@@ -271,7 +271,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
except WindowsError:
except (WindowsError,OSError):
pass
plotnr = 6
@@ -284,7 +284,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
except WindowsError:
except (WindowsError,OSError):
pass
plotnr = 7
@@ -297,7 +297,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
except WindowsError:
except (WindowsError,OSError):
pass
plotnr = 8
@@ -310,7 +310,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
except WindowsError:
except (WindowsError,OSError):
pass
plotnr = 9
@@ -323,7 +323,7 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
except WindowsError:
except (WindowsError,OSError):
pass
plotnr = 13
@@ -336,5 +336,5 @@ class PlotTests(TestCase):
filename=fullpathimagename)
try:
os.remove(fullpathimagename)
except WindowsError:
except (WindowsError,OSError):
pass
rowers/tests/test_team.py
+2 -2
View File
@@ -80,7 +80,7 @@ class TeamTest(TestCase):
for csvfilename in self.csvfilenames:
try:
os.remove(csvfilename)
except (IOError, WindowsError):
except (IOError, WindowsError,OSError):
pass
def test_manager_drop_member(self):
@@ -288,7 +288,7 @@ class TeamTestLowLevel(TestCase):
for csvfilename in self.csvfilenames:
try:
os.remove(csvfilename)
except (IOError, WindowsError):
except (IOError, WindowsError,OSError):
pass
def test_lowlevel_update_team(self):
rowers/tests/test_uploads.py
+18 -18
View File
@@ -105,7 +105,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
except WindowsError:
except (WindowsError,OSError):
pass
@@ -163,7 +163,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
except WindowsError:
except (WindowsError,OSError):
pass
@@ -201,7 +201,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
except WindowsError:
except (WindowsError,OSError):
pass
@patch('rowers.dataprep.create_engine')
@@ -283,7 +283,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
except WindowsError:
except (WindowsError,OSError):
pass
@patch('rowers.dataprep.create_engine')
@@ -320,7 +320,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
except WindowsError:
except (WindowsError,OSError):
pass
@patch('rowers.dataprep.create_engine')
@@ -357,7 +357,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
except WindowsError:
except (WindowsError,OSError):
pass
@@ -396,7 +396,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
except WindowsError:
except (WindowsError,OSError):
pass
@@ -432,7 +432,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
except WindowsError:
except (WindowsError,OSError):
pass
@@ -469,7 +469,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
except WindowsError:
except (WindowsError,OSError):
pass
@@ -508,7 +508,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
except WindowsError:
except (WindowsError,OSError):
pass
@@ -543,7 +543,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
except WindowsError:
except (WindowsError,OSError):
pass
@@ -576,7 +576,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
except WindowsError:
except (WindowsError,OSError):
pass
@@ -609,7 +609,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
except WindowsError:
except (WindowsError,OSError):
pass
@@ -642,7 +642,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
except WindowsError:
except (WindowsError,OSError):
pass
@@ -676,7 +676,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
except WindowsError:
except (WindowsError,OSError):
pass
@patch('rowers.dataprep.create_engine')
@@ -708,7 +708,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
except WindowsError:
except (WindowsError,OSError):
pass
@patch('rowers.dataprep.create_engine')
@@ -740,7 +740,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
except WindowsError:
except (WindowsError,OSError):
pass
@patch('rowers.dataprep.create_engine')
@@ -772,6 +772,6 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
except WindowsError:
except (WindowsError,OSError):
pass
rowers/tests/test_user.py
+1 -1
View File
@@ -90,7 +90,7 @@ class UserPreferencesTest(TestCase):
for workout in self.user_workouts:
try:
os.remove(workout.csvfilename)
except (IOError, WindowsError):
except (IOError, WindowsError,OSError):
pass
def test_accountsettings(self):
rowers/tests/testdata/emails/colin3.csv
Vendored
+1
View File
File diff suppressed because one or more lines are too long
rowers/tests/testdata/rowinginmotionexample.tcx
Vendored
+72497
View File
File diff suppressed because it is too large Load Diff
rowers/tests/testdata/testdata.csv.gz
Vendored
BIN
View File
Binary file not shown.
rowers/urls.py
+1 -1
View File
@@ -257,7 +257,7 @@ urlpatterns = [
url(r'^workout/upload/team/$',views.team_workout_upload_view,name='team_workout_upload_view'),
url(r'^workout/upload/$',views.workout_upload_view,name='workout_upload_view'),
url(r'^workout/(?P<id>\d+)/histo/$',views.workout_histo_view,name='workout_histo_view'),
url(r'^workout/(?P<id>\d+)/task/$',views.workout_test_task_view),
# url(r'^workout/(?P<id>\d+)/task/$',views.workout_test_task_view),
url(r'^workout/(?P<id>\d+)/forcecurve/$',views.workout_forcecurve_view,name='workout_forcecurve_view'),
url(r'^workout/(?P<id>\d+)/unsubscribe/$',views.workout_unsubscribe_view,name='workout_unsubscribe_view'),
# url(r'^workout/(?P<id>\d+)/export/$',views.workout_export_view),
rowers/views/statements.py
+1 -1
View File
@@ -146,7 +146,7 @@ from rowsandall_app.settings import (
PAYMENT_PROCESSING_ON
)
from rowers.tasks_standalone import addcomment2
#from rowers.tasks_standalone import addcomment2
from django.contrib import messages
from async_messages import messages as a_messages
rowers/views/workoutviews.py
+11 -11
View File
@@ -67,17 +67,17 @@ def workout_forcecurve_view(request,id=0,workstrokesonly=False):
})
# Test asynchronous tasking and messaging
@login_required()
def workout_test_task_view(request,id=0):
row = Workout.objects.get(id=id)
res = myqueue(queuehigh,addcomment2,request.user.id,row.id)
url = reverse('workout_edit_view',
kwargs = {
'id':int(id),
})
return HttpResponseRedirect(url)
#@login_required()
#def workout_test_task_view(request,id=0):
# row = Workout.objects.get(id=id)
# res = myqueue(queuehigh,addcomment2,request.user.id,row.id)#
#
#
# url = reverse('workout_edit_view',
# kwargs = {
# 'id':int(id),
# })
# return HttpResponseRedirect(url)
# Show Stroke power histogram for a workout
@login_required()
rowers/views_old.py
+1 -1
View File
@@ -146,7 +146,7 @@ from rowsandall_app.settings import (
PAYMENT_PROCESSING_ON
)
from rowers.tasks_standalone import addcomment2
#from rowers.tasks_standalone import addcomment2
from django.contrib import messages
from async_messages import messages as a_messages
rowsandall_app/settings.py
+1 -1
View File
@@ -54,7 +54,7 @@ INSTALLED_APPS = [
'leaflet',
'django_rq',
'django_rq_dashboard',
'translation_manager',
# 'translation_manager',
'django_mailbox',
'rest_framework',
'datetimewidget',
rowsandall_app/settings_thinkpad.py
+104
View File
@@ -0,0 +1,104 @@
"""
Django settings for rowsandall_app project.
Generated by 'django-admin startproject' using Django 1.9.5.
For more information on this file, see
https://docs.djangoproject.com/en/1.9/topics/settings/
For the full list of settings and their values, see
https://docs.djangoproject.com/en/1.9/ref/settings/
"""
import os
from settings import *
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3',
'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
# 'HOST': 'localhost',
},
# 'TEST': {
# 'CHARSET': 'utf8',
# 'COLLATION': 'utf8_general_ci',
# },
# 'slave': {
# 'ENGINE': 'django.db.backends.mysql',
# 'NAME': 'rowsanda_107501',
# 'USER': 'rowsanda_107501',
# 'PASSWORD': 'roeidata',
# 'HOST': 'store3.rosti.cz',
# 'PORT': '3306',
# }
}
#BROKER_URL = 'redis://localhost:6379/0'
#CELERY_RESULT_BACKEND = 'redis://localhost:6379/0'
#CELERY_IGNORE_RESULT = False
#CELERY_ACCEPT_CONTENT = ['json']
#CELERY_TASK_SERIALIZER = 'json'
#CELERY_RESULT_SERIALIZER = 'json'
#CELERY_TRACK_STARTED = True
#CELERY_SEND_TASK_SENT_EVENT = True
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
TEMPLATES[0]['OPTIONS']['debug'] = DEBUG
ALLOWED_HOSTS = []
#INSTALLED_APPS += ['debug_toolbar',]
MIDDLEWARE_CLASSES += ['debug_toolbar.middleware.DebugToolbarMiddleware',]
CACHES = {
'default': {
'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
'LOCATION': os.path.join(BASE_DIR, 'django_cache'),
}
}
# Application definition
STATIC_URL = '/static/'
STATIC_ROOT = BASE_DIR
STATICFILES_DIRS = [os.path.join(BASE_DIR,'static/plots'),os.path.join(BASE_DIR,'static'),]
# INTERNAL_IPS = ['127.0.0.1']
MEDIA_URL = '/media/'
MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
LOGIN_REDIRECT_URL = '/rowers/list-workouts/'
SESSION_ENGINE = "django.contrib.sessions.backends.signed_cookies"
SITE_URL = "http://localhost:8000"
#EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
#EMAIL_BACKEND = 'django.core.mail.backends.dummy.EmailBackend'
#EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
#EMAIL_BACKEND = 'django_ses.SESBackend'
AWS_SES_REGION_NAME = 'eu-west-1'
AWS_SES_REGION_ENDPOINT = 'email.eu-west-1.amazonaws.com'
EMAIL_HOST = CFG['aws_smtp']
EMAIL_PORT = CFG['aws_port']
EMAIL_HOST_USER = CFG['aws_smtp_username']
EMAIL_HOST_PASSWORD = CFG['aws_smtp_password']
EMAIL_USE_TLS = CFG['email_use_tls']
DEFAULT_FROM_EMAIL = 'info@rowsandall.com'
SETTINGS_NAME = 'rowsandall_app.settings_thinkpad'
rowsandall_app/urls.py
+6 -1
View File
@@ -63,7 +63,7 @@ urlpatterns += [
{'next_page': '/'},
name='logout',),
url(r'^rowers/',include('rowers.urls')),
url(r'^cvkbrno/',include('cvkbrno.urls')),
# url(r'^cvkbrno/',include('cvkbrno.urls')),
url(r'^admin/rq/',include('django_rq_dashboard.urls')),
url(r'^call\_back',rowersviews.rower_process_callback),
url(r'^stravacall\_back',rowersviews.rower_process_stravacallback),
@@ -82,4 +82,9 @@ if settings.DEBUG:
import debug_toolbar
urlpatterns += [
url(r'^__debug__/',include(debug_toolbar.urls)),
url(
regex=r'^static/(?P<path>.*)$',
view='django.views.static.serve',
kwargs={'document_root': settings.STATIC_ROOT,}
)
]
rqsettings.txt
+24
View File
@@ -0,0 +1,24 @@
[program:myworker]
; Point the command to the specific rq command you want to run.
; If you use virtualenv, be sure to point it to
; /home/sander/python/rowsandall/py2/bin/rq
; Also, you probably want to include a settings module to configure this
; worker. For more info on that, see http://python-rq.org/docs/workers/
command=/path/to/rq worker -c workersettings high normal low
; process_num is required if you specify >1 numprocs
process_name=%(program_name)s-%(process_num)s
; If you want to run more than one worker instance, increase this
numprocs=3
; This is the directory from which RQ is ran. Be sure to point this to the
; directory where your source code is importable from
directory=/path/to
; RQ requires the TERM signal to perform a warm shutdown. If RQ does not die
; within 10 seconds, supervisor will forcefully kill it
stopsignal=TERM
; These are up to you
autostart=true
autorestart=true
static/cookielaw/css/cookielaw.css
+1 -1
View File
@@ -8,7 +8,7 @@
}
#CookielawBanner #CookielawCross {
background: url('/static/img/close.png') no-repeat 0 0;
background: url('../img/close.png') no-repeat 0 0;
cursor: pointer;
display: block;
position: absolute;
static/debug_toolbar/css/toolbar.css
+4 -8
View File
@@ -38,14 +38,13 @@
font-family:sans-serif;
text-align:left;
text-shadow: none;
white-space: normal;
-webkit-transition: none;
-moz-transition: none;
-o-transition: none;
transition: none;
}
#djDebug button, #djDebug a.button {
#djDebug button {
background-color: #eee;
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #eee), color-stop(100%, #cccccc));
background-image: -webkit-linear-gradient(top, #eee, #cccccc);
@@ -65,7 +64,7 @@
text-shadow: 0 1px 0 #eee;
}
#djDebug button:hover, #djDebug a.button:hover {
#djDebug button:hover {
background-color: #ddd;
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ddd), color-stop(100%, #bbb));
background-image: -webkit-linear-gradient(top, #ddd, #bbb);
@@ -79,7 +78,7 @@
text-shadow: 0 1px 0 #ddd;
}
#djDebug button:active, #djDebug a.button:active {
#djDebug button:active {
border: 1px solid #aaa;
border-bottom: 1px solid #888;
-webkit-box-shadow: inset 0 0 5px 2px #aaa, 0 1px 0 0 #eee;
@@ -287,7 +286,7 @@
border-collapse:collapse;
width:100%;
background-color:#fff;
display:table;
display:block;
margin-top:0.8em;
overflow: auto;
}
@@ -657,6 +656,3 @@
#djDebug .djdt-highlighted {
background-color: lightgrey;
}
.djdt-hidden {
display: none;
}
static/debug_toolbar/js/jquery_post.js
Vendored
+1 -4
View File
@@ -1,4 +1 @@
var djdt = {jQuery: jQuery.noConflict(true)};
if (window.define) {
window.define.amd = _djdt_define_amd_backup;
}
var djdt = {jQuery: jQuery.noConflict(true)}; window.define = _djdt_define_backup;
static/debug_toolbar/js/jquery_pre.js
Vendored
+1 -5
View File
@@ -1,5 +1 @@
var _djdt_define_amd_backup;
if (window.define) {
_djdt_define_amd_backup = window.define.amd;
window.define.amd = undefined;
}
var _djdt_define_backup = window.define; window.define = undefined;
static/debug_toolbar/js/toolbar.js
+6 -8
View File
@@ -64,16 +64,16 @@
if (name == 'button') {
var form = self.parents('form:eq(0)');
ajax_data.url = self.attr('formaction');
ajax_data['url'] = self.attr('formaction');
if (form.length) {
ajax_data.data = form.serialize();
ajax_data.type = form.attr('method') || 'POST';
ajax_data['data'] = form.serialize();
ajax_data['type'] = form.attr('method') || 'POST';
}
}
if (name == 'a') {
ajax_data.url = self.attr('href');
ajax_data['url'] = self.attr('href');
}
$.ajax(ajax_data).done(function(data){
@@ -213,13 +213,11 @@
$('#djDebugToolbar li').removeClass('djdt-active');
// finally close toolbar
$('#djDebugToolbar').hide('fast');
handle = $('#djDebugToolbarHandle');
handle.show();
$('#djDebugToolbarHandle').show();
// set handle position
var handleTop = djdt.cookie.get('djdttop');
if (handleTop) {
handleTop = Math.min(handleTop, window.innerHeight - handle.outerHeight() - 10);
handle.css({top: handleTop + 'px'});
$('#djDebugToolbarHandle').css({top: handleTop + 'px'});
}
// Unbind keydown
$(document).unbind('keydown.djDebug');
static/debug_toolbar/js/toolbar.timer.js
+2 -2
View File
@@ -24,13 +24,13 @@
if (endStat) {
// Render a start through end bar
$row.html('<td>' + stat.replace('Start', '') + '</td>' +
'<td class="timeline"><div class="djDebugTimeline"><div class="djDebugLineChart"><strong>&#160;</strong></div></div></td>' +
'<td class="timeline"><div class="djDebugTimeline"><div class="djDebugLineChart"><strong>&nbsp;</strong></div></div></td>' +
'<td>' + (perf.timing[stat] - timingOffset) + ' (+' + (perf.timing[endStat] - perf.timing[stat]) + ')</td>');
$row.find('strong').css({width: getCSSWidth(stat, endStat)});
} else {
// Render a point in time
$row.html('<td>' + stat + '</td>' +
'<td class="timeline"><div class="djDebugTimeline"><div class="djDebugLineChart"><strong>&#160;</strong></div></div></td>' +
'<td class="timeline"><div class="djDebugTimeline"><div class="djDebugLineChart"><strong>&nbsp;</strong></div></div></td>' +
'<td>' + (perf.timing[stat] - timingOffset) + '</td>');
$row.find('strong').css({width: 2});
}