Skip to content

Commit e3dbf99

Browse files
committed
Merge branch 'feature/history' into 'develop'
Feature/history See merge request PBSA/PeerplaysIO/bos/CouchPotato/python-cp-gui!17
2 parents 6f1efe2 + 8d77593 commit e3dbf99

3 files changed

Lines changed: 20 additions & 100 deletions

File tree

couchpotato/feed.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,8 @@ def MatchingEvents(self, leagueIds):
258258
eventsFromFeed = eventsFromFeed + self.Past15(leagueId)
259259
eventsFromChain = self.cp.EventsAllSortedForApi()
260260
matchingEvents = []
261+
if isinstance(eventsFromChain, type(None)):
262+
return matchingEvents
261263
for k in range(len(eventsFromChain)):
262264
# eventFromChain = eventsFromChain.iloc[k]
263265
eventFromChain = eventsFromChain[k]

couchpotato/home/templates/create_cp.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,12 +237,12 @@ <h3> Start Time</h3>
237237
function(data, status){
238238
if (data.success == 'Posted'){
239239
alert(data.message)
240+
window.location.href = '/'
240241
}
241242

242243
// console.log(data.message)
243244
// console.log(data.message.id)
244245

245-
// window.location.href = '/'
246246
});
247247
}
248248

requirements.txt

Lines changed: 17 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -1,101 +1,19 @@
1-
bookiesports
2-
bos-mint
3-
bos-incidents
4-
django-sslserver
5-
6-
aiohttp==3.7.4
7-
appdirs==1.4.4
8-
asgiref==3.3.1
9-
async-timeout==3.0.1
10-
asyncinit==0.2.4
11-
attrs==20.3.0
12-
backcall==0.2.0
13-
base58==2.0.1
14-
blinker==1.4
15-
bos-sync==0.3.0
16-
certifi==2020.12.5
17-
chardet==3.0.4
18-
click-datetime==0.2
19-
click==7.1.2
20-
colorlog==4.6.2
21-
coreapi==2.3.3
22-
coreschema==0.0.4
23-
dateutils==0.6.12
24-
decorator==4.4.2
25-
django-rest-swagger==2.2.0
26-
django-rest-swagger==2.2.0
27-
Django==3.1.6
28-
djangorestframework==3.12.2
29-
dnspython==2.0.0
30-
drf-yasg==1.20.0
31-
drf-yasg==1.20.0
32-
ecdsa==0.13.3
33-
email-validator==1.1.2
34-
Events==0.4
35-
expiringdict==1.2.1
36-
Flask-Assets==2.0
37-
Flask-Mail==0.9.1
38-
Flask-Markdown==0.3
39-
Flask-Script==2.0.6
40-
Flask-SQLAlchemy==2.4.4
41-
Flask-WTF==0.14.3
42-
Flask==1.1.2
43-
future==0.18.2
44-
graphenelib==1.0.1
45-
idna==2.8
46-
importlib-metadata==3.3.0
47-
ipython
48-
ipython-genutils==0.2.0
49-
itsdangerous==1.1.0
50-
jedi==0.17.2
51-
Jinja2==2.11.3
1+
requests==2.22.0
2+
bookied_sync==0.0.3
3+
bos_incidents==0.4.1
4+
bos_mint==0.5.4
5+
click==8.0.0
6+
colorlog==5.0.1
7+
Django==3.2.3
8+
djangorestframework==3.12.4
9+
drf_yasg==1.20.0
5210
jsonschema==3.2.0
53-
Markdown==3.3.3
54-
MarkupSafe==1.1.1
55-
multidict==5.1.0
56-
mysqlclient
57-
numpy==1.19.4
58-
openapi-codec==1.3.2
59-
pandas
60-
parso==0.7.1
11+
numpy==1.20.3
12+
pandas==1.2.4
6113
peerplays==0.3.0
62-
pexpect==4.8.0
63-
pickleshare==0.7.5
64-
prettytable==2.0.0
65-
prompt-toolkit==3.0.8
66-
ptyprocess==0.6.0
67-
pyasn1==0.4.8
68-
pycparser==2.20
69-
pycryptodome==3.9.9
70-
Pygments==2.7.4
71-
pylibscrypt==1.8.0
72-
pymongo==3.11.2
73-
pyparsing==2.4.7
74-
pyrsistent==0.17.3
75-
python-dateutil==2.8.1
76-
pytz==2020.4
77-
PyYAML==5.4
78-
requests==2.22.0
79-
ruamel.yaml==0.16.12
80-
scrypt==0.8.17
81-
simplejson==3.17.2
82-
six==1.15.0
83-
SQLAlchemy==1.3.20
84-
sqlparse==0.4.1
85-
strict-rfc3339==0.7
86-
telegram
87-
tqdm==4.54.1
88-
traitlets
89-
treelib==1.6.1
90-
typing-extensions==3.7.4.3
91-
uritemplate
92-
urllib3==1.24.3
93-
uWSGI
94-
wcwidth==0.2.5
95-
webassets==2.0
96-
websocket-client==0.56.0
97-
websockets==8.1
98-
Werkzeug==1.0.1
99-
WTForms==2.3.3
100-
yarl==1.6.3
101-
zipp==3.4.0
14+
python_dateutil==2.8.1
15+
pytz==2021.1
16+
PyYAML==5.4.1
17+
strict_rfc3339==0.7
18+
telegram==0.0.1
19+
django-sslserver

0 commit comments

Comments
 (0)