From 9a06cb330f34191f8f8e87b7a185291ac94e2ff7 Mon Sep 17 00:00:00 2001 From: Mike_Went Date: Wed, 24 Jul 2024 00:16:12 +0400 Subject: [PATCH] remove flaky from tests --- Pipfile | 1 - Pipfile.lock | 117 +++++++++++++++----------------- api/requirements.txt | 9 ++- api/tests/test_balance_cache.py | 1 - requirements.txt | 60 ---------------- ui/requirements.txt | 9 ++- 6 files changed, 62 insertions(+), 135 deletions(-) delete mode 100644 requirements.txt diff --git a/Pipfile b/Pipfile index 273ca8f..bb1368f 100644 --- a/Pipfile +++ b/Pipfile @@ -24,7 +24,6 @@ isort = "*" mypy = "*" ruff = "*" pytest = "*" -flaky = "*" httpx = "*" [requires] diff --git a/Pipfile.lock b/Pipfile.lock index 10f41f6..944a70c 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "d3a8d25e36f3932bd44ddf24515e2a7802e2313bf54a382021c487b9b63b21b2" + "sha256": "84c443313b1041c18242292e2f44f819fe4ca6306f23928c887177b7d639564e" }, "pipfile-spec": 6, "requires": { @@ -780,12 +780,12 @@ "standard" ], "hashes": [ - "sha256:cd17daa7f3b9d7a24de3617820e634d0933b69eed8e33a516071174427238c81", - "sha256:d46cd8e0fd80240baffbcd9ec1012a712938754afcf81bce56c024c1656aece8" + "sha256:0d114d0831ff1adbf231d358cbf42f17333413042552a624ea6a9b4c33dcfd81", + "sha256:94a3608da0e530cea8f69683aa4126364ac18e3826b6630d1a65f4638aade503" ], "index": "pypi", "markers": "python_version >= '3.8'", - "version": "==0.30.1" + "version": "==0.30.3" }, "uvloop": { "hashes": [ @@ -1051,15 +1051,6 @@ "markers": "python_version >= '3.7'", "version": "==8.1.7" }, - "flaky": { - "hashes": [ - "sha256:194ccf4f0d3a22b2de7130f4b62e45e977ac1b5ccad74d4d48f3005dcc38815e", - "sha256:47204a81ec905f3d5acfbd61daeabcada8f9d4031616d9bcb0618461729699f5" - ], - "index": "pypi", - "markers": "python_version >= '3.5'", - "version": "==3.8.1" - }, "h11": { "hashes": [ "sha256:8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d", @@ -1111,37 +1102,37 @@ }, "mypy": { "hashes": [ - "sha256:0cd62192a4a32b77ceb31272d9e74d23cd88c8060c34d1d3622db3267679a5d9", - "sha256:1b3a2ffce52cc4dbaeee4df762f20a2905aa171ef157b82192f2e2f368eec05d", - "sha256:1f8f492d7db9e3593ef42d4f115f04e556130f2819ad33ab84551403e97dd4c0", - "sha256:2189ff1e39db399f08205e22a797383613ce1cb0cb3b13d8bcf0170e45b96cc3", - "sha256:378c03f53f10bbdd55ca94e46ec3ba255279706a6aacaecac52ad248f98205d3", - "sha256:37fd87cab83f09842653f08de066ee68f1182b9b5282e4634cdb4b407266bade", - "sha256:3c4c2992f6ea46ff7fce0072642cfb62af7a2484efe69017ed8b095f7b39ef31", - "sha256:51a46974340baaa4145363b9e051812a2446cf583dfaeba124af966fa44593f7", - "sha256:5bb9cd11c01c8606a9d0b83ffa91d0b236a0e91bc4126d9ba9ce62906ada868e", - "sha256:5cc3ca0a244eb9a5249c7c583ad9a7e881aa5d7b73c35652296ddcdb33b2b9c7", - "sha256:604282c886497645ffb87b8f35a57ec773a4a2721161e709a4422c1636ddde5c", - "sha256:6166a88b15f1759f94a46fa474c7b1b05d134b1b61fca627dd7335454cc9aa6b", - "sha256:6bacf8f3a3d7d849f40ca6caea5c055122efe70e81480c8328ad29c55c69e93e", - "sha256:6be84c06e6abd72f960ba9a71561c14137a583093ffcf9bbfaf5e613d63fa531", - "sha256:701b5f71413f1e9855566a34d6e9d12624e9e0a8818a5704d74d6b0402e66c04", - "sha256:71d8ac0b906354ebda8ef1673e5fde785936ac1f29ff6987c7483cfbd5a4235a", - "sha256:8addf6313777dbb92e9564c5d32ec122bf2c6c39d683ea64de6a1fd98b90fe37", - "sha256:901c89c2d67bba57aaaca91ccdb659aa3a312de67f23b9dfb059727cce2e2e0a", - "sha256:97a131ee36ac37ce9581f4220311247ab6cba896b4395b9c87af0675a13a755f", - "sha256:a1bbb3a6f5ff319d2b9d40b4080d46cd639abe3516d5a62c070cf0114a457d84", - "sha256:a2cbc68cb9e943ac0814c13e2452d2046c2f2b23ff0278e26599224cf164e78d", - "sha256:b8edd4e9bbbc9d7b79502eb9592cab808585516ae1bcc1446eb9122656c6066f", - "sha256:bd6f629b67bb43dc0d9211ee98b96d8dabc97b1ad38b9b25f5e4c4d7569a0c6a", - "sha256:c2ae450d60d7d020d67ab440c6e3fae375809988119817214440033f26ddf7bf", - "sha256:d8681909f7b44d0b7b86e653ca152d6dff0eb5eb41694e163c6092124f8246d7", - "sha256:e36f229acfe250dc660790840916eb49726c928e8ce10fbdf90715090fe4ae02", - "sha256:fe85ed6836165d52ae8b88f99527d3d1b2362e0cb90b005409b8bed90e9059b3" + "sha256:0bea2a0e71c2a375c9fa0ede3d98324214d67b3cbbfcbd55ac8f750f85a414e3", + "sha256:104e9c1620c2675420abd1f6c44bab7dd33cc85aea751c985006e83dcd001095", + "sha256:14f9294528b5f5cf96c721f231c9f5b2733164e02c1c018ed1a0eff8a18005ac", + "sha256:1a5d8d8dd8613a3e2be3eae829ee891b6b2de6302f24766ff06cb2875f5be9c6", + "sha256:1d44c1e44a8be986b54b09f15f2c1a66368eb43861b4e82573026e04c48a9e20", + "sha256:25bcfa75b9b5a5f8d67147a54ea97ed63a653995a82798221cca2a315c0238c1", + "sha256:35ce88b8ed3a759634cb4eb646d002c4cef0a38f20565ee82b5023558eb90c00", + "sha256:56913ec8c7638b0091ef4da6fcc9136896914a9d60d54670a75880c3e5b99ace", + "sha256:65f190a6349dec29c8d1a1cd4aa71284177aee5949e0502e6379b42873eddbe7", + "sha256:6801319fe76c3f3a3833f2b5af7bd2c17bb93c00026a2a1b924e6762f5b19e13", + "sha256:72596a79bbfb195fd41405cffa18210af3811beb91ff946dbcb7368240eed6be", + "sha256:93743608c7348772fdc717af4aeee1997293a1ad04bc0ea6efa15bf65385c538", + "sha256:940bfff7283c267ae6522ef926a7887305945f716a7704d3344d6d07f02df850", + "sha256:96f8dbc2c85046c81bcddc246232d500ad729cb720da4e20fce3b542cab91287", + "sha256:98790025861cb2c3db8c2f5ad10fc8c336ed2a55f4daf1b8b3f877826b6ff2eb", + "sha256:a3824187c99b893f90c845bab405a585d1ced4ff55421fdf5c84cb7710995229", + "sha256:a83ec98ae12d51c252be61521aa5731f5512231d0b738b4cb2498344f0b840cd", + "sha256:becc9111ca572b04e7e77131bc708480cc88a911adf3d0239f974c034b78085c", + "sha256:c1a184c64521dc549324ec6ef7cbaa6b351912be9cb5edb803c2808a0d7e85ac", + "sha256:c7b73a856522417beb78e0fb6d33ef89474e7a622db2653bc1285af36e2e3e3d", + "sha256:cea3d0fb69637944dd321f41bc896e11d0fb0b0aa531d887a6da70f6e7473aba", + "sha256:d2b3d36baac48e40e3064d2901f2fbd2a2d6880ec6ce6358825c85031d7c0d4d", + "sha256:d7b54c27783991399046837df5c7c9d325d921394757d09dbcbf96aee4649fe9", + "sha256:d8e2e43977f0e09f149ea69fd0556623919f816764e26d74da0c8a7b48f3e18a", + "sha256:dbe286303241fea8c2ea5466f6e0e6a046a135a7e7609167b07fd4e7baf151bf", + "sha256:f006e955718ecd8d159cee9932b64fba8f86ee6f7728ca3ac66c3a54b0062abe", + "sha256:f2268d9fcd9686b61ab64f077be7ffbc6fbcdfb4103e5dd0cc5eaab53a8886c2" ], "index": "pypi", "markers": "python_version >= '3.8'", - "version": "==1.10.1" + "version": "==1.11.0" }, "mypy-extensions": { "hashes": [ @@ -1185,37 +1176,37 @@ }, "pytest": { "hashes": [ - "sha256:c434598117762e2bd304e526244f67bf66bbd7b5d6cf22138be51ff661980343", - "sha256:de4bb8104e201939ccdc688b27a89a7be2079b22e2bd2b07f806b6ba71117977" + "sha256:7e8e5c5abd6e93cb1cc151f23e57adc31fcf8cfd2a3ff2da63e23f732de35db6", + "sha256:e9600ccf4f563976e2c99fa02c7624ab938296551f280835ee6516df8bc4ae8c" ], "index": "pypi", "markers": "python_version >= '3.8'", - "version": "==8.2.2" + "version": "==8.3.1" }, "ruff": { "hashes": [ - "sha256:1aa7acad382ada0189dbe76095cf0a36cd0036779607c397ffdea16517f535b1", - "sha256:1ed02fb52e3741f0738db5f93e10ae0fb5c71eb33a4f2ba87c9a2fa97462a649", - "sha256:237a37e673e9f3cbfff0d2243e797c4862a44c93d2f52a52021c1a1b0899f846", - "sha256:2a2949ce7c1cbd8317432ada80fe32156df825b2fd611688814c8557824ef060", - "sha256:2c0df2d2de685433794a14d8d2e240df619b748fbe3367346baa519d8e6f1ca2", - "sha256:3cf8fe659f6362530435d97d738eb413e9f090e7e993f88711b0377fbdc99f60", - "sha256:481af57c8e99da92ad168924fd82220266043c8255942a1cb87958b108ac9335", - "sha256:73439805c5cb68f364d826a5c5c4b6c798ded6b7ebaa4011f01ce6c94e4d5583", - "sha256:7bab8345df60f9368d5f4594bfb8b71157496b44c30ff035d1d01972e764d3be", - "sha256:8532660b72b5d94d2a0a7a27ae7b9b40053662d00357bb2a6864dd7e38819084", - "sha256:a04f54a9018f75615ae52f36ea1c5515e356e5d5e214b22609ddb546baef7132", - "sha256:a0b62adc5ce81780ff04077e88bac0986363e4a3260ad3ef11ae9c14aa0e67ef", - "sha256:aec618d5a0cdba5592c60c2dee7d9c865180627f1a4a691257dea14ac1aa264d", - "sha256:c15c6e9f88c67ffa442681365d11df38afb11059fc44238e71a9d9f1fd51de70", - "sha256:d3de9a5960f72c335ef00763d861fc5005ef0644cb260ba1b5a115a102157251", - "sha256:dc42ebf56ede83cb080a50eba35a06e636775649a1ffd03dc986533f878702a3", - "sha256:f1aea290c56d913e363066d83d3fc26848814a1fed3d72144ff9c930e8c7c718", - "sha256:fe5a968ae933e8f7627a7b2fc8893336ac2be0eb0aace762d3421f6e8f7b7f83" + "sha256:029454e2824eafa25b9df46882f7f7844d36fd8ce51c1b7f6d97e2615a57bbcc", + "sha256:09c14ed6a72af9ccc8d2e313d7acf7037f0faff43cde4b507e66f14e812e37f7", + "sha256:0cf497a47751be8c883059c4613ba2f50dd06ec672692de2811f039432875278", + "sha256:2795726d5f71c4f4e70653273d1c23a8182f07dd8e48c12de5d867bfb7557eed", + "sha256:3520a00c0563d7a7a7c324ad7e2cde2355733dafa9592c671fb2e9e3cd8194c1", + "sha256:4c55efbecc3152d614cfe6c2247a3054cfe358cefbf794f8c79c8575456efe19", + "sha256:58b54459221fd3f661a7329f177f091eb35cf7a603f01d9eb3eb11cc348d38c4", + "sha256:628f6b8f97b8bad2490240aa84f3e68f390e13fabc9af5c0d3b96b485921cd60", + "sha256:768fa9208df2bec4b2ce61dbc7c2ddd6b1be9fb48f1f8d3b78b3332c7d71c1ff", + "sha256:82acef724fc639699b4d3177ed5cc14c2a5aacd92edd578a9e846d5b5ec18ddf", + "sha256:93789f14ca2244fb91ed481456f6d0bb8af1f75a330e133b67d08f06ad85b516", + "sha256:9492320eed573a13a0bc09a2957f17aa733fff9ce5bf00e66e6d4a88ec33813f", + "sha256:a6e1f62a92c645e2919b65c02e79d1f61e78a58eddaebca6c23659e7c7cb4ac7", + "sha256:bd53da65f1085fb5b307c38fd3c0829e76acf7b2a912d8d79cadcdb4875c1eb7", + "sha256:da62e87637c8838b325e65beee485f71eb36202ce8e3cdbc24b9fcb8b99a37be", + "sha256:e1e7393e9c56128e870b233c82ceb42164966f25b30f68acbb24ed69ce9c3a4e", + "sha256:e98ad088edfe2f3b85a925ee96da652028f093d6b9b56b76fc242d8abb8e2059", + "sha256:f9b85eaa1f653abd0a70603b8b7008d9e00c9fa1bbd0bf40dad3f0c0bdd06793" ], "index": "pypi", "markers": "python_version >= '3.7'", - "version": "==0.5.2" + "version": "==0.5.4" }, "sniffio": { "hashes": [ diff --git a/api/requirements.txt b/api/requirements.txt index 7c43ffc..a379d3d 100644 --- a/api/requirements.txt +++ b/api/requirements.txt @@ -3,21 +3,20 @@ anyio==4.4.0 black==24.4.2 certifi==2024.7.4 click==8.1.7 -flaky==3.8.1 h11==0.14.0 httpcore==1.0.5 httpx==0.27.0 idna==3.7 iniconfig==2.0.0 isort==5.13.2 -mypy==1.10.1 +mypy==1.11.0 mypy-extensions==1.0.0 packaging==24.1 pathspec==0.12.1 platformdirs==4.2.2 pluggy==1.5.0 -pytest==8.2.2 -ruff==0.5.2 +pytest==8.3.1 +ruff==0.5.4 sniffio==1.3.1 typing-extensions==4.12.2 annotated-types==0.7.0 @@ -52,7 +51,7 @@ sqlalchemy==2.0.31 starlette==0.37.2 typer==0.12.3 urllib3==2.2.2 -uvicorn[standard]==0.30.1 +uvicorn[standard]==0.30.3 uvloop==0.19.0 watchfiles==0.22.0 websockets==12.0 diff --git a/api/tests/test_balance_cache.py b/api/tests/test_balance_cache.py index 4a7946f..e15968d 100644 --- a/api/tests/test_balance_cache.py +++ b/api/tests/test_balance_cache.py @@ -6,7 +6,6 @@ class TestBalanceServiceCache: """Test cache functionality in BalanceService""" - @pytest.mark.flaky(max_runs=10, min_passes=5) def test_cache_functionality(self, test_app: TestClient, token_factory, token): # Create entities response = test_app.post( diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 7c43ffc..0000000 --- a/requirements.txt +++ /dev/null @@ -1,60 +0,0 @@ --i https://pypi.org/simple -anyio==4.4.0 -black==24.4.2 -certifi==2024.7.4 -click==8.1.7 -flaky==3.8.1 -h11==0.14.0 -httpcore==1.0.5 -httpx==0.27.0 -idna==3.7 -iniconfig==2.0.0 -isort==5.13.2 -mypy==1.10.1 -mypy-extensions==1.0.0 -packaging==24.1 -pathspec==0.12.1 -platformdirs==4.2.2 -pluggy==1.5.0 -pytest==8.2.2 -ruff==0.5.2 -sniffio==1.3.1 -typing-extensions==4.12.2 -annotated-types==0.7.0 -blinker==1.8.2 -charset-normalizer==3.3.2 -dnspython==2.6.1 -email-validator==2.2.0 -fastapi==0.111.1 -fastapi-cli==0.0.4 -flask==3.0.3 -flask-cors==4.0.1 -flask-wtf==1.2.1 -greenlet==3.0.3 -gunicorn==22.0.0 -httptools==0.6.1 -itsdangerous==2.2.0 -jinja2==3.1.4 -markdown-it-py==3.0.0 -markupsafe==2.1.5 -mdurl==0.1.2 -pydantic==2.8.2 -pydantic-core==2.20.1 -pygments==2.18.0 -pyjwt==2.8.0 -python-dotenv==1.0.1 -python-multipart==0.0.9 -pyyaml==6.0.1 -requests==2.32.3 -rich==13.7.1 -shellingham==1.5.4 -sqlalchemy==2.0.31 -starlette==0.37.2 -typer==0.12.3 -urllib3==2.2.2 -uvicorn[standard]==0.30.1 -uvloop==0.19.0 -watchfiles==0.22.0 -websockets==12.0 -werkzeug==3.0.3 -wtforms==3.1.2 diff --git a/ui/requirements.txt b/ui/requirements.txt index 7c43ffc..a379d3d 100644 --- a/ui/requirements.txt +++ b/ui/requirements.txt @@ -3,21 +3,20 @@ anyio==4.4.0 black==24.4.2 certifi==2024.7.4 click==8.1.7 -flaky==3.8.1 h11==0.14.0 httpcore==1.0.5 httpx==0.27.0 idna==3.7 iniconfig==2.0.0 isort==5.13.2 -mypy==1.10.1 +mypy==1.11.0 mypy-extensions==1.0.0 packaging==24.1 pathspec==0.12.1 platformdirs==4.2.2 pluggy==1.5.0 -pytest==8.2.2 -ruff==0.5.2 +pytest==8.3.1 +ruff==0.5.4 sniffio==1.3.1 typing-extensions==4.12.2 annotated-types==0.7.0 @@ -52,7 +51,7 @@ sqlalchemy==2.0.31 starlette==0.37.2 typer==0.12.3 urllib3==2.2.2 -uvicorn[standard]==0.30.1 +uvicorn[standard]==0.30.3 uvloop==0.19.0 watchfiles==0.22.0 websockets==12.0