Skip to content

Commit fd28f68

Browse files
committed
flake
1 parent c4a237d commit fd28f68

File tree

4 files changed

+27
-29
lines changed

4 files changed

+27
-29
lines changed

eng/templates/jobs/ci-dependency-check.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@ jobs:
1212

1313
strategy:
1414
matrix:
15-
Python39:
16-
PYTHON_VERSION: '3.9'
17-
Python310:
18-
PYTHON_VERSION: '3.10'
1915
Python311:
2016
PYTHON_VERSION: '3.11'
2117
Python312:

workers/proxy_worker/dispatcher.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
from asyncio import AbstractEventLoop
1313
from dataclasses import dataclass
1414
from typing import Any, Optional
15-
import packaging
1615

1716
import grpc
1817

workers/tests/unittests/check_imports.py

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -56,25 +56,25 @@ def find_imports(src_dir):
5656
imports.add("azurefunctions.extensions.base")
5757
# Special cases to ignore
5858
elif str(src_dir).startswith("workers") and (
59-
node.module == "azure.monitor.opentelemetry"
60-
or node.module == "opentelemetry"
61-
or node.module == "opentelemetry.trace.propagation.tracecontext"
62-
or node.module == "Cookie"):
59+
node.module == "azure.monitor.opentelemetry"
60+
or node.module == "opentelemetry"
61+
or node.module == "opentelemetry.trace.propagation.tracecontext" # noqa
62+
or node.module == "Cookie"):
6363
pass
64-
elif str(src_dir).startswith("runtimes\\v1\\azure_functions_runtime_v1") and (
65-
node.module == "google.protobuf.timestamp_pb2"
66-
or node.module == "azure.monitor.opentelemetry"
67-
or node.module == "opentelemetry"
68-
or node.module == "opentelemetry.trace.propagation.tracecontext"
69-
or node.module == "Cookie"):
64+
elif str(src_dir).startswith("runtimes\\v1\\azure_functions_runtime_v1") and ( # noqa
65+
node.module == "google.protobuf.timestamp_pb2"
66+
or node.module == "azure.monitor.opentelemetry"
67+
or node.module == "opentelemetry"
68+
or node.module == "opentelemetry.trace.propagation.tracecontext" # noqa
69+
or node.module == "Cookie"):
7070
pass
71-
elif str(src_dir).startswith("runtimes\\v2\\azure_functions_runtime") and (
72-
node.module == "google.protobuf.duration_pb2"
73-
or node.module == "google.protobuf.timestamp_pb2"
74-
or node.module == "azure.monitor.opentelemetry"
75-
or node.module == "opentelemetry"
76-
or node.module == "opentelemetry.trace.propagation.tracecontext"
77-
or node.module == "Cookie"):
71+
elif str(src_dir).startswith("runtimes\\v2\\azure_functions_runtime")and ( # noqa
72+
node.module == "google.protobuf.duration_pb2"
73+
or node.module == "google.protobuf.timestamp_pb2"
74+
or node.module == "azure.monitor.opentelemetry"
75+
or node.module == "opentelemetry"
76+
or node.module == "opentelemetry.trace.propagation.tracecontext" # noqa
77+
or node.module == "Cookie"):
7878
pass
7979
else:
8080
imports.add(node.module.split(".")[0])
@@ -119,8 +119,6 @@ def check_package(pkg_root, package_name):
119119
):
120120
missing.append(imp)
121121

122-
123-
124122
if missing:
125123
print("Missing required dependencies:")
126124
for m in missing:

workers/tests/utils/testutils_docker.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,9 @@ def find_latest_image(image_repo: str,
6969
image_url: str) -> str:
7070

7171
# New regex to match version format: 4.1042.100-4-python3.11
72-
regex = re.compile(_HOST_VERSION + r'\.10\d+\.\d+(-\d+)?-python' + _python_version + r'(-appservice)?$')
72+
regex = re.compile(_HOST_VERSION
73+
+ r'\.10\d+\.\d+(-\d+)?-python'
74+
+ _python_version + r'(-appservice)?$')
7375

7476
response = requests.get(image_url, allow_redirects=True)
7577
if not response.ok:
@@ -91,10 +93,13 @@ def find_latest_image(image_repo: str,
9193
# getting the latest released runtime version for python.
9294
# Parse version format: 4.1042.100-4-python3.11
9395
def parse_version(tag):
94-
version_part = tag.split('-python')[0] # "4.1042.100-4"
95-
parts = version_part.replace('-', '.').split('.') # ["4", "1042", "100", "4"]
96-
return tuple(int(p) for p in parts) # (4, 1042, 100, 4)
97-
96+
# "4.1042.100-4"
97+
version_part = tag.split('-python')[0]
98+
# ["4", "1042", "100", "4"]
99+
parts = version_part.replace('-', '.').split('.')
100+
# (4, 1042, 100, 4)
101+
return tuple(int(p) for p in parts)
102+
98103
latest_version = sorted(python_versions, key=parse_version)[-1]
99104

100105
image_tag = f'{image_repo}:{latest_version}'

0 commit comments

Comments
 (0)