update python version

pytest.ini

@@ -1,4 +1,3 @@
-[pytest]
-python_paths = src
-addopts = src tests
-; addopts = src tests --flakes
+[tool:pytest]
+pythonpath = . src
+addopts = tests --flakes

requirements/app.txt

@@ -1,7 +1,6 @@
 galaxy.plugin.api==0.67
-requests==2.22.0
-psutil==5.6.7
-pyobjc-core==5.2; sys_platform == 'darwin'
-pyobjc-framework-Cocoa==5.2; sys_platform == 'darwin'
-pyobjc-framework-Quartz==5.2; sys_platform == 'darwin'
-protobuf==3.7.1
+requests>=2.28.0
+urllib3<2.0.0
+psutil>=5.9.0
+pyobjc>=10.0; sys_platform == 'darwin'
+protobuf>=3.20.0,<4.0.0

requirements/dev.txt

@@ -1,8 +1,8 @@
 -r app.txt
-invoke==1.3.0
-pytest==5.3.5
-pytest-flakes==4.0.0
-pytest-asyncio==0.10.0
-pytest-mock==2.0.0
+invoke==2.2.0
+pytest==8.2.1
+pytest-flakes==4.0.5
+pytest-asyncio==0.23.7
+pytest-mock==3.14.0
 pytest-pythonpath==0.7.3
-pip-tools~=5.5.0  # for "pip>20.1,<20.4"
+pip-tools==7.4.1

tasks.py

@@ -36,7 +36,7 @@ def build(c, output='build', ziparchive=None):
     args = [
         'pip', 'install',
         '-r', tmp.name,
-        '--python-version', '37',
+        '--python-version', '312',
         '--platform', PIP_PLATFORM,
         '--target "{}"'.format(output),
         '--no-compile',

tests/conftest.py

@@ -1,15 +1,17 @@
-import asyncio
-import inspect
 import json
-from unittest.mock import patch, MagicMock, Mock
+import sys
+from pathlib import Path
+from unittest.mock import MagicMock
 import pytest
+
+# Add src to path for imports
+sys.path.insert(0, str(Path(__file__).parent.parent / "src"))
 import plugin
 
 from src.backend import BackendClient
 from src.local_client import LocalClient
 
 from tests.async_mock import AsyncMock
-from tests.website_mocks import user_info, credentials
 
 
 @pytest.fixture()
@@ -66,7 +68,7 @@ def config_data():
         "Services": {
             "LastLoginAddress": "eu.actual.battle.net",
             "LastLoginRegion": "EU",
-            "LastLoginTassadar": "eu.battle.net\/login"
+            "LastLoginTassadar": "eu.battle.net/login"
         }
     },
     "Games": {
@@ -103,7 +105,7 @@ def config_data():
 
 
 @pytest.fixture()
-async def backend_mock():
+def backend_mock():
     """Backend mock to be shared in tests. Assign return_value to methods particular test needs
     Note: Mock(spec=BackendClient) for async works only in python>=3.8,
     that is why we use our own AsyncMock and assign manually to every real BackendClient method
@@ -142,10 +144,14 @@ def plugin_mock(mocker, backend_mock, local_client_mock):
 
 
 @pytest.fixture()
-async def authenticated_plugin(plugin_mock, backend_mock, user_info, credentials):
+def authenticated_plugin(plugin_mock, backend_mock):
+    """Return the authenticated plugin synchronously"""
+    from tests.website_mocks import user_info, credentials
+
     backend_mock.get_user_info.return_value = user_info
     backend_mock.validate_access_token.return_value = credentials
-    credentials = {
+
+    credentials_data = {
         "cookie_jar": "80036372657175657374732e636f6f6b6965730a5265717565737473436f6f6b69654a61720a7100298171017d71022858070000005f706f6c696379710363687474702e636f6f6b69656a61720a44656661756c74436f6f6b6965506f6c6963790a7104298171057d71062858080000006e657473636170657107885807000000726663323936357108895813000000726663323130395f61735f6e6574736361706571094e580c000000686964655f636f6f6b696532710a89580d0000007374726963745f646f6d61696e710b89581b0000007374726963745f726663323936355f756e76657269666961626c65710c8858160000007374726963745f6e735f756e76657269666961626c65710d8958100000007374726963745f6e735f646f6d61696e710e4b00581c0000007374726963745f6e735f7365745f696e697469616c5f646f6c6c6172710f8958120000007374726963745f6e735f7365745f7061746871108958100000005f626c6f636b65645f646f6d61696e7371112958100000005f616c6c6f7765645f646f6d61696e7371124e58040000005f6e6f7771134a75c2775c756258080000005f636f6f6b69657371147d711528580d00000065752e626174746c652e6e657471167d71172858070000002f6f617574682f71187d7119580a0000004a53455353494f4e4944711a63687474702e636f6f6b69656a61720a436f6f6b69650a711b2981711c7d711d28580700000076657273696f6e711e4b0058040000006e616d65711f580a0000004a53455353494f4e49447120580500000076616c75657121583c00000031463246434233383730354237304144384133433532344245344331313746342e626c61646530375f65755f615f6f617574685f70726f766964657271225804000000706f727471234e580e000000706f72745f7370656369666965647124895806000000646f6d61696e7125580d00000065752e626174746c652e6e657471265810000000646f6d61696e5f7370656369666965647127885812000000646f6d61696e5f696e697469616c5f646f74712889580400000070617468712958070000002f6f617574682f712a580e000000706174685f737065636966696564712b885806000000736563757265712c88580700000065787069726573712d4e580700000064697363617264712e885807000000636f6d6d656e74712f4e580b000000636f6d6d656e745f75726c71304e58070000007266633231303971318958050000005f7265737471327d71335808000000487474704f6e6c797134887375627358070000002f6c6f67696e2f71357d7136580a0000004a53455353494f4e49447137681b298171387d713928681e4b00681f580a0000004a53455353494f4e4944713a6821583700000032646136373230652d356130372d343432352d383735652d6534363136376261663839632e626c61646530355f65755f615f6c6f67696e713b68234e6824896825580d00000065752e626174746c652e6e6574713c682788682889682958070000002f6c6f67696e2f713d682b88682c88682d4e682e88682f4e68304e68318968327d713e6834887375627375580b0000002e626174746c652e6e6574713f7d71402858010000002f71417d714228580d0000006c6f67696e2e636f6f6b6965737143681b298171447d714528681e4b00681f580d0000006c6f67696e2e636f6f6b69657371466821580100000031714768234e6824896825580b0000002e626174746c652e6e6574714868278868288868296841682b88682c89682d4e682e88682f4e68304e68318968327d714968344e73756258060000007765622e6964714a681b2981714b7d714c28681e4b00681f58060000007765622e6964714d6821582700000045552d37383963396431612d306537322d343861312d613031332d333361616262376331393864714e68234e6824896825580b0000002e626174746c652e6e6574714f68278868288868296841682b88682c88682d8a0552b177dc00682e88682f4e68304e68318968327d715068348873756258030000005f67617151681b298171527d715328681e4b00681f58030000005f676171546821581a0000004741312e322e3137373430323136362e31353531333531363532715568234e6824896825580b0000002e626174746c652e6e6574715668278868288868296841682b88682c89682d4a53183a60682e88682f4e68304e68318968327d715768344e73756258040000005f6769647158681b298171597d715a28681e4b00681f58040000005f676964715b6821581b0000004741312e322e323035343230383433372e31353531333531363532715c68234e6824896825580b0000002e626174746c652e6e6574715d68278868288868296841682b88682c89682d4ad302795c682e88682f4e68304e68318968327d715e68344e737562580c0000005f6761745f626e657467746d715f681b298171607d716128681e4b00681f580c0000005f6761745f626e657467746d71626821684768234e6824896825580b0000002e626174746c652e6e6574716368278868288868296841682b88682c89682d4a8fb1775c682e88682f4e68304e68318968327d716468344e73756258050000005f67616c697165681b298171667d716728681e4b00681f58050000005f67616c697168682158060000007375626d6974716968234e6824896825580b0000002e626174746c652e6e6574716a68278868288868296841682b88682c89682d4a7db1775c682e88682f4e68304e68318968327d716b68344e737562581500000042412d74617373616461722d6c6f67696e2e6b6579716c681b2981716d7d716e28681e4b00681f581500000042412d74617373616461722d6c6f67696e2e6b6579716f682158200000003339336637623138616435343933663731323566633130353965383133386532717068234e6824896825580b0000002e626174746c652e6e6574717168278868288868296841682b88682c89682d4ac7e4466f682e88682f4e68304e68318968327d717268348873756258090000006c6f67696e2e6b65797173681b298171747d717528681e4b00681f58090000006c6f67696e2e6b65797176682158200000003339336637623138616435343933663731323566633130353965383133386532717768234e6824896825580b0000002e626174746c652e6e6574717868278868288868296841682b88682c89682d4ac7e4466f682e88682f4e68304e68318968327d717968348873756258030000006f7074717a681b2981717b7d717c28681e4b00681f58030000006f7074717d6821684768234e6824896825580b0000002e626174746c652e6e6574717e68278868288868296841682b88682c89682d4ac7e4466f682e88682f4e68304e68318968327d717f68344e7375627558060000002f6c6f67696e71807d718128580a000000626e65742e65787472617182681b298171837d718428681e4b00681f580a000000626e65742e657874726171856821586c0000004155712d35376a454b4d365a385a68536864374d764c53666a32332d513237706d594a35505f48534e46356d704653484e516649754a73684d56666e544d4f456c3635786a59775a447759476d534a6d424968726f59432d4c684f6a423870466956576967774831514a6b56718668234e6824896825580b0000002e626174746c652e6e65747187682788682888682958060000002f6c6f67696e7188682b88682c88682d8a055eb177dc00682e88682f4e68304e68318968327d7189683488737562580b00000042412d7461737361646172718a681b2981718b7d718c28681e4b00681f580b00000042412d7461737361646172718d6821582d00000045552d64323235363234646530633037303364653037333739353566316131383430332d343734353439373434718e68234e6824896825580b0000002e626174746c652e6e6574718f682788682888682958060000002f6c6f67696e7190682b88682c88682d4ac7e4466f682e88682f4e68304e68318968327d7191683488737562580e00000042412d74617373616461722d636c7192681b298171937d719428681e4b00681f580e00000042412d74617373616461722d636c7195682158200000006335623739653731353635353536636165326638613732303136653539396534719668234e6824896825580b0000002e626174746c652e6e65747197682788682888682958060000002f6c6f67696e7198682b88682c88682d4e682e88682f4e68304e68318968327d71996834887375625802000000636c719a681b2981719b7d719c28681e4b00681f5802000000636c719d682158200000006335623739653731353635353536636165326638613732303136653539396534719e68234e6824896825580b0000002e626174746c652e6e6574719f682788682888682958060000002f6c6f67696e71a0682b88682c88682d4e682e88682f4e68304e68318968327d71a16834887375627575580e0000002e65752e626174746c652e6e657471a27d71a368417d71a42858030000005f676171a5681b298171a67d71a728681e4b00681f58030000005f676171a86821581a0000004741312e332e3137373430323136362e3135353133353136353271a968234e6824896825580e0000002e65752e626174746c652e6e657471aa68278868288868296841682b88682c89682d4a5f183a60682e88682f4e68304e68318968327d71ab68344e73756258040000005f67696471ac681b298171ad7d71ae28681e4b00681f58040000005f67696471af6821581b0000004741312e332e323035343230383433372e3135353133353136353271b068234e6824896825580e0000002e65752e626174746c652e6e657471b168278868288868296841682b88682c89682d4adf02795c682e88682f4e68304e68318968327d71b268344e73756258120000005f6761745f55412d35303234393630302d3171b3681b298171b47d71b528681e4b00681f58120000005f6761745f55412d35303234393630302d3171b66821684768234e6824896825580e0000002e65752e626174746c652e6e657471b768278868288868296841682b88682c89682d4a9bb1775c682e88682f4e68304e68318968327d71b868344e7375627573581700000065752e6163636f756e742e626c697a7a6172642e636f6d71b97d71ba68417d71bb28580900000053455353494f4e494471bc681b298171bd7d71be28681e4b00681f580900000053455353494f4e494471bf6821582400000061396231303637332d653664362d346634372d386534362d39643665613036366164333671c068234e6824896825581700000065752e6163636f756e742e626c697a7a6172642e636f6d71c168278968288968296841682b88682c88682d4e682e88682f4e68304e68318968327d71c25808000000487474704f6e6c7971c34e737562580a000000585352462d544f4b454e71c4681b298171c57d71c628681e4b00681f68c46821582400000034363639393638312d656132382d343730352d613636652d37653033613862353361643571c768234e6824896825581700000065752e6163636f756e742e626c697a7a6172642e636f6d71c868278968288968296841682b88682c88682d4e682e88682f4e68304e68318968327d71c975627573580d0000002e626c697a7a6172642e636f6d71ca7d71cb68417d71cc2858030000005f676171cd681b298171ce7d71cf28681e4b00681f68cd6821581b0000004741312e322e313935363436373733302e3135353133353136363571d068234e682489682568ca68278868288868296841682b88682c89682d4a61183a60682e88682f4e68304e68318968327d71d168344e73756258040000005f67696471d2681b298171d37d71d428681e4b00681f68d26821581b0000004741312e322e313831333131363532312e3135353133353136363571d568234e6824896825580d0000002e626c697a7a6172642e636f6d71d668278868288868296841682b88682c89682d4ae102795c682e88682f4e68304e68318968327d71d768344e73756258120000005f6761745f55412d35303234393630302d3171d8681b298171d97d71da28681e4b00681f68d86821684768234e6824896825580d0000002e626c697a7a6172642e636f6d71db68278868288868296841682b88682c89682d4a9cb1775c682e88682f4e68304e68318968327d71dc68344e73756275737558040000005f6e6f7771dd4a75c2775c75622e",
         "access_token": "ACCESS_TOKEN",
         "user_details_cache": {
@@ -155,11 +161,32 @@ async def authenticated_plugin(plugin_mock, backend_mock, user_info, credentials
         },
         "region": "eu"
     }
-    await plugin_mock.authenticate(credentials)
+
+    # Simulate authentication synchronously
+    plugin_mock._backend_client = backend_mock
+    plugin_mock._user_info = user_info
+    plugin_mock._credentials = credentials_data
+
+    # Mock the authentication_client.is_authenticated() to return True
+    plugin_mock.authentication_client.is_authenticated = MagicMock(return_value=True)
+
     return plugin_mock
 
 
 @pytest.fixture
 def pg(authenticated_plugin):
     """Alias"""
     return authenticated_plugin
+
+
+# Import fixtures from website_mocks to avoid flake8 warnings
+@pytest.fixture()
+def user_info():
+    from tests.website_mocks import user_info
+    return user_info
+
+
+@pytest.fixture() 
+def credentials():
+    from tests.website_mocks import credentials
+    return credentials