Skip to content

Commit

Permalink
Formatted with new standards and Fixed CI failure
Browse files Browse the repository at this point in the history
  • Loading branch information
joeyagreco committed Dec 5, 2023
1 parent df2660e commit 8842be0
Show file tree
Hide file tree
Showing 98 changed files with 271 additions and 234 deletions.
6 changes: 4 additions & 2 deletions e2e/test-excel.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
from leeger.util.excel import leagueToExcel
from variables import LEAGUE
import os

from variables import LEAGUE

from leeger.util.excel import leagueToExcel

if __name__ == "__main__":
tempDir = os.environ["TEMP_DIR"]

Expand Down
5 changes: 2 additions & 3 deletions e2e/variables.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
from leeger.enum import MatchupType

from leeger.model.league import Owner, Team, Matchup, Week, Year, League, YearSettings
from leeger.model.league import (League, Matchup, Owner, Team, Week, Year,
YearSettings)
from leeger.model.league.Division import Division


ownerFrankie = Owner(name="Frankie")
ownerMonika = Owner(name="Monika")
ownerJoseph = Owner(name="Joseph")
Expand Down
1 change: 0 additions & 1 deletion example/league/comparingLeagueObjects.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from leeger.league_loader.ESPNLeagueLoader import ESPNLeagueLoader

from leeger.model.league import League

if __name__ == "__main__":
Expand Down
4 changes: 2 additions & 2 deletions example/league/manualLeagueBuildingExample.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from leeger.enum import MatchupType

from leeger.model.league import Owner, Team, Matchup, Week, Year, League, YearSettings
from leeger.model.league import (League, Matchup, Owner, Team, Week, Year,
YearSettings)
from leeger.model.league.Division import Division

if __name__ == "__main__":
Expand Down
2 changes: 1 addition & 1 deletion example/league/yearSettings.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from leeger.model.league import YearSettings, Year
from leeger.model.league import Year, YearSettings

if __name__ == "__main__":
# Year Settings are settings for each year in a league that represent features of the league.
Expand Down
3 changes: 2 additions & 1 deletion example/league_loader/fleaflickerLeagueLoaderExample.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from leeger.league_loader.FleaflickerLeagueLoader import FleaflickerLeagueLoader
from leeger.league_loader.FleaflickerLeagueLoader import \
FleaflickerLeagueLoader
from leeger.model.league import League

if __name__ == "__main__":
Expand Down
12 changes: 4 additions & 8 deletions example/stat/gettingStatsAllTimeExample.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
from leeger.calculator.all_time_calculator import (
GameOutcomeAllTimeCalculator,
PointsScoredAllTimeCalculator,
SingleScoreAllTimeCalculator,
ScoringShareAllTimeCalculator,
AWALAllTimeCalculator,
ScoringStandardDeviationAllTimeCalculator,
SmartWinsAllTimeCalculator,
)
AWALAllTimeCalculator, GameOutcomeAllTimeCalculator,
PointsScoredAllTimeCalculator, ScoringShareAllTimeCalculator,
ScoringStandardDeviationAllTimeCalculator, SingleScoreAllTimeCalculator,
SmartWinsAllTimeCalculator)
from leeger.league_loader import ESPNLeagueLoader
from leeger.model.league import League
from leeger.model.stat.AllTimeStatSheet import AllTimeStatSheet
Expand Down
9 changes: 3 additions & 6 deletions example/stat/gettingStatsForYearExample.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
from leeger.calculator.year_calculator import (
GameOutcomeYearCalculator,
PointsScoredYearCalculator,
SingleScoreYearCalculator,
ScoringShareYearCalculator,
ScoringStandardDeviationYearCalculator,
)
GameOutcomeYearCalculator, PointsScoredYearCalculator,
ScoringShareYearCalculator, ScoringStandardDeviationYearCalculator,
SingleScoreYearCalculator)
from leeger.league_loader import ESPNLeagueLoader
from leeger.model.league import League, Year
from leeger.model.stat.YearStatSheet import YearStatSheet
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
from typing import Optional

from leeger.calculator.parent.AllTimeCalculator import AllTimeCalculator
from leeger.calculator.year_calculator.AWALYearCalculator import AWALYearCalculator
from leeger.calculator.year_calculator.AWALYearCalculator import \
AWALYearCalculator
from leeger.decorator.validators import validateLeague
from leeger.model.filter import AllTimeFilters
from leeger.model.league.League import League
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
from typing import Optional

from leeger.calculator.parent.AllTimeCalculator import AllTimeCalculator
from leeger.calculator.year_calculator.GameOutcomeYearCalculator import GameOutcomeYearCalculator
from leeger.calculator.year_calculator.GameOutcomeYearCalculator import \
GameOutcomeYearCalculator
from leeger.decorator.validators import validateLeague
from leeger.model.filter import AllTimeFilters
from leeger.model.league.League import League
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
from typing import Optional

from leeger.calculator.parent.AllTimeCalculator import AllTimeCalculator
from leeger.calculator.year_calculator.PlusMinusYearCalculator import PlusMinusYearCalculator
from leeger.calculator.year_calculator.PlusMinusYearCalculator import \
PlusMinusYearCalculator
from leeger.decorator.validators import validateLeague
from leeger.model.league.League import League
from leeger.util.Deci import Deci
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
from typing import Optional

from leeger.calculator.parent.AllTimeCalculator import AllTimeCalculator
from leeger.calculator.year_calculator.PointsScoredYearCalculator import PointsScoredYearCalculator
from leeger.calculator.year_calculator.PointsScoredYearCalculator import \
PointsScoredYearCalculator
from leeger.decorator.validators import validateLeague
from leeger.model.filter import AllTimeFilters
from leeger.model.league.League import League
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
from typing import Optional

from leeger.calculator.parent.AllTimeCalculator import AllTimeCalculator
from leeger.calculator.year_calculator.SSLYearCalculator import SSLYearCalculator
from leeger.calculator.year_calculator.SSLYearCalculator import \
SSLYearCalculator
from leeger.decorator.validators import validateLeague
from leeger.model.filter import AllTimeFilters
from leeger.model.league.League import League
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
from typing import Optional

from leeger.calculator.all_time_calculator.PointsScoredAllTimeCalculator import (
PointsScoredAllTimeCalculator,
)
from leeger.calculator.all_time_calculator.PointsScoredAllTimeCalculator import \
PointsScoredAllTimeCalculator
from leeger.calculator.parent.AllTimeCalculator import AllTimeCalculator
from leeger.calculator.year_calculator import ScoringShareYearCalculator
from leeger.decorator.validators import validateLeague
Expand Down
5 changes: 3 additions & 2 deletions leeger/calculator/all_time_calculator/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
from .GameOutcomeAllTimeCalculator import GameOutcomeAllTimeCalculator
from .PlusMinusAllTimeCalculator import PlusMinusAllTimeCalculator
from .PointsScoredAllTimeCalculator import PointsScoredAllTimeCalculator
from .SSLAllTimeCalculator import SSLAllTimeCalculator
from .ScoringShareAllTimeCalculator import ScoringShareAllTimeCalculator
from .ScoringStandardDeviationAllTimeCalculator import ScoringStandardDeviationAllTimeCalculator
from .ScoringStandardDeviationAllTimeCalculator import \
ScoringStandardDeviationAllTimeCalculator
from .SingleScoreAllTimeCalculator import SingleScoreAllTimeCalculator
from .SmartWinsAllTimeCalculator import SmartWinsAllTimeCalculator
from .SSLAllTimeCalculator import SSLAllTimeCalculator
from .TeamSummaryAllTimeCalculator import TeamSummaryAllTimeCalculator
3 changes: 2 additions & 1 deletion leeger/calculator/year_calculator/AWALYearCalculator.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
from typing import Optional

from leeger.calculator.parent.YearCalculator import YearCalculator
from leeger.calculator.year_calculator.GameOutcomeYearCalculator import GameOutcomeYearCalculator
from leeger.calculator.year_calculator.GameOutcomeYearCalculator import \
GameOutcomeYearCalculator
from leeger.decorator.validators import validateYear
from leeger.model.filter import YearFilters
from leeger.model.filter.WeekFilters import WeekFilters
Expand Down
3 changes: 2 additions & 1 deletion leeger/calculator/year_calculator/PlusMinusYearCalculator.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
from typing import Optional

from leeger.calculator.parent.YearCalculator import YearCalculator
from leeger.calculator.year_calculator.PointsScoredYearCalculator import PointsScoredYearCalculator
from leeger.calculator.year_calculator.PointsScoredYearCalculator import \
PointsScoredYearCalculator
from leeger.decorator.validators import validateYear
from leeger.model.league.Year import Year
from leeger.util.Deci import Deci
Expand Down
12 changes: 8 additions & 4 deletions leeger/calculator/year_calculator/SSLYearCalculator.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
from typing import Optional

from leeger.calculator.parent.YearCalculator import YearCalculator
from leeger.calculator.year_calculator.AWALYearCalculator import AWALYearCalculator
from leeger.calculator.year_calculator.GameOutcomeYearCalculator import GameOutcomeYearCalculator
from leeger.calculator.year_calculator.ScoringShareYearCalculator import ScoringShareYearCalculator
from leeger.calculator.year_calculator.SingleScoreYearCalculator import SingleScoreYearCalculator
from leeger.calculator.year_calculator.AWALYearCalculator import \
AWALYearCalculator
from leeger.calculator.year_calculator.GameOutcomeYearCalculator import \
GameOutcomeYearCalculator
from leeger.calculator.year_calculator.ScoringShareYearCalculator import \
ScoringShareYearCalculator
from leeger.calculator.year_calculator.SingleScoreYearCalculator import \
SingleScoreYearCalculator
from leeger.decorator.validators import validateYear
from leeger.model.league.Year import Year
from leeger.util.Deci import Deci
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
from typing import Optional

from leeger.calculator.parent.YearCalculator import YearCalculator
from leeger.calculator.year_calculator.PointsScoredYearCalculator import PointsScoredYearCalculator
from leeger.calculator.year_calculator.PointsScoredYearCalculator import \
PointsScoredYearCalculator
from leeger.decorator.validators import validateYear
from leeger.model.filter import YearFilters, WeekFilters
from leeger.model.filter import WeekFilters, YearFilters
from leeger.model.league.Year import Year
from leeger.util.Deci import Deci
from leeger.util.GeneralUtil import GeneralUtil
Expand Down
5 changes: 3 additions & 2 deletions leeger/calculator/year_calculator/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
from .GameOutcomeYearCalculator import GameOutcomeYearCalculator
from .PlusMinusYearCalculator import PlusMinusYearCalculator
from .PointsScoredYearCalculator import PointsScoredYearCalculator
from .SSLYearCalculator import SSLYearCalculator
from .ScoringShareYearCalculator import ScoringShareYearCalculator
from .ScoringStandardDeviationYearCalculator import ScoringStandardDeviationYearCalculator
from .ScoringStandardDeviationYearCalculator import \
ScoringStandardDeviationYearCalculator
from .SingleScoreYearCalculator import SingleScoreYearCalculator
from .SmartWinsYearCalculator import SmartWinsYearCalculator
from .SSLYearCalculator import SSLYearCalculator
from .TeamSummaryYearCalculator import TeamSummaryYearCalculator
3 changes: 2 additions & 1 deletion leeger/decorator/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
from .validators import validateLeague, validateYear, validateWeek, validateMatchup
from .validators import (validateLeague, validateMatchup, validateWeek,
validateYear)
3 changes: 2 additions & 1 deletion leeger/decorator/validators.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
from leeger.model.league.Matchup import Matchup
from leeger.model.league.Week import Week
from leeger.model.league.Year import Year
from leeger.validate import matchupValidation, yearValidation, weekValidation, leagueValidation
from leeger.validate import (leagueValidation, matchupValidation,
weekValidation, yearValidation)


def __shouldValidate(kwargs) -> bool:
Expand Down
2 changes: 1 addition & 1 deletion leeger/enum/MatchupType.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from __future__ import annotations

from enum import unique, Enum
from enum import Enum, unique


@unique
Expand Down
6 changes: 4 additions & 2 deletions leeger/exception/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
from .InvalidTeamFormatException import InvalidTeamFormatException
from .InvalidWeekFormatException import InvalidWeekFormatException
from .InvalidYearFormatException import InvalidYearFormatException
from .InvalidYearSettingsFormatException import InvalidYearSettingsFormatException
from .InvalidYearSettingsFormatException import \
InvalidYearSettingsFormatException
from .LeagueLoaderException import LeagueLoaderException
from .UnsupportedLeegerFeatureException import UnsupportedLeegerFeatureException
from .UnsupportedLeegerFeatureException import \
UnsupportedLeegerFeatureException
1 change: 1 addition & 0 deletions leeger/league_loader/ESPNLeagueLoader.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from typing import Optional

import espn_api.football as espn
from espn_api.football import League as ESPNLeague
from espn_api.football import Team as ESPNTeam
Expand Down
3 changes: 2 additions & 1 deletion leeger/league_loader/FleaflickerLeagueLoader.py
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
from typing import Optional

from fleaflicker.api.LeagueInfoAPIClient import LeagueInfoAPIClient
from fleaflicker.api.ScoringAPIClient import ScoringAPIClient
from fleaflicker.enum.Sport import Sport
from sleeper.enum import Sport

from leeger.enum.MatchupType import MatchupType
from leeger.league_loader.LeagueLoader import LeagueLoader
from leeger.model.league.Division import Division
from leeger.model.league.League import League
from leeger.model.league.Matchup import Matchup
from leeger.model.league.Owner import Owner
from leeger.model.league.Team import Team
from leeger.model.league.Week import Week
from leeger.model.league.Year import Year
from leeger.validate import leagueValidation
from leeger.model.league.Division import Division


class FleaflickerLeagueLoader(LeagueLoader):
Expand Down
3 changes: 2 additions & 1 deletion leeger/league_loader/MyFantasyLeagueLeagueLoader.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
from typing import Optional

from pymfl.api import CommonLeagueInfoAPIClient
from pymfl.api.config import APIConfig

from leeger.enum.MatchupType import MatchupType
from leeger.league_loader.LeagueLoader import LeagueLoader
from leeger.model.league.Division import Division
from leeger.model.league.League import League
from leeger.model.league.Matchup import Matchup
from leeger.model.league.Owner import Owner
from leeger.model.league.Team import Team
from leeger.model.league.Week import Week
from leeger.model.league.Year import Year
from leeger.validate import leagueValidation
from leeger.model.league.Division import Division


class MyFantasyLeagueLeagueLoader(LeagueLoader):
Expand Down
10 changes: 5 additions & 5 deletions leeger/league_loader/SleeperLeagueLoader.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,28 @@
from typing import Optional

from sleeper.api import LeagueAPIClient
from sleeper.enum import Sport as SleeperSport
from sleeper.enum import SeasonStatus as SleeperSeasonStatus
from sleeper.enum import PlayoffRoundType as SleeperPlayoffRoundType
from sleeper.enum import SeasonStatus as SleeperSeasonStatus
from sleeper.enum import Sport as SleeperSport
from sleeper.model import League as SleeperLeague
from sleeper.model import Matchup as SleeperMatchup
from sleeper.model import PlayoffMatchup as SleeperPlayoffMatchup
from sleeper.model import User as SleeperUser
from sleeper.model import SportState as SleeperSportState
from sleeper.model import User as SleeperUser

from leeger.enum.MatchupType import MatchupType
from leeger.exception.DoesNotExistException import DoesNotExistException
from leeger.exception.LeagueLoaderException import LeagueLoaderException
from leeger.league_loader.LeagueLoader import LeagueLoader
from leeger.model.league import YearSettings
from leeger.model.league.Division import Division
from leeger.model.league.League import League
from leeger.model.league.Matchup import Matchup
from leeger.model.league.Owner import Owner
from leeger.model.league.Team import Team
from leeger.model.league.Week import Week
from leeger.model.league.Year import Year
from leeger.validate import leagueValidation
from leeger.exception.LeagueLoaderException import LeagueLoaderException
from leeger.model.league.Division import Division


class SleeperLeagueLoader(LeagueLoader):
Expand Down
2 changes: 1 addition & 1 deletion leeger/model/abstract/UniqueId.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from abc import ABC
from dataclasses import field, dataclass
from dataclasses import dataclass, field

from leeger.util.IdGenerator import IdGenerator

Expand Down
4 changes: 2 additions & 2 deletions leeger/model/league/Division.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
from __future__ import annotations

from dataclasses import dataclass
from leeger.model.abstract.EqualityCheck import EqualityCheck

from leeger.model.abstract.EqualityCheck import EqualityCheck
from leeger.model.abstract.UniqueId import UniqueId
from leeger.util.CustomLogger import CustomLogger
from leeger.util.equality import modelEquals
from leeger.util.JSONDeserializable import JSONDeserializable
from leeger.util.JSONSerializable import JSONSerializable
from leeger.util.equality import modelEquals


@dataclass(kw_only=True, eq=False)
Expand Down
2 changes: 1 addition & 1 deletion leeger/model/league/League.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
from leeger.model.league.Owner import Owner
from leeger.model.league.Year import Year
from leeger.util.CustomLogger import CustomLogger
from leeger.util.equality import modelEquals
from leeger.util.JSONDeserializable import JSONDeserializable
from leeger.util.JSONSerializable import JSONSerializable
from leeger.util.equality import modelEquals


@dataclass(kw_only=True, eq=False)
Expand Down
5 changes: 3 additions & 2 deletions leeger/model/league/Matchup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@

from leeger.enum.MatchupType import MatchupType
from leeger.exception import DoesNotExistException
from leeger.exception.InvalidMatchupFormatException import InvalidMatchupFormatException
from leeger.exception.InvalidMatchupFormatException import \
InvalidMatchupFormatException
from leeger.model.abstract.EqualityCheck import EqualityCheck
from leeger.model.abstract.UniqueId import UniqueId
from leeger.model.league_helper.Performance import Performance
from leeger.util.CustomLogger import CustomLogger
from leeger.util.equality import modelEquals
from leeger.util.JSONDeserializable import JSONDeserializable
from leeger.util.JSONSerializable import JSONSerializable
from leeger.util.equality import modelEquals


@dataclass(kw_only=True, eq=False)
Expand Down
Loading

0 comments on commit 8842be0

Please sign in to comment.