Private
Public Access
1
0

working with go

This commit is contained in:
Sander Roosendaal
2019-12-19 20:53:06 +01:00
parent 921e58eef7
commit a06792553a
2 changed files with 36 additions and 30 deletions

View File

@@ -72,6 +72,8 @@ fsspec==0.5.2
future==0.17.1 future==0.17.1
geocoder==1.38.1 geocoder==1.38.1
geos==0.2.1 geos==0.2.1
grpcio==1.26.0
grpcio-tools==1.26.0
holoviews==1.11.3 holoviews==1.11.3
html5lib==1.0.1 html5lib==1.0.1
htmlmin==0.1.12 htmlmin==0.1.12
@@ -93,6 +95,7 @@ itypes==1.1.0
jedi==0.13.3 jedi==0.13.3
jeepney==0.4 jeepney==0.4
Jinja2==2.10 Jinja2==2.10
json5==0.8.5
jsonschema==3.0.1 jsonschema==3.0.1
jupyter==1.0.0 jupyter==1.0.0
jupyter-client==5.2.4 jupyter-client==5.2.4
@@ -140,6 +143,7 @@ pip-upgrader==1.4.6
pluggy==0.9.0 pluggy==0.9.0
prometheus-client==0.6.0 prometheus-client==0.6.0
prompt-toolkit==2.0.9 prompt-toolkit==2.0.9
protobuf==3.11.1
psycopg2==2.8.1 psycopg2==2.8.1
ptyprocess==0.6.0 ptyprocess==0.6.0
py==1.8.0 py==1.8.0
@@ -169,7 +173,7 @@ ratelim==0.1.6
redis==3.2.1 redis==3.2.1
requests==2.21.0 requests==2.21.0
requests-oauthlib==1.2.0 requests-oauthlib==1.2.0
rowingdata==2.5.5 rowingdata==2.5.7
rowingphysics==0.5.0 rowingphysics==0.5.0
rq==0.13.0 rq==0.13.0
scipy==1.2.1 scipy==1.2.1

View File

@@ -1523,7 +1523,6 @@ def handle_otwsetpower(self,f1, boattype, weightvalue,
if 'go_service' in kwargs: if 'go_service' in kwargs:
goservice = kwargs['go_service'] goservice = kwargs['go_service']
print('Setting goservice to ', goservice)
else: else:
goservice = False goservice = False
@@ -1541,7 +1540,6 @@ def handle_otwsetpower(self,f1, boattype, weightvalue,
csvfile = f1+'.gz' csvfile = f1+'.gz'
csvfile = os.path.abspath(csvfile) csvfile = os.path.abspath(csvfile)
print('csvfile ',csvfile)
# do something with boat type # do something with boat type
try: try:
@@ -1594,38 +1592,42 @@ def handle_otwsetpower(self,f1, boattype, weightvalue,
secret = secret, secret = secret,
silent = False, silent = False,
),timeout=600) ),timeout=600)
return response.result result = response.result
if result == 0:
# send failure email
return 0
else:
boatfile = {
'1x': 'static/rigging/1x.txt',
'2x': 'static/rigging/2x.txt',
'2-': 'static/rigging/2-.txt',
'4x': 'static/rigging/4x.txt',
'4-': 'static/rigging/4-.txt',
'8+': 'static/rigging/8+.txt',
}
try:
rg = rowingdata.getrigging(boatfile[boattype])
except KeyError:
rg = rowingdata.getrigging('static/rigging/1x.txt')
# determine cache file name
physics_cache = 'media/'+str(boattype)+'_'+str(int(weightvalue))
boatfile = { rowdata.otw_setpower(skiprows=5, mc=weightvalue, rg=rg,
'1x': 'static/rigging/1x.txt', powermeasured=powermeasured,
'2x': 'static/rigging/2x.txt', progressurl=progressurl,
'2-': 'static/rigging/2-.txt', secret=secret,
'4x': 'static/rigging/4x.txt', silent=True,
'4-': 'static/rigging/4-.txt', usetable=usetable,storetable=physics_cache,
'8+': 'static/rigging/8+.txt', )
}
try:
rg = rowingdata.getrigging(boatfile[boattype])
except KeyError:
rg = rowingdata.getrigging('static/rigging/1x.txt')
# determine cache file name # save data
physics_cache = 'media/'+str(boattype)+'_'+str(int(weightvalue)) rowdata.write_csv(f1, gzip=True)
# continuing for both
rowdata.otw_setpower(skiprows=5, mc=weightvalue, rg=rg,
powermeasured=powermeasured,
progressurl=progressurl,
secret=secret,
silent=True,
usetable=usetable,storetable=physics_cache,
)
# save data
rowdata.write_csv(f1, gzip=True)
update_strokedata(workoutid, rowdata.df, debug=debug) update_strokedata(workoutid, rowdata.df, debug=debug)
totaltime = rowdata.df['TimeStamp (sec)'].max( totaltime = rowdata.df['TimeStamp (sec)'].max(