Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🏗️ Upgrades repository to python 3.8.10 #2079

Merged
merged 158 commits into from
Jun 18, 2021
Merged
Changes from 1 commit
Commits
Show all changes
158 commits
Select commit Hold shift + click to select a range
91d96d7
Sets setup specifiers to python compatible with 3.8
pcrespov Jan 7, 2021
50c4c23
Upgrades all base to python:3.8.6-slim-buster
pcrespov Jan 7, 2021
6446662
Updates python requirements and classifier in setup
pcrespov Jan 7, 2021
d5bac1c
Adapts tests and some tooling configs
pcrespov Jan 7, 2021
38a713d
Updates python matrix
pcrespov Jan 7, 2021
d352f36
Adds one place to set python version used in development
pcrespov Jan 7, 2021
b81ef95
adapts api-server reqs
pcrespov Jan 7, 2021
babdbc0
adapted catalogs reqs
pcrespov Jan 7, 2021
a9710b7
adapted director-v2 reqs
pcrespov Jan 7, 2021
b45c53e
Adapts sidecar reqs
pcrespov Jan 7, 2021
320e251
adapts storage reqs
pcrespov Jan 7, 2021
0dccd92
adapts service-integration reqs
pcrespov Jan 7, 2021
63cc472
Minor: no need to check version in container
pcrespov Jan 7, 2021
8a48a5c
Adds 3.9 on packages
pcrespov Jan 7, 2021
9be1d21
Fixes deprecated import
pcrespov Jan 7, 2021
0b807d0
pytst-simcore has to be installed in director services as well
pcrespov Jan 7, 2021
d011786
isinstance does not accept anymore List or Dict as second argument
pcrespov Jan 7, 2021
5ed54e2
Missing fix
pcrespov Jan 7, 2021
23f2df7
Fixes linter
pcrespov Jan 7, 2021
783236e
Fixes dependency while installing sidecar
pcrespov Jan 7, 2021
86640f9
fixed import of CancelledError
pcrespov Jan 8, 2021
87b943f
Removes 3.9 from strategy matrix
pcrespov Jan 8, 2021
70e47c7
Fixes new mocks with asyncio
pcrespov Jan 8, 2021
ee39d40
Uses new AsyncMock
pcrespov Jan 8, 2021
feb4515
cleanup
pcrespov Jan 8, 2021
ff38c55
Can create async mocks w/o returning Futures.
pcrespov Jan 8, 2021
ea777fa
fixes
pcrespov Jan 8, 2021
d7594a5
Fixe mock
pcrespov Jan 8, 2021
bf438f1
Fixing asyncmocks
pcrespov Jan 8, 2021
d4c6c56
Fixes mocks in test_projects
pcrespov Jan 9, 2021
8fd6b4c
Fixes mocks with context manager
pcrespov Jan 9, 2021
9658197
Cleanup
pcrespov Jan 9, 2021
57290f9
Moved to sandbox
pcrespov Jan 9, 2021
5076fef
typo
pcrespov Jan 9, 2021
76cd431
Review @anderegg: Undo annotation
pcrespov Jan 11, 2021
eeb069b
Fixes mockups that we forgot to update
pcrespov Jan 11, 2021
157eb4d
Cleanup
pcrespov Jan 11, 2021
11f9e9b
Fixes tests_comp_taskss_listenting_tasks.py
pcrespov Jan 11, 2021
f3e434f
cleanup
pcrespov Jan 12, 2021
7e53fbd
Global exceptions were silencing CancellationError
pcrespov Jan 12, 2021
ef07d81
Cleanup
pcrespov Jan 13, 2021
c55257f
Fixes typo
pcrespov Jan 13, 2021
d2d1469
Catches all db errors
pcrespov Jan 13, 2021
a9fe99e
Fixes api-server reqs merged from 3.6
pcrespov Jan 23, 2021
72f2e14
Fixes typo
pcrespov Feb 10, 2021
a7478ad
Fixes parfive eversion error
pcrespov Feb 10, 2021
37fafe9
Fixes server/test/unit/isolated
pcrespov Feb 10, 2021
b18c99c
Removes monkey_path_ayncio_subprocess in 3.8
pcrespov Feb 10, 2021
e28e029
Removes monkey_patch_asyncio_subporcess
pcrespov Feb 12, 2021
299cbf5
Fixes on deprecated mocks
pcrespov Feb 12, 2021
7261aa9
Minor test fix
pcrespov Feb 12, 2021
18deb58
New repository-wise constraints
pcrespov Feb 18, 2021
dc4d831
improved tooling Makefile doc
pcrespov Feb 18, 2021
6a7e252
drops backport libraries
pcrespov Feb 18, 2021
613bf5d
drops backport libraries
pcrespov Feb 18, 2021
46954d1
drops backport libraries
pcrespov Feb 18, 2021
03313af
drops backport libraries
pcrespov Feb 18, 2021
806c957
drops backport libraries
pcrespov Feb 18, 2021
fc72fb8
drops backport libraries
pcrespov Feb 18, 2021
1f6672d
drops backport libraries
pcrespov Feb 18, 2021
c43bd36
drops backport libraries
pcrespov Feb 18, 2021
f1da8f7
drops backport libraries
pcrespov Feb 18, 2021
6000529
drops backport libraries
pcrespov Feb 18, 2021
9a0fb9a
drops backport libraries
pcrespov Feb 18, 2021
d2e72a0
drops backport library reqs
pcrespov Feb 18, 2021
c349075
drops backport library reqs
pcrespov Feb 18, 2021
45b3871
drops backport library reqs
pcrespov Feb 18, 2021
b90c7e0
drops backport library reqs
pcrespov Feb 18, 2021
3f3fca3
All the above included also these contraints
pcrespov Feb 18, 2021
2cd54d6
cleanup backport libraries from reqs
pcrespov Feb 18, 2021
2dc9a71
cleanup backport libraries from reqs
pcrespov Feb 18, 2021
8cd585b
cleanup backport libraries from reqs
pcrespov Feb 18, 2021
3868940
cleanup backport libraries from reqs
pcrespov Feb 18, 2021
5e9f639
cleanup backport libraries from reqs
pcrespov Feb 18, 2021
ced636e
Linter error
pcrespov Feb 18, 2021
1afab03
Fixes reqs due to previous merges
pcrespov Mar 26, 2021
611ebfa
Updates mocks in latest changes in storage
pcrespov Mar 26, 2021
4360051
Fixed bad merge: removed celery dependency from servicelog
pcrespov Mar 26, 2021
99b01fe
Annotate issue with mock_datcore_download in storage
pcrespov Apr 7, 2021
f49cb65
fixes patch
pcrespov Apr 7, 2021
2fbcf50
marks to skip in py3.8 because it hangs
pcrespov Apr 7, 2021
03a963c
Fixes pytest requires
pcrespov Apr 8, 2021
a6f6133
fixes simcore-sdk install under py3.6
pcrespov Apr 8, 2021
d4bfb55
Exploring where it hangs: tmp skip two tests
pcrespov Apr 8, 2021
b4e62cc
notes
pcrespov Apr 8, 2021
7da302f
Minor cleanup after merge
pcrespov Apr 23, 2021
8acd8d8
replaces get_args
pcrespov Apr 26, 2021
0ec56d1
new tests set to py3.8
pcrespov Apr 26, 2021
b25f11f
fixes storage mock of download_link_datcore
pcrespov Apr 26, 2021
7a25c43
mocks in py3.8 supports async funcs. No need to return futures
pcrespov Apr 26, 2021
0ef121e
Removed backports from dynamic-sidecar
pcrespov May 11, 2021
a8ec50f
Removed backports from storage
pcrespov May 11, 2021
6b31f7a
Upgrades CI jobs to py 3.8
pcrespov May 11, 2021
1b5935a
Upgrades container to py3.8
pcrespov May 11, 2021
1d282ec
Pruned backports in test/packages after merge
pcrespov May 17, 2021
a060308
pruned backports from catalog
pcrespov May 17, 2021
9522c9a
Removed backports from director-v2
pcrespov May 17, 2021
3be930f
Minor cleanup
pcrespov May 17, 2021
7ca00dc
Removed backports from sidecar
pcrespov May 17, 2021
f0d2324
Removed backports from web-server
pcrespov May 17, 2021
5195fc4
Upgrades unlink to py3.8 API
pcrespov May 17, 2021
2a14012
Uses new typing.get_args
pcrespov May 17, 2021
9468cca
fixes mocks returning futures
pcrespov May 21, 2021
3110ade
Ununsed import
pcrespov May 21, 2021
fabbfe7
fixes bad merge with certifi version
pcrespov May 21, 2021
30a7975
Replaces deprecated fixture by its replacement: mocked_director_api
pcrespov May 21, 2021
9c2b148
Fixes duplicate argument
pcrespov May 26, 2021
f22e8c6
Fixes linter: unused imports
pcrespov May 26, 2021
2e96c34
Fix: uses assert_has_calls instead of has_calls
pcrespov May 26, 2021
cf9a3de
stop_service changed signature. Adapting test
pcrespov Jun 3, 2021
46c3a07
fixes test_close_project: removed name arguments from reference
pcrespov Jun 11, 2021
e487218
fixes test_delete_project: missing argument in reference due to chang…
pcrespov Jun 11, 2021
acdb6be
fixes test_interactive_services_removed_after_logout: same issue as l…
pcrespov Jun 11, 2021
a365366
cleanup py3.8
pcrespov Jun 11, 2021
e333205
minor annotation fix
pcrespov Jun 11, 2021
461836c
minor
pcrespov Jun 11, 2021
58602f4
Unused imports
pcrespov Jun 11, 2021
78a7d0a
fixes expected save state
pcrespov Jun 11, 2021
b32ec79
Removed partial init in db
pcrespov Jun 14, 2021
7ba3132
Fixed some annotations
pcrespov Jun 14, 2021
53e2f9b
Increase timeout in webserver tests 5 mins
pcrespov Jun 14, 2021
af80221
Reactivates test_db
pcrespov Jun 14, 2021
5fbeb10
skipped tst_db
pcrespov Jun 14, 2021
c762621
Disables hanging tests
pcrespov Jun 14, 2021
c7d148b
disables hanging tests
pcrespov Jun 14, 2021
96c365b
upgrades dynamic-sidecar
pcrespov Jun 14, 2021
48cfa56
added logging
pcrespov Jun 14, 2021
452f06a
Upgrades aiohttp
pcrespov Jun 14, 2021
d5428c1
upgraded to 3.8.6 -> 3.8.10
pcrespov Jun 15, 2021
f6e7bd5
Adds some extra logs
pcrespov Jun 15, 2021
00ee263
minor
pcrespov Jun 15, 2021
f6d7eb0
Creates clients against the SAME server, avoiding createing multiple …
pcrespov Jun 15, 2021
6c2b459
Fixes linter and Cleanup
pcrespov Jun 15, 2021
2fcc2ba
updates client factory
pcrespov Jun 15, 2021
b7fba81
minor
pcrespov Jun 15, 2021
1dbf403
Removes deprecated loop attr in app
pcrespov Jun 16, 2021
02dccb2
forgot to uncomment
pcrespov Jun 16, 2021
9b5047d
cleanup
pcrespov Jun 16, 2021
2563a64
Prints in reality logs
pcrespov Jun 16, 2021
e31eeda
Removed verbosed log
pcrespov Jun 16, 2021
7286482
Tries 3.9
pcrespov Jun 16, 2021
0fae016
Adds extra flag to overcome when cancel does not work?
pcrespov Jun 16, 2021
015fb2e
fixes asyncio.Task functions deprecated in 3.8 and removed in 3.9
pcrespov Jun 16, 2021
d54386a
Fixes aiohttp cookies issue: Adds check on user-auth
pcrespov Jun 16, 2021
0d7db5b
Cleanup garbage-collector
pcrespov Jun 16, 2021
a81c6a4
Removing skip py38
pcrespov Jun 16, 2021
fe78d71
Removing skip py38 in director_v2
pcrespov Jun 16, 2021
e59cc0c
typo
pcrespov Jun 16, 2021
e004454
minor
pcrespov Jun 17, 2021
b77d458
cleanup reqs after merge
pcrespov Jun 17, 2021
9b05cae
cleanup
pcrespov Jun 17, 2021
2451c27
@sanderegg review: removed old comment
pcrespov Jun 18, 2021
d64976d
@sanderegg review: retry more readable
pcrespov Jun 18, 2021
2e5e168
@sanderegg review: creates aioresponse_mocker and used to mock catalo…
pcrespov Jun 18, 2021
caed07a
@GitHK review: minor
pcrespov Jun 18, 2021
5b00a5c
made retry async
pcrespov Jun 18, 2021
f5e778a
enables lock_with_notification
pcrespov Jun 18, 2021
ab6c99a
uses Task.get_coro()
pcrespov Jun 18, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -125,17 +125,17 @@ async def test_listen_comp_tasks_task(
# tests whether listener gets hooked calls executed
for call_name, mocked_call in mock_project_subsystem.items():
if call_name in expected_calls:
for attempt in _retry_if_fails():
async for attempt in _async_retry_if_fails():
with attempt:
mocked_call.assert_awaited()

else:
mocked_call.assert_not_called()


def _retry_if_fails():
# Helper that retries to acount for some uncontrolled delays
return tenacity.Retrying(
def _async_retry_if_fails():
pcrespov marked this conversation as resolved.
Show resolved Hide resolved
# Helper that retries to account for some uncontrolled delays
return tenacity.AsyncRetrying(
wait=tenacity.wait_fixed(1),
stop=tenacity.stop_after_delay(10),
retry=tenacity.retry_if_exception_type(AssertionError),
Expand Down