Skip to content

Commit a6a8664

Browse files
author
Hanzhang Zeng (Roger)
committed
Merge branch 'release/1.1.8'
2 parents 4534dd4 + fd0a96b commit a6a8664

File tree

5 files changed

+24
-10
lines changed

5 files changed

+24
-10
lines changed

‎README.md‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
<img src="./docs/Azure.Functions.svg" width = "180" alt="Functions Header Image">
1+
# <img src="https://raw.githubusercontent.com/Azure/azure-functions-python-worker/dev/docs/Azure.Functions.svg" width = "30" alt="Functions Header Image - Lightning Logo"> Azure Functions Python Worker
22

33
|Branch|Status|Coverage|CodeCov|Unittests|E2E tests|
44
|---|---|---|---|---|---|
55
|master|[![Build Status](https://azfunc.visualstudio.com/Azure%20Functions%20Python/_apis/build/status/Azure%20Functions%20Python-CI?branchName=master)](https://azfunc.visualstudio.com/Azure%20Functions%20Python/_build/latest?definitionId=3&branchName=master)|![Azure DevOps coverage](https://img.shields.io/azure-devops/coverage/azfunc/Azure%20Functions%20Python/3/master)|[![codecov](https://codecov.io/gh/Azure/azure-functions-python-worker/branch/master/graph/badge.svg)](https://codecov.io/gh/Azure/azure-functions-python-worker)|![CI Unit tests](https://github.com/Azure/azure-functions-python-worker/workflows/CI%20Unit%20tests/badge.svg?branch=master)|![CI E2E tests](https://github.com/Azure/azure-functions-python-worker/workflows/CI%20E2E%20tests/badge.svg?branch=master)
66
|dev|[![Build Status](https://azfunc.visualstudio.com/Azure%20Functions%20Python/_apis/build/status/Azure%20Functions%20Python-CI?branchName=dev)](https://azfunc.visualstudio.com/Azure%20Functions%20Python/_build/latest?definitionId=3&branchName=dev)|![Azure DevOps coverage](https://img.shields.io/azure-devops/coverage/azfunc/Azure%20Functions%20Python/3/dev)|[![codecov](https://codecov.io/gh/Azure/azure-functions-python-worker/branch/dev/graph/badge.svg)](https://codecov.io/gh/Azure/azure-functions-python-worker)|![CI Unit tests](https://github.com/Azure/azure-functions-python-worker/workflows/CI%20Unit%20tests/badge.svg?branch=dev)|![CI E2E tests](https://github.com/Azure/azure-functions-python-worker/workflows/CI%20E2E%20tests/badge.svg?branch=dev)
77

8-
# Azure Functions Python Worker
9-
108
Python support for Azure Functions is based on Python 3.6, Python 3.7, and Python 3.8, serverless hosting on Linux and the Functions 2.0 and 3.0 runtime.
119

1210
Here is the current status of Python in Azure Functions:

‎azure_functions_worker/dispatcher.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,9 @@ async def dispatch_forever(self):
130130
# established, should use it for system and user logs
131131
logging_handler = AsyncLoggingHandler()
132132
root_logger = logging.getLogger()
133-
root_logger.setLevel(logging.DEBUG)
133+
134+
# Don't change this unless you read #780 and #745
135+
root_logger.setLevel(logging.INFO)
134136
root_logger.addHandler(logging_handler)
135137
logger.info('Switched to gRPC logging.')
136138
logging_handler.flush()

‎azure_functions_worker/testutils.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,11 @@ def wrapper(self, *args, __meth__=test_case,
148148
# Trim off host output timestamps
149149
host_output = getattr(self, 'host_out', '')
150150
output_lines = host_output.splitlines()
151-
ts_re = r"^\[\d+\/\d+\/\d+ \d+\:\d+\:\d+.*(A|P)*M*\]"
152-
output = list(map(
153-
lambda s: re.sub(ts_re, '', s).strip(),
154-
output_lines))
151+
ts_re = r"^\[\d+(\/|-)\d+(\/|-)\d+T*\d+\:\d+\:\d+.*(" \
152+
r"A|P)*M*\]"
153+
output = list(map(lambda s:
154+
re.sub(ts_re, '', s).strip(),
155+
output_lines))
155156

156157
# Execute check_log_ test cases
157158
self._run_test(__check_log__, host_out=output)

‎setup.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,12 +259,12 @@ def run(self):
259259

260260
setup(
261261
name='azure-functions-worker',
262-
version='1.1.7',
262+
version='1.1.8',
263263
description='Python Language Worker for Azure Functions Host',
264264
author="Microsoft Corp.",
265265
author_email="azurefunctions@microsoft.com",
266266
keywords="azure azurefunctions python",
267-
url="http://packages.python.org/an_example_pypi_project",
267+
url="https://github.com/Azure/azure-functions-python-worker",
268268
long_description=long_description,
269269
long_description_content_type='text/markdown',
270270
classifiers=[

‎tests/unittests/test_http_functions.py‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import filecmp
66
import typing
77
import os
8+
import unittest
89

910
import pytest
1011

@@ -98,22 +99,34 @@ def check_log_async_logging(self, host_out: typing.List[str]):
9899
self.assertIn('hello info', host_out)
99100
self.assertIn('and another error', host_out)
100101

102+
@unittest.skip("Reverting the debug logs PR as host currently cannot handle"
103+
"apps with lot of debug statements. Reverting PR: "
104+
"azure-functions-python-worker/pull/745")
101105
def test_debug_logging(self):
102106
r = self.webhost.request('GET', 'debug_logging')
103107
self.assertEqual(r.status_code, 200)
104108
self.assertEqual(r.text, 'OK-debug')
105109

110+
@unittest.skip("Reverting the debug logs PR as host currently cannot handle"
111+
"apps with lot of debug statements. Reverting PR: "
112+
"azure-functions-python-worker/pull/745")
106113
def check_log_debug_logging(self, host_out: typing.List[str]):
107114
self.assertIn('logging info', host_out)
108115
self.assertIn('logging warning', host_out)
109116
self.assertIn('logging debug', host_out)
110117
self.assertIn('logging error', host_out)
111118

119+
@unittest.skip("Reverting the debug logs PR as host currently cannot handle"
120+
"apps with lot of debug statements. Reverting PR: "
121+
"azure-functions-python-worker/pull/745")
112122
def test_debug_with_user_logging(self):
113123
r = self.webhost.request('GET', 'debug_user_logging')
114124
self.assertEqual(r.status_code, 200)
115125
self.assertEqual(r.text, 'OK-user-debug')
116126

127+
@unittest.skip("Reverting the debug logs PR as host currently cannot handle"
128+
"apps with lot of debug statements. Reverting PR: "
129+
"azure-functions-python-worker/pull/745")
117130
def check_log_debug_with_user_logging(self, host_out: typing.List[str]):
118131
self.assertIn('logging info', host_out)
119132
self.assertIn('logging warning', host_out)

0 commit comments

Comments
 (0)