Skip to content

Commit c33f1dd

Browse files
authored
Merge branch 'dev' into jviau/targets
2 parents 6586aaf + 139af01 commit c33f1dd

File tree

233 files changed

+1988
-1217
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

233 files changed

+1988
-1217
lines changed

.artifactignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
_manifest\**
2+
bcde-output\**
3+
Experiment_PipReport_**
4+
GovCompDisc_Log_**
5+
GovCompDisc_Manifest_**
6+
GovCompDisc_Metadata_**
7+
ScanTelemetry_**

.ci/e2e_integration_test/start-e2e.ps1

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,9 @@ Write-Host "Preparing E2E integration tests..." -ForegroundColor Green
8989
Write-Host "-----------------------------------------------------------------------------`n" -ForegroundColor Green
9090
python -m pip install -U pip
9191
python -m pip install -U -e .[dev]
92-
python setup.py build
93-
python setup.py extension
92+
cd tests
93+
python -m invoke -c test_setup build-protos
94+
python -m invoke -c test_setup extensions
9495
Write-Host "-----------------------------------------------------------------------------`n" -ForegroundColor Green
9596
Write-Host "-----------------------------------------------------------------------------`n" -ForegroundColor Green
9697
Write-Host "-----------------------------------------------------------------------------`n" -ForegroundColor Green

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
// "forwardPorts": [],
4747

4848
// Use 'postCreateCommand' to run commands after the container is created.
49-
"postCreateCommand": "sudo python -m pip install -U pip && sudo python -m pip install -U -e .[dev] && sudo python setup.py webhost",
49+
"postCreateCommand": "sudo python -m pip install -U pip && sudo python -m pip install -U -e .[dev] && cd tests && sudo python -m invoke -c test_setup webhost",
5050

5151
// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
5252
"remoteUser": "vscode",

.github/Scripts/deferred-bindings-e2e-tests.sh

Lines changed: 0 additions & 2 deletions
This file was deleted.

.github/Scripts/e2e-tests.sh

Lines changed: 0 additions & 2 deletions
This file was deleted.

.github/Scripts/fwpc-e2e-tests.sh

Lines changed: 0 additions & 2 deletions
This file was deleted.

.github/linters/tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ exclude =
3232
venv*,
3333
scripts
3434

35-
max-line-length = 80
35+
max-line-length = 88
3636

3737
per-file-ignores =
3838
# import not used

.isort.cfg

Lines changed: 0 additions & 2 deletions
This file was deleted.

azure_functions_worker/_thirdparty/typing_inspect.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,9 @@
1111

1212
# NOTE: This module must support Python 2.7 in addition to Python 3.x
1313

14-
import sys
1514
import collections.abc
16-
from typing import (
17-
Generic, Callable, Union, TypeVar, ClassVar, Tuple, _GenericAlias
18-
)
15+
import sys
16+
from typing import Callable, ClassVar, Generic, Tuple, TypeVar, Union, _GenericAlias
1917

2018
NEW_39_TYPING = sys.version_info[:3] >= (3, 9, 0) # PEP 560
2119
if NEW_39_TYPING:

azure_functions_worker/bindings/__init__.py

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
# Copyright (c) Microsoft Corporation. All rights reserved.
22
# Licensed under the MIT License.
3-
from .tracecontext import TraceContext
4-
from .retrycontext import RetryContext
3+
from .retrycontext import RetryContext # isort: skip
4+
from .tracecontext import TraceContext # isort: skip
55
from .context import Context
6-
from .meta import check_input_type_annotation
7-
from .meta import check_output_type_annotation
8-
from .meta import has_implicit_output
9-
from .meta import is_trigger_binding, load_binding_registry
10-
from .meta import from_incoming_proto, to_outgoing_proto, \
11-
to_outgoing_param_binding, check_deferred_bindings_enabled, \
12-
get_deferred_raw_bindings
6+
from .meta import (
7+
check_deferred_bindings_enabled,
8+
check_input_type_annotation,
9+
check_output_type_annotation,
10+
from_incoming_proto,
11+
get_deferred_raw_bindings,
12+
has_implicit_output,
13+
is_trigger_binding,
14+
load_binding_registry,
15+
to_outgoing_param_binding,
16+
to_outgoing_proto,
17+
)
1318
from .out import Out
1419

15-
1620
__all__ = (
1721
'Out', 'Context',
1822
'is_trigger_binding',

0 commit comments

Comments
 (0)