diff --git a/.circleci/config.yml b/.circleci/config.yml index e89a8abe..85dfc97c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -19,7 +19,7 @@ jobs: - run: python --version ; pip --version ; pwd ; ls -l - run: pip install black codespell ruff - run: codespell -L queenland,uint,assertin - - run: ruff . + - run: ruff check - run: black . --check diff --git a/new_units.py b/new_units.py index 86d82ee5..26ffa133 100644 --- a/new_units.py +++ b/new_units.py @@ -9,7 +9,7 @@ import sys UNIT_LOOKUP = dict() -for entry in pkgutil.get_data("sc2reader.data", "unit_lookup.csv").split("\n"): +for entry in pkgutil.get_data("sc2reader.data", "unit_lookup.csv").splitlines(): if not entry: continue str_id, title = entry.strip().split(",") @@ -25,7 +25,7 @@ print("") ABIL_LOOKUP = dict() -for entry in pkgutil.get_data("sc2reader.data", "ability_lookup.csv").split("\n"): +for entry in pkgutil.get_data("sc2reader.data", "ability_lookup.csv").splitlines(): if not entry: continue str_id, abilities = entry.split(",", 1) diff --git a/sc2reader/data/__init__.py b/sc2reader/data/__init__.py index ccd6455c..10598e02 100755 --- a/sc2reader/data/__init__.py +++ b/sc2reader/data/__init__.py @@ -15,7 +15,7 @@ ABIL_LOOKUP = dict() for entry in ( - pkgutil.get_data("sc2reader.data", "ability_lookup.csv").decode("utf8").split("\n") + pkgutil.get_data("sc2reader.data", "ability_lookup.csv").decode("utf8").splitlines() ): if not entry: continue @@ -24,7 +24,7 @@ UNIT_LOOKUP = dict() for entry in ( - pkgutil.get_data("sc2reader.data", "unit_lookup.csv").decode("utf8").split("\n") + pkgutil.get_data("sc2reader.data", "unit_lookup.csv").decode("utf8").splitlines() ): if not entry: continue @@ -401,7 +401,7 @@ def load_build(expansion, version): unit_file = f"{expansion}/{version}_units.csv" for entry in ( - pkgutil.get_data("sc2reader.data", unit_file).decode("utf8").split("\n") + pkgutil.get_data("sc2reader.data", unit_file).decode("utf8").splitlines() ): if not entry: continue @@ -421,7 +421,7 @@ def load_build(expansion, version): abil_file = f"{expansion}/{version}_abilities.csv" build.add_ability(ability_id=0, name="RightClick", title="Right Click") for entry in ( - pkgutil.get_data("sc2reader.data", abil_file).decode("utf8").split("\n") + pkgutil.get_data("sc2reader.data", abil_file).decode("utf8").splitlines() ): if not entry: continue diff --git a/sc2reader/objects.py b/sc2reader/objects.py index 9ee978e7..10dbc755 100644 --- a/sc2reader/objects.py +++ b/sc2reader/objects.py @@ -48,7 +48,7 @@ def lineup(self): return "".join(sorted(p.play_race[0].upper() for p in self.players)) @property - def hash(self): + def hash(self): # noqa: F811 raw_hash = ",".join(sorted(p.url for p in self.players)) return hashlib.sha256(raw_hash).hexdigest()