bump ruff version (#33)

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.3.4
+    rev: v0.6.8
     hooks:
       - id: ruff
         args: [--fix]

neofoodclub/neofoodclub.pyi

@@ -1,7 +1,5 @@
-from __future__ import annotations
-
 from dataclasses import dataclass
-from typing import Sequence
+from collections.abc import Sequence
 
 @dataclass
 class OddsChange:

pyproject.toml

@@ -25,3 +25,27 @@ reportUnnecessaryTypeIgnoreComment = "warning"
 reportUnusedImport = "error"
 pythonVersion = "3.10"
 typeCheckingMode = "basic"
+
+[tool.ruff]
+show-fixes = true
+target-version = "py310"
+
+[tool.ruff.lint]
+extend-select = [
+    "C4",
+    "SIM",
+    "TCH",
+    "UP",
+    "ANN201",
+    "ANN202",
+    "ANN204",
+    "ANN205",
+    "ANN206",
+]
+ignore = ["E501", "F403"]
+
+[tool.ruff.format]
+quote-style = "double"
+indent-style = "space"
+skip-magic-trailing-comma = false
+line-ending = "auto"

tests/conftest.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import json
-from typing import Tuple
 
 import pytest
 
@@ -80,82 +79,82 @@
 }
 
 
-@pytest.fixture()
+@pytest.fixture
 def test_round_data_json() -> str:
     return json.dumps(round_dict)
 
 
-@pytest.fixture()
+@pytest.fixture
 def test_round_data_round_9088() -> str:
     # the significance of this round is that gmer and mer don't match
     # which is better for our tests
     return '{"foods":[[33,34,2,38,14,3,8,21,24,9],[16,5,15,8,9,29,3,39,38,4],[30,4,7,2,5,13,1,6,39,23],[29,7,37,15,27,18,34,8,30,20],[23,12,32,31,3,18,11,37,29,15]],"round":9088,"start":"2024-03-23T23:25:08+00:00","changes":[{"t":"2024-03-24T00:01:12+00:00","new":13,"old":10,"arena":2,"pirate":3},{"t":"2024-03-24T00:01:12+00:00","new":9,"old":7,"arena":3,"pirate":3},{"t":"2024-03-24T00:01:12+00:00","new":7,"old":5,"arena":3,"pirate":4},{"t":"2024-03-24T00:02:06+00:00","new":13,"old":10,"arena":4,"pirate":4},{"t":"2024-03-24T00:05:03+00:00","new":13,"old":12,"arena":1,"pirate":1},{"t":"2024-03-24T00:36:54+00:00","new":8,"old":9,"arena":0,"pirate":2},{"t":"2024-03-24T00:37:12+00:00","new":9,"old":8,"arena":0,"pirate":2},{"t":"2024-03-24T00:37:30+00:00","new":8,"old":9,"arena":0,"pirate":2},{"t":"2024-03-24T01:02:33+00:00","new":5,"old":6,"arena":1,"pirate":3},{"t":"2024-03-24T01:02:51+00:00","new":6,"old":5,"arena":1,"pirate":3},{"t":"2024-03-24T01:03:09+00:00","new":5,"old":6,"arena":1,"pirate":3},{"t":"2024-03-24T14:32:34+00:00","new":6,"old":5,"arena":1,"pirate":3},{"t":"2024-03-24T14:33:30+00:00","new":5,"old":6,"arena":1,"pirate":3},{"t":"2024-03-24T14:33:49+00:00","new":6,"old":5,"arena":1,"pirate":3}],"pirates":[[10,13,20,17],[14,4,5,16],[12,15,2,3],[9,1,8,7],[11,19,18,6]],"winners":[3,3,2,2,2],"timestamp":"2024-03-24T23:24:53+00:00","lastChange":"2024-03-24T14:33:49+00:00","currentOdds":[[1,13,8,2,2],[1,13,2,6,2],[1,13,2,13,13],[1,13,2,9,7],[1,13,2,13,13]],"openingOdds":[[1,13,9,2,2],[1,12,2,6,2],[1,13,2,10,13],[1,13,2,7,5],[1,13,2,13,10]]}'
 
 
-@pytest.fixture()
+@pytest.fixture
 def test_round_data_round_7315() -> str:
     return '{"pirates": [[16, 6, 17, 5], [12, 2, 8, 20], [15, 1, 14, 7], [3, 11, 10, 9], [4, 13, 19, 18]], "openingOdds": [[1, 4, 13, 2, 2], [1, 10, 8, 9, 2], [1, 4, 3, 10, 2], [1, 5, 2, 4, 4], [1, 8, 4, 2, 5]], "currentOdds": [[1, 4, 13, 2, 2], [1, 13, 12, 12, 2], [1, 4, 3, 10, 2], [1, 5, 2, 4, 4], [1, 8, 4, 2, 6]], "changes": [{"arena": 1, "pirate": 1, "old": 10, "new": 13, "t": "2019-05-17T05:12:15.89138944+02:00"}, {"arena": 1, "pirate": 2, "old": 8, "new": 12, "t": "2019-05-17T05:12:15.89138944+02:00"}, {"arena": 1, "pirate": 3, "old": 9, "new": 12, "t": "2019-05-17T05:12:15.89138944+02:00"}, {"arena": 4, "pirate": 2, "old": 4, "new": 5, "t": "2019-05-17T06:39:15.891366469+02:00"}, {"arena": 4, "pirate": 4, "old": 5, "new": 7, "t": "2019-05-17T06:39:15.891366469+02:00"}, {"arena": 4, "pirate": 4, "old": 7, "new": 6, "t": "2019-05-17T06:57:15.891393316+02:00"}, {"arena": 4, "pirate": 4, "old": 6, "new": 7, "t": "2019-05-17T06:59:15.891376564+02:00"}, {"arena": 4, "pirate": 4, "old": 7, "new": 6, "t": "2019-05-17T07:00:15.891372541+02:00"}, {"arena": 3, "pirate": 1, "old": 5, "new": 6, "t": "2019-05-17T07:44:15.891355829+02:00"}, {"arena": 3, "pirate": 3, "old": 4, "new": 5, "t": "2019-05-17T07:44:15.891355829+02:00"}, {"arena": 3, "pirate": 4, "old": 4, "new": 5, "t": "2019-05-17T07:44:15.891355829+02:00"}, {"arena": 3, "pirate": 3, "old": 5, "new": 4, "t": "2019-05-17T11:57:15.891374969+02:00"}, {"arena": 3, "pirate": 3, "old": 4, "new": 5, "t": "2019-05-17T12:00:15.891432414+02:00"}, {"arena": 3, "pirate": 3, "old": 5, "new": 4, "t": "2019-05-17T12:01:15.891407251+02:00"}, {"arena": 3, "pirate": 3, "old": 4, "new": 5, "t": "2019-05-17T12:03:15.891371535+02:00"}, {"arena": 3, "pirate": 3, "old": 5, "new": 4, "t": "2019-05-17T12:35:15.891421794+02:00"}, {"arena": 3, "pirate": 1, "old": 6, "new": 5, "t": "2019-05-17T13:47:15.891375879+02:00"}, {"arena": 3, "pirate": 3, "old": 4, "new": 5, "t": "2019-05-17T13:59:15.891377966+02:00"}, {"arena": 3, "pirate": 3, "old": 5, "new": 4, "t": "2019-05-17T14:10:15.891363354+02:00"}, {"arena": 3, "pirate": 3, "old": 4, "new": 5, "t": "2019-05-17T14:11:15.891392987+02:00"}, {"arena": 3, "pirate": 3, "old": 5, "new": 4, "t": "2019-05-17T14:14:15.891397615+02:00"}, {"arena": 3, "pirate": 3, "old": 4, "new": 5, "t": "2019-05-17T14:16:15.891370725+02:00"}, {"arena": 3, "pirate": 3, "old": 5, "new": 4, "t": "2019-05-17T14:17:15.891383482+02:00"}, {"arena": 3, "pirate": 4, "old": 5, "new": 4, "t": "2019-05-17T14:49:15.891377381+02:00"}, {"arena": 3, "pirate": 4, "old": 4, "new": 5, "t": "2019-05-17T14:53:15.891382564+02:00"}, {"arena": 3, "pirate": 4, "old": 5, "new": 4, "t": "2019-05-17T14:54:15.891364391+02:00"}, {"arena": 3, "pirate": 4, "old": 4, "new": 5, "t": "2019-05-17T14:57:15.891363215+02:00"}, {"arena": 3, "pirate": 4, "old": 5, "new": 4, "t": "2019-05-17T14:58:15.891386298+02:00"}, {"arena": 3, "pirate": 4, "old": 4, "new": 5, "t": "2019-05-17T15:02:15.891369311+02:00"}, {"arena": 3, "pirate": 4, "old": 5, "new": 4, "t": "2019-05-17T15:09:15.891382393+02:00"}, {"arena": 2, "pirate": 1, "old": 4, "new": 3, "t": "2019-05-17T16:01:15.891365972+02:00"}, {"arena": 2, "pirate": 4, "old": 2, "new": 3, "t": "2019-05-17T16:01:15.891365972+02:00"}, {"arena": 2, "pirate": 1, "old": 3, "new": 4, "t": "2019-05-17T20:26:15.891381374+02:00"}, {"arena": 2, "pirate": 1, "old": 4, "new": 3, "t": "2019-05-17T20:27:15.891380913+02:00"}, {"arena": 2, "pirate": 1, "old": 3, "new": 4, "t": "2019-05-17T20:28:15.891370827+02:00"}, {"arena": 2, "pirate": 4, "old": 3, "new": 2, "t": "2019-05-17T20:54:15.891390789+02:00"}, {"arena": 0, "pirate": 1, "old": 4, "new": 5, "t": "2019-05-17T21:00:15.891376786+02:00"}, {"arena": 0, "pirate": 1, "old": 5, "new": 4, "t": "2019-05-17T21:25:15.891388319+02:00"}, {"arena": 0, "pirate": 1, "old": 4, "new": 5, "t": "2019-05-17T21:36:15.891402011+02:00"}, {"arena": 0, "pirate": 1, "old": 5, "new": 4, "t": "2019-05-17T21:57:15.891365544+02:00"}, {"arena": 0, "pirate": 1, "old": 4, "new": 5, "t": "2019-05-17T22:27:15.891374949+02:00"}, {"arena": 0, "pirate": 1, "old": 5, "new": 4, "t": "2019-05-17T22:40:15.891364204+02:00"}, {"arena": 0, "pirate": 1, "old": 4, "new": 5, "t": "2019-05-17T23:17:15.891393007+02:00"}, {"arena": 0, "pirate": 1, "old": 5, "new": 4, "t": "2019-05-17T23:18:15.891394623+02:00"}, {"arena": 0, "pirate": 1, "old": 4, "new": 5, "t": "2019-05-17T23:19:15.891374209+02:00"}, {"arena": 0, "pirate": 1, "old": 5, "new": 4, "t": "2019-05-17T23:21:15.891376165+02:00"}, {"arena": 0, "pirate": 1, "old": 4, "new": 5, "t": "2019-05-17T23:22:15.891371973+02:00"}, {"arena": 0, "pirate": 1, "old": 5, "new": 4, "t": "2019-05-17T23:23:15.891371411+02:00"}, {"arena": 0, "pirate": 1, "old": 4, "new": 5, "t": "2019-05-17T23:34:15.891381342+02:00"}, {"arena": 0, "pirate": 1, "old": 5, "new": 4, "t": "2019-05-17T23:40:15.891364508+02:00"}, {"arena": 4, "pirate": 2, "old": 5, "new": 4, "t": "2019-05-18T00:10:15.891349607+02:00"}, {"arena": 4, "pirate": 2, "old": 4, "new": 5, "t": "2019-05-18T00:16:15.891371408+02:00"}, {"arena": 4, "pirate": 2, "old": 5, "new": 4, "t": "2019-05-18T00:21:15.891396907+02:00"}], "round": 7315, "start": "2019-05-17T00:26:15.891370154+02:00", "timestamp": "2019-05-18T00:25:15.891373315+02:00", "lastUpdate": "2019-05-18T00:25:15.891373315+02:00", "lastChange": "2019-05-18T00:21:15.891396907+02:00", "winners": [1, 3, 4, 4, 4], "foods": [[26, 17, 6, 12, 37, 28, 5, 38, 3, 14], [4, 36, 14, 40, 3, 32, 34, 18, 15, 2], [29, 38, 32, 37, 20, 2, 33, 4, 15, 22], [20, 7, 18, 10, 26, 24, 36, 21, 35, 12], [29, 33, 16, 12, 40, 25, 22, 2, 30, 14]]}'
 
 
-@pytest.fixture()
+@pytest.fixture
 def test_round_url() -> str:
     return "/#round=7956&pirates=[[2,8,14,11],[20,7,6,10],[19,4,12,15],[3,1,5,13],[17,16,18,9]]&openingOdds=[[1,2,13,3,5],[1,4,2,4,5],[1,3,13,7,2],[1,13,2,3,3],[1,12,2,6,13]]&currentOdds=[[1,2,13,3,5],[1,4,2,4,6],[1,3,13,7,2],[1,13,2,3,3],[1,8,2,4,12]]&foods=[[26,25,4,9,21,1,33,11,7,10],[12,9,14,35,25,6,21,19,40,37],[17,30,21,39,37,15,29,40,31,10],[10,18,35,9,34,23,27,32,28,12],[11,20,9,33,7,14,4,23,31,26]]&winners=[1,3,4,2,4]&timestamp=2021-02-16T23:47:37+00:00"
 
 
-@pytest.fixture()
+@pytest.fixture
 def test_round_url_invalid_opening_odds() -> str:
     return "/#round=7956&pirates=[[2,8,14,11],[20,7,6,10],[19,4,12,15],[3,1,5,13],[17,16,18,9]]&openingOdds=[[1,1,13,3,5],[1,4,2,4,5],[1,3,13,7,2],[1,13,2,3,3],[1,12,2,6,13]]&currentOdds=[[1,2,13,3,5],[1,4,2,4,6],[1,3,13,7,2],[1,13,2,3,3],[1,8,2,4,12]]&foods=[[26,25,4,9,21,1,33,11,7,10],[12,9,14,35,25,6,21,19,40,37],[17,30,21,39,37,15,29,40,31,10],[10,18,35,9,34,23,27,32,28,12],[11,20,9,33,7,14,4,23,31,26]]&winners=[1,3,4,2,4]&timestamp=2021-02-16T23:47:37+00:00"
 
 
-@pytest.fixture()
+@pytest.fixture
 def test_round_url_no_opening_odds() -> str:
     return "/#round=7956&pirates=[[2,8,14,11],[20,7,6,10],[19,4,12,15],[3,1,5,13],[17,16,18,9]]&currentOdds=[[1,2,13,3,5],[1,4,2,4,6],[1,3,13,7,2],[1,13,2,3,3],[1,8,2,4,12]]&foods=[[26,25,4,9,21,1,33,11,7,10],[12,9,14,35,25,6,21,19,40,37],[17,30,21,39,37,15,29,40,31,10],[10,18,35,9,34,23,27,32,28,12],[11,20,9,33,7,14,4,23,31,26]]&winners=[1,3,4,2,4]&timestamp=2021-02-16T23:47:37+00:00"
 
 
-@pytest.fixture()
+@pytest.fixture
 def test_round_url_no_current_odds() -> str:
     return "/#round=7956&pirates=[[2,8,14,11],[20,7,6,10],[19,4,12,15],[3,1,5,13],[17,16,18,9]]&openingOdds=[[1,2,13,3,5],[1,4,2,4,5],[1,3,13,7,2],[1,13,2,3,3],[1,12,2,6,13]]&foods=[[26,25,4,9,21,1,33,11,7,10],[12,9,14,35,25,6,21,19,40,37],[17,30,21,39,37,15,29,40,31,10],[10,18,35,9,34,23,27,32,28,12],[11,20,9,33,7,14,4,23,31,26]]&winners=[1,3,4,2,4]&timestamp=2021-02-16T23:47:37+00:00"
 
 
-@pytest.fixture()
+@pytest.fixture
 def test_round_url_invalid_pirates() -> str:
     return "/#round=7956&pirates=0&openingOdds=[[1,2,13,3,5],[1,4,2,4,5],[1,3,13,7,2],[1,13,2,3,3],[1,12,2,6,13]]&currentOdds=[[1,2,13,3,5],[1,4,2,4,6],[1,3,13,7,2],[1,13,2,3,3],[1,8,2,4,12]]&foods=[[26,25,4,9,21,1,33,11,7,10],[12,9,14,35,25,6,21,19,40,37],[17,30,21,39,37,15,29,40,31,10],[10,18,35,9,34,23,27,32,28,12],[11,20,9,33,7,14,4,23,31,26]]&winners=[1,3,4,2,4]&timestamp=2021-02-16T23:47:37+00:00"
 
 
-@pytest.fixture()
+@pytest.fixture
 def test_round_url_no_pirates() -> str:
     return "/#round=7956&openingOdds=[[1,2,13,3,5],[1,4,2,4,5],[1,3,13,7,2],[1,13,2,3,3],[1,12,2,6,13]]&currentOdds=[[1,2,13,3,5],[1,4,2,4,6],[1,3,13,7,2],[1,13,2,3,3],[1,8,2,4,12]]&foods=[[26,25,4,9,21,1,33,11,7,10],[12,9,14,35,25,6,21,19,40,37],[17,30,21,39,37,15,29,40,31,10],[10,18,35,9,34,23,27,32,28,12],[11,20,9,33,7,14,4,23,31,26]]&winners=[1,3,4,2,4]&timestamp=2021-02-16T23:47:37+00:00"
 
 
-@pytest.fixture()
+@pytest.fixture
 def test_round_url_no_round() -> str:
     return "/#pirates=[[2,8,14,11],[20,7,6,10],[19,4,12,15],[3,1,5,13],[17,16,18,9]]&openingOdds=[[1,2,13,3,5],[1,4,2,4,5],[1,3,13,7,2],[1,13,2,3,3],[1,12,2,6,13]]&currentOdds=[[1,2,13,3,5],[1,4,2,4,6],[1,3,13,7,2],[1,13,2,3,3],[1,8,2,4,12]]&foods=[[26,25,4,9,21,1,33,11,7,10],[12,9,14,35,25,6,21,19,40,37],[17,30,21,39,37,15,29,40,31,10],[10,18,35,9,34,23,27,32,28,12],[11,20,9,33,7,14,4,23,31,26]]&winners=[1,3,4,2,4]&timestamp=2021-02-16T23:47:37+00:00"
 
 
-@pytest.fixture()
+@pytest.fixture
 def test_round_url_no_food() -> str:
     return "/#round=7956&pirates=[[2,8,14,11],[20,7,6,10],[19,4,12,15],[3,1,5,13],[17,16,18,9]]&openingOdds=[[1,2,13,3,5],[1,4,2,4,5],[1,3,13,7,2],[1,13,2,3,3],[1,12,2,6,13]]&currentOdds=[[1,2,13,3,5],[1,4,2,4,6],[1,3,13,7,2],[1,13,2,3,3],[1,8,2,4,12]]&winners=[1,3,4,2,4]&timestamp=2021-02-16T23:47:37+00:00"
 
 
-@pytest.fixture()
+@pytest.fixture
 def test_round_url_no_winners() -> str:
     return "/#round=7956&pirates=[[2,8,14,11],[20,7,6,10],[19,4,12,15],[3,1,5,13],[17,16,18,9]]&openingOdds=[[1,2,13,3,5],[1,4,2,4,5],[1,3,13,7,2],[1,13,2,3,3],[1,12,2,6,13]]&currentOdds=[[1,2,13,3,5],[1,4,2,4,6],[1,3,13,7,2],[1,13,2,3,3],[1,8,2,4,12]]&timestamp=2021-02-16T23:47:37+00:00"
 
 
-@pytest.fixture()
+@pytest.fixture
 def test_max_ter_15_bets() -> str:
     return "/15/#round=7956&pirates=[[2,8,14,11],[20,7,6,10],[19,4,12,15],[3,1,5,13],[17,16,18,9]]&openingOdds=[[1,2,13,3,5],[1,4,2,4,5],[1,3,13,7,2],[1,13,2,3,3],[1,12,2,6,13]]&currentOdds=[[1,2,13,3,5],[1,4,2,4,6],[1,3,13,7,2],[1,13,2,3,3],[1,8,2,4,12]]&foods=[[26,25,4,9,21,1,33,11,7,10],[12,9,14,35,25,6,21,19,40,37],[17,30,21,39,37,15,29,40,31,10],[10,18,35,9,34,23,27,32,28,12],[11,20,9,33,7,14,4,23,31,26]]&winners=[1,3,4,2,4]&timestamp=2021-02-16T23:47:37+00:00&b=eukucjuoycaulucepkyreynycyakacfulxcefk"
 
 
 # crazy bets mean(all arenas have a pirate bet)
 # the crazy bet methods here all correspond to the exact same set!
-@pytest.fixture()
+@pytest.fixture
 def crazy_test_hash() -> str:
     return "ltqvqwgimhqtvrnywrwvijwnn"
 
 
-@pytest.fixture()
-def crazy_test_indices() -> Tuple[Tuple[int, ...], ...]:
+@pytest.fixture
+def crazy_test_indices() -> tuple[tuple[int, ...], ...]:
     return (
         (2, 1, 3, 4, 3),
         (1, 4, 1, 3, 1),
@@ -170,8 +169,8 @@ def crazy_test_indices() -> Tuple[Tuple[int, ...], ...]:
     )
 
 
-@pytest.fixture()
-def crazy_test_binaries() -> Tuple[int, ...]:
+@pytest.fixture
+def crazy_test_binaries() -> tuple[int, ...]:
     return (
         0x48212,
         0x81828,
@@ -186,8 +185,8 @@ def crazy_test_binaries() -> Tuple[int, ...]:
     )
 
 
-@pytest.fixture()
-def gambit_test_binaries() -> Tuple[int, ...]:
+@pytest.fixture
+def gambit_test_binaries() -> tuple[int, ...]:
     # just a random gambit set
     return (
         0x11842,
@@ -203,17 +202,17 @@ def gambit_test_binaries() -> Tuple[int, ...]:
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def nfc(test_round_data_json: str) -> NeoFoodClub:
     return NeoFoodClub(test_round_data_json)
 
 
-@pytest.fixture()
+@pytest.fixture
 def nfc_with_bet_amount(test_round_data_json: str) -> NeoFoodClub:
     return NeoFoodClub(test_round_data_json, bet_amount=8000)
 
 
-@pytest.fixture()
+@pytest.fixture
 def nfc_with_bet_amount_logit_model(test_round_data_json: str) -> NeoFoodClub:
     return NeoFoodClub(
         test_round_data_json,
@@ -222,26 +221,26 @@ def nfc_with_bet_amount_logit_model(test_round_data_json: str) -> NeoFoodClub:
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def nfc_from_url(test_round_url) -> NeoFoodClub:
     return NeoFoodClub.from_url(test_round_url)
 
 
-@pytest.fixture()
+@pytest.fixture
 def nfc_no_foods(test_round_url_no_food: str) -> NeoFoodClub:
     return NeoFoodClub.from_url(test_round_url_no_food)
 
 
-@pytest.fixture()
+@pytest.fixture
 def crazy_bets(nfc: NeoFoodClub, crazy_test_hash: str) -> Bets:
     return nfc.make_bets_from_hash(crazy_test_hash)
 
 
-@pytest.fixture()
-def gambit_bets(nfc: NeoFoodClub, gambit_test_binaries: Tuple[int, ...]) -> Bets:
+@pytest.fixture
+def gambit_bets(nfc: NeoFoodClub, gambit_test_binaries: tuple[int, ...]) -> Bets:
     return nfc.make_bets_from_binaries(gambit_test_binaries)
 
 
-@pytest.fixture()
+@pytest.fixture
 def nfc_round_9088(test_round_data_round_9088: str) -> NeoFoodClub:
     return NeoFoodClub(test_round_data_round_9088)

tests/test_arena.py

@@ -1,5 +1,4 @@
 import math
-from typing import List, Tuple
 
 from neofoodclub import NeoFoodClub
 
@@ -10,7 +9,7 @@ def test_first_arena_name_and_id(nfc: NeoFoodClub) -> None:
 
 
 def test_first_arena_best(nfc: NeoFoodClub) -> None:
-    best_in_first_arena: List[Tuple[str, int, int]] = [  # name, odds, binary
+    best_in_first_arena: list[tuple[str, int, int]] = [  # name, odds, binary
         ("Sproggie", 2, 0x80000),
         ("Fairfax", 3, 0x20000),
         ("Crossblades", 5, 0x10000),

tests/test_bet_functions.py

@@ -1,5 +1,5 @@
 import math
-from typing import Sequence, Tuple
+from collections.abc import Sequence
 
 import pytest
 
@@ -83,8 +83,8 @@ def test_bets_set_bet_amount_none(nfc: NeoFoodClub) -> None:
 def test_bet_equivalence(
     nfc: NeoFoodClub,
     crazy_test_hash: str,
-    crazy_test_indices: Tuple[Tuple[int, ...], ...],
-    crazy_test_binaries: Tuple[int, ...],
+    crazy_test_indices: tuple[tuple[int, ...], ...],
+    crazy_test_binaries: tuple[int, ...],
 ) -> None:
     crazy_from_hash = nfc.make_bets_from_hash(crazy_test_hash)
     crazy_from_indices = nfc.make_bets_from_indices(crazy_test_indices)
@@ -157,14 +157,14 @@ def test_bet_hash_encoding(nfc: NeoFoodClub, crazy_test_hash: str) -> None:
 
 def test_bet_indices_encoding(
     nfc: NeoFoodClub,
-    crazy_test_indices: Tuple[Tuple[int, ...], ...],
+    crazy_test_indices: tuple[tuple[int, ...], ...],
 ) -> None:
     assert nfc.make_bets_from_indices(crazy_test_indices).indices == crazy_test_indices
 
 
 def test_bet_indices_with_amount(
     nfc: NeoFoodClub,
-    crazy_test_indices: Tuple[Tuple[int, ...], ...],
+    crazy_test_indices: tuple[tuple[int, ...], ...],
 ) -> None:
     bets = nfc.make_bets_from_indices(crazy_test_indices)
 
@@ -175,7 +175,7 @@ def test_bet_indices_with_amount(
 
 def test_bet_binaries_encoding(
     nfc: NeoFoodClub,
-    crazy_test_binaries: Tuple[int, ...],
+    crazy_test_binaries: tuple[int, ...],
 ) -> None:
     assert (
         nfc.make_bets_from_binaries(crazy_test_binaries).binaries == crazy_test_binaries
@@ -184,7 +184,7 @@ def test_bet_binaries_encoding(
 
 def test_bet_binaries_with_amount(
     nfc: NeoFoodClub,
-    crazy_test_binaries: Tuple[int, ...],
+    crazy_test_binaries: tuple[int, ...],
 ) -> None:
     bets = nfc.make_bets_from_binaries(crazy_test_binaries)
 

tests/test_math.py

@@ -1,4 +1,4 @@
-from typing import Sequence
+from collections.abc import Sequence
 
 import pytest
 
@@ -84,7 +84,7 @@ def test_amount_hash_to_bet_amounts_below_50() -> None:
     assert Math.amounts_hash_to_bet_amounts("AaX") == (None,)
 
 
-def test_expand_ib_object():
+def test_expand_ib_object() -> None:
     assert (Math.expand_ib_object([Math.binary_to_indices(0x80000)], [1])) == {
         524287: 0,
         589823: 1,

tests/test_neofoodclub.py

@@ -1,6 +1,5 @@
 import datetime
 import json
-from typing import Optional
 
 import orjson
 import pytest
@@ -130,7 +129,7 @@ def test_get_win_np(
     nfc: NeoFoodClub,
     nfc_from_url: NeoFoodClub,
     bet_hash: str,
-    bet_amount: Optional[int],
+    bet_amount: int | None,
     winnings: int,
 ) -> None:
     new_nfc = nfc.copy()