Skip to content

Commit

Permalink
Merge pull request #126 from chris0chris/dependency-update
Browse files Browse the repository at this point in the history
Dependency update
  • Loading branch information
chris0chris authored Feb 9, 2024
2 parents 33525e1 + 94c35b2 commit 6b89eb7
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 20 deletions.
5 changes: 3 additions & 2 deletions gamedays/service/model_wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,8 @@ def _get_table(self):

def get_qualify_team_by(self, place, standing):
qualify_round = self._get_table()
return qualify_round.groupby(STANDING).nth(place - 1).loc[standing][TEAM_NAME]
nth_standing = qualify_round.groupby(STANDING).nth(place - 1)
return nth_standing[nth_standing[STANDING] == standing][TEAM_NAME].iloc[0]

def get_team_by_points(self, place, standing, points):
teams = self._get_teams_by(standing, points)
Expand All @@ -168,7 +169,7 @@ def _has_standing(self, check):
def is_finished(self, check):
if self._has_standing(check):
return len(self._gameinfo[(self._gameinfo[STANDING] == check) & (self._gameinfo[STATUS] == FINISHED)]) \
== len(self._gameinfo[(self._gameinfo[STANDING] == check)])
== len(self._gameinfo[(self._gameinfo[STANDING] == check)])

return len(self._gameinfo[(self._gameinfo[STAGE] == check) & (self._gameinfo[STATUS] == FINISHED)]) == len(
self._gameinfo[(self._gameinfo[STAGE] == check)])
Expand Down
2 changes: 1 addition & 1 deletion league_table/service/league_table.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def get_standing(self, season=None, league=None):
for gameday in all_gamedays:
try:
gmw = GamedayModelWrapper(gameday.pk)
all_standings = all_standings.append(gmw.get_final_table(), ignore_index=True)
all_standings = pd.concat([all_standings, gmw.get_final_table()], ignore_index=True)
except Gameinfo.DoesNotExist:
pass
if all_standings.empty:
Expand Down
24 changes: 12 additions & 12 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
Django==4.1.7
django-crispy-forms==2.0
crispy-bootstrap5==0.7
numpy==1.24.2
pandas==1.4.3
Django==4.2.9
django-crispy-forms==2.1
crispy-bootstrap5==2023.10
numpy==1.26.3
pandas==2.2.0
django-pandas==0.6.6
djangorestframework==3.14.0
Markdown==3.4.1
django-cors-headers==3.14.0
Pillow==9.5.0
Markdown==3.5.2
django-cors-headers==4.3.1
Pillow==10.2.0
django-rest-knox==4.2.0
django-debug-toolbar==3.5.0
python-dotenv==1.0.0
mysqlclient==2.1.1
django-debug-toolbar==4.2.0
python-dotenv==1.0.1
mysqlclient==2.2.1

WebTest==3.0.0
requests==2.28.2
requests==2.31.0
10 changes: 5 additions & 5 deletions test_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
django-webtest==1.9.10
pytest==7.2.2
pytest-django==4.5.2
pytest-cov==4.0.0
factory-boy==3.2.1
django-webtest==1.9.11
pytest==7.4.4
pytest-django==4.7.0
pytest-cov==4.1.0
factory-boy==3.3.0

0 comments on commit 6b89eb7

Please sign in to comment.