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

Get latest master #9441

Merged
merged 41 commits into from
Jan 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
20cbd15
Index Creation Bugfixes (#9334)
scbedd Jan 7, 2020
ffb81ed
Run Tox Test Environments in Parallel (#9034)
scbedd Jan 7, 2020
0ffb0b0
Update issue templates (#9353)
Petermarcu Jan 7, 2020
3f32d00
[EventHubs] Sample, Doc, Test improvement (#9349)
yunhaoling Jan 8, 2020
20b33dd
[textanalytics] update history.md (#9368)
kristapratico Jan 8, 2020
52c1214
add contributing for readme (#9369)
xiangyan99 Jan 8, 2020
61c1fac
Remove enter and exit from async context managers (#9313)
chlowell Jan 8, 2020
04d7b6c
Adding testutils to defined packages within azure-common (#9365)
scbedd Jan 8, 2020
52c3760
updated version and changelog (#9373)
iscai-msft Jan 8, 2020
3dbadf0
[textanalytics] Add azure-ai-nspkg to artifacts in ci.yml (#9371)
kristapratico Jan 8, 2020
98993ce
clean up temp file after run (#9356)
xiangyan99 Jan 8, 2020
7530f18
Fix certs readme (#9370)
iscai-msft Jan 8, 2020
c68eab1
Improve DefaultAzureCredential docstring and error message (#9376)
chlowell Jan 8, 2020
bbd343e
Categorize Text Analytics (#9377)
scbedd Jan 8, 2020
5bff7dc
Manually generate iothub (#9378)
Jan 9, 2020
b658626
Restapi auto databoxedge/resource manager (#9367)
Jan 9, 2020
a621b9f
[EventHubs] Comment, Test Updates (#9366)
yunhaoling Jan 9, 2020
3b2305d
Generated from 1998d0a6549d02cceed76351dbbbfc131382fa80 (#9382)
openapi-sdkautomation[bot] Jan 9, 2020
30189ac
[AutoPR storagesync/resource-manager] Microsoft.StorageSync 2019-06-0…
AutorestCI Jan 9, 2020
5b5e196
history and version (#9383)
Jan 9, 2020
cf36cf7
[textanalytics] add azure/__init__.py to manifest.in for nspkg (#9380)
kristapratico Jan 9, 2020
21d3a39
Add tracing_attributes to tracing decorator (#9297)
lmazuel Jan 9, 2020
51d36d0
Generated from 5c7e7c408cb77bf5896658ba9556cf9d841d6dae (#9189)
openapi-sdkautomation[bot] Jan 10, 2020
47f1f52
corrected container registry + history and version (#9392)
Jan 10, 2020
e0527a2
Update README.md
weshaggard Jan 10, 2020
d85482e
Restore eventhub dependency tentatively to b6 (#9384)
YijunXieMS Jan 11, 2020
e5be7fb
Generated from 2b995fff1a9984825fad215fcb4e317af1a20bf5 (#9237)
openapi-sdkautomation[bot] Jan 12, 2020
3c5ae72
Generated from 4bc9f1d4e2d95c6b43e61e59740aae7a79241e3d (#9391)
openapi-sdkautomation[bot] Jan 12, 2020
cb2e4ba
[AutoPR cognitiveservices/data-plane/*] Updating several cognitive se…
AutorestCI Jan 12, 2020
b03e2e4
[Event Hubs] Eventhubs update sample and docs (#9407)
YijunXieMS Jan 13, 2020
ea61505
Netapp history and version (#9413)
Jan 13, 2020
fccdb96
eventgrid - history and version (#9414)
Jan 13, 2020
304951a
[Event Hubs] Update checkpoint store dependency on eventhubs to 5.0.0…
YijunXieMS Jan 13, 2020
974ee9e
Small changes on README (#9431)
YijunXieMS Jan 13, 2020
d8a9ffd
remove parallel spinner for tox logs. allow eventhub to run in serial…
scbedd Jan 13, 2020
8b40aae
Expose methods for closing async credential transport sessions (#9090)
chlowell Jan 13, 2020
d512403
update changelog and release date (#9436)
xiangyan99 Jan 13, 2020
772e3a5
OpenTelemetry plugin (#7703)
lmazuel Jan 13, 2020
c89dc2b
Update azure-identity history and version (#9437)
chlowell Jan 13, 2020
bc5cd9f
OpenCensus plugin 1.0.0b5 (#9425)
lmazuel Jan 13, 2020
8691785
update version number to 1.2.0 (#9440)
xiangyan99 Jan 14, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
29 changes: 29 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

---

- **Package Name**:
- **Package Version**:
- **Operating System**:
- **Python Version**:

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1.

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Additional context**
Add any other context about the problem here.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[![Packages](https://img.shields.io/badge/packages-latest-blue.svg)](https://azure.github.io/azure-sdk/releases/latest/python.html) [![Dependencies](https://img.shields.io/badge/dependencies-analyzed-blue.svg)](https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-python/dependencies/dependencies.html) [![Python](https://img.shields.io/pypi/pyversions/azure-core.svg?maxAge=2592000)](https://pypi.python.org/pypi/azure/) [![Build Status](https://dev.azure.com/azure-sdk/public/_apis/build/status/python/python%20-%20core%20-%20ci?branchName=master)](https://dev.azure.com/azure-sdk/public/_build/latest?definitionId=458&branchName=master)

This repository is intended for active development of the Azure SDK for Python. For consumers of the SDK we recommend visiting our [public developer docs](https://docs.microsoft.com/en-us/python/azure/) or our versioned [developer docs](https://azure.github.io/azure-sdk-for-python).
This repository is for active development of the Azure SDK for Python. For consumers of the SDK we recommend visiting our [public developer docs](https://docs.microsoft.com/en-us/python/azure/) or our versioned [developer docs](https://azure.github.io/azure-sdk-for-python).

## Getting started

Expand Down
7 changes: 7 additions & 0 deletions doc/sphinx/_static/css/default_overrides.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,11 @@

.wy-nav-content-wrap {
margin-left: 380px;
}

@font-face{
font-family:"Roboto Slab";
font-style:normal;
font-weight:400;
src:url("../fonts/RobotoSlab/roboto-slab-v7-regular.eot?#iefix") format("embedded-opentype"),url("../fonts/RobotoSlab/roboto-slab-v7-regular.woff2") format("woff2"),url("../fonts/RobotoSlab/roboto-slab-v7-regular.woff") format("woff"),url("../fonts/RobotoSlab/roboto-slab-v7-regular.ttf") format("truetype")
}
1 change: 1 addition & 0 deletions doc/sphinx/generate_doc.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ def make_title(title):
# Update the code to compute this list automatically
MULTIAPI_VERSION_NAMESPACE = [
"azure.mgmt.storage",
"azure.mgmt.web",
"azure.mgmt.network",
"azure.mgmt.compute",
"azure.mgmt.containerregistry",
Expand Down
2 changes: 1 addition & 1 deletion doc/sphinx/generate_versioned_index.py
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ def write_toc_tree(categorized_menu_items):


def get_categorized_menu_items(package_names):
categorized_menu_items = {}
categorized_menu_items = {"Other": {"Client":[], "Management":[], "Other": []}}

for pkg in package_names:
# add to the categorized menu items
Expand Down
10 changes: 1 addition & 9 deletions doc/sphinx/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Azure SDK for Python
====================

.. important:: The most part of this documentation has moved to https://docs.microsoft.com/python/azure
.. important:: You can find all of the Python on Azure documentation at https://docs.microsoft.com/python/azure

The Azure SDK for Python is a set of libraries which allow you to work on Azure for your management, runtime or data needs.

Expand Down Expand Up @@ -59,14 +59,6 @@ If you encounter any bugs with the library please file an issue in the
`Issues <https://github.com/Azure/azure-sdk-for-python/issues>`__
section of the project.


Indices and tables
------------------

* :ref:`genindex`
* :ref:`modindex`
* :ref:`search`

.. toctree::
:glob:
:caption: User Documentation
Expand Down
16 changes: 13 additions & 3 deletions doc/sphinx/package_service_mapping.json
Original file line number Diff line number Diff line change
Expand Up @@ -811,11 +811,16 @@
"azure-mgmt-web": {
"category": "Management",
"namespaces": [
"azure.mgmt.web"
"azure.mgmt.web.v2015_04_01",
"azure.mgmt.web.v2015_08_01",
"azure.mgmt.web.v2016_03_01",
"azure.mgmt.web.v2016_08_01",
"azure.mgmt.web.v2016_09_01",
"azure.mgmt.web.v2018_02_01",
"azure.mgmt.web.v2018_11_01"
],
"service_name": "Web Apps"
},

"azure-servicebus": {
"category": "Client",
"service_name": "Service Bus",
Expand Down Expand Up @@ -866,6 +871,11 @@
"service_name": "Keyvault",
"manually_generated": true
},
"azure-ai-textanalytics": {
"category": "Client",
"service_name": "Text Analytics",
"manually_generated": true
},
"azure-storage-blob": {
"category": "Client",
"service_name": "Storage",
Expand Down Expand Up @@ -991,7 +1001,7 @@
},
"azure-mgmt-storagesync": {
"category": "Management",
"service_name": "Storage",
"service_name": "Storage Sync",
"namespaces": [
"azure.mgmt.storagesync"
]
Expand Down
4 changes: 2 additions & 2 deletions doc/sphinx/servicemanagement.rst
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,9 @@ To make a new deployment to Azure you must store the package file in a
Microsoft Azure Blob Storage account under the same subscription as the
hosted service to which the package is being uploaded. You can create a
deployment package with the `Microsoft Azure PowerShell
cmdlets <https://www.windowsazure.com/en-us/develop/php/how-to-guides/powershell-cmdlets/>`__,
cmdlets <https://docs.microsoft.com/en-us/powershell/azure/?view=azps-3.2.0>`__,
or with the `cspack commandline
tool <http://msdn.microsoft.com/en-us/library/gg432988.aspx>`__.
tool <https://docs.microsoft.com/en-us/azure/cloud-services/cloud-services-model-and-package#servicepackagecspkg>`__.

.. code:: python

Expand Down
9 changes: 8 additions & 1 deletion eng/pipelines/create-doc-index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,17 @@ jobs:
inputs:
versionSpec: $(PythonVersion)

- template: eng/pipelines/templates/scripts/replace-relative-links.yml@azure-sdk-tools
parameters:
TargetFolder: '.'
RootFolder: '.'
BuildSHA: $(Build.SourceVersion)
RepoId: 'Azure/azure-sdk-for-python'

- pwsh: |
pip install -r $(Build.SourcesDirectory)/doc/sphinx/requirements.txt
python $(Build.SourcesDirectory)/doc/sphinx/generate_versioned_index.py
mkdir $(Build.ArtifactStagingDirectory)
sphinx-build -b html -c $(Build.SourcesDirectory)/doc/sphinx $(Build.SourcesDirectory)/_docs $(Build.SourcesDirectory)/_docs/html
Copy-Item -Path $(Build.SourcesDirectory)/_docs/html/* -Destination $(Build.ArtifactStagingDirectory) -Recurse -Force
displayName: 'Generate Documentation Index'

Expand Down
2 changes: 2 additions & 0 deletions eng/pipelines/templates/jobs/archetype-sdk-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ parameters:
TestMarkArgument: ''
BuildTargetingString: 'azure-*'
TestTimeoutInMinutes: 0
ToxEnvParallel: '--tenvparallel'
TestMatrix:
Linux_Python27:
OSName: 'Linux'
Expand Down Expand Up @@ -117,6 +118,7 @@ jobs:
PythonVersion: $(PythonVersion)
BuildTargetingString: ${{ parameters.BuildTargetingString }}
ToxTestEnv: 'whl,sdist'
ToxEnvParallel: ${{ parameters.ToxEnvParallel }}
BeforeTestSteps:
- task: DownloadPipelineArtifact@0
inputs:
Expand Down
2 changes: 2 additions & 0 deletions eng/pipelines/templates/stages/archetype-sdk-client.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
parameters:
Artifacts: []
ServiceDirectory: not-specified
ToxEnvParallel: '--tenvparallel'

stages:
- stage: Build
jobs:
- template: ../jobs/archetype-sdk-client.yml
parameters:
ServiceDirectory: ${{parameters.ServiceDirectory}}
ToxEnvParallel: ${{parameters.ToxEnvParallel}}

# The Prerelease and Release stages are conditioned on whether we are building a pull request and the branch.
- ${{if and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'internal'))}}:
Expand Down
2 changes: 2 additions & 0 deletions eng/pipelines/templates/steps/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ parameters:
BuildTargetingString: 'azure-*'
ToxTestEnv: ""
RunCoverage: ne(variables['CoverageArg'], '--disablecov')
ToxEnvParallel: ''

steps:
- pwsh: |
Expand Down Expand Up @@ -41,6 +42,7 @@ steps:
--mark_arg="${{ parameters.TestMarkArgument }}"
--service="${{ parameters.ServiceDirectory }}"
--toxenv="${{ parameters.ToxTestEnv }}"
${{ parameters.ToxEnvParallel }}
env: ${{ parameters.EnvVars }}

- task: PublishTestResults@2
Expand Down
22 changes: 15 additions & 7 deletions eng/tox/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# note that this envlist is the default set of environments that will run if a target environment is not selected.
envlist = whl,sdist


[tools]
deps =
-r ../../../eng/test_tools.txt
Expand All @@ -21,6 +22,7 @@ deps =

[testenv]
default_pytest_params = --junitxml={toxinidir}/test-junit-{envname}.xml --verbose --durations=10 --ignore=azure
parallel_show_output =True
pre-deps =
wheel
skip_install = true
Expand All @@ -35,10 +37,11 @@ setenv =
deps = {[base]deps}
changedir = {toxinidir}
commands =
{envbindir}/python {toxinidir}/../../../eng/tox/create_wheel_and_install.py -d {distdir} -p {toxinidir}
{envbindir}/python {toxinidir}/../../../eng/tox/create_wheel_and_install.py -d {envtmpdir} -p {toxinidir}
pip freeze
pytest \
{[testenv]default_pytest_params} \
--ignore=.tox \
{posargs} \
{toxinidir}

Expand Down Expand Up @@ -79,6 +82,8 @@ commands =
pip freeze
pytest \
{posargs} \
--no-cov \
--ignore=.tox \
{toxinidir}


Expand All @@ -92,8 +97,10 @@ deps =
commands =
pytest \
{posargs} \
--ignore=.tox \
{toxinidir}


[testenv:sphinx]
skipsdist = false
skip_install = false
Expand Down Expand Up @@ -127,7 +134,7 @@ changedir = {toxinidir}
deps =
{[tools]deps}
commands =
{envbindir}/python {toxinidir}/../../../eng/tox/create_wheel_and_install.py -d {distdir} -p {toxinidir}
{envbindir}/python {toxinidir}/../../../eng/tox/create_wheel_and_install.py -d {envtmpdir} -p {toxinidir}
{envbindir}/python {toxinidir}/../../../eng/tox/import_all.py -t {toxinidir}


Expand All @@ -137,8 +144,8 @@ skip_install = true
changedir = {toxinidir}
deps =
commands =
{envbindir}/python {toxinidir}/../../../eng/tox/create_wheel_and_install.py -d {distdir} -p {toxinidir} --skip-install True
{envbindir}/python {toxinidir}/../../../eng/tox/verify_whl.py -d {distdir} -t {toxinidir}
{envbindir}/python {toxinidir}/../../../eng/tox/create_wheel_and_install.py -d {envtmpdir} -p {toxinidir} --skip-install True
{envbindir}/python {toxinidir}/../../../eng/tox/verify_whl.py -d {envtmpdir} -t {toxinidir}


[testenv:verifysdist]
Expand All @@ -147,8 +154,8 @@ skip_install = true
changedir = {toxinidir}
deps =
commands =
{envbindir}/python {toxinidir}/setup.py --q sdist --format zip -d {distdir}
{envbindir}/python {toxinidir}/../../../eng/tox/verify_sdist.py -d {distdir} -t {toxinidir}
{envbindir}/python {toxinidir}/setup.py --q sdist --format zip -d {envtmpdir}
{envbindir}/python {toxinidir}/../../../eng/tox/verify_sdist.py -d {envtmpdir} -t {toxinidir}


[testenv:devtest]
Expand All @@ -157,9 +164,10 @@ pre-deps =
deps = {[base]deps}
changedir = {toxinidir}
commands =
{envbindir}/python {toxinidir}/../../../eng/tox/create_wheel_and_install.py -d {distdir} -p {toxinidir}
{envbindir}/python {toxinidir}/../../../eng/tox/create_wheel_and_install.py -d {envtmpdir} -p {toxinidir}
{envbindir}/python {toxinidir}/../../../eng/tox/install_dev_build_dependency.py -t {toxinidir}
pytest \
{[testenv]default_pytest_params} \
--ignore=.tox \
{posargs} \
{toxinidir}
3 changes: 2 additions & 1 deletion scripts/devops_tasks/common_tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
"mgmt",
"azure-cognitiveservices",
"azure-servicefabric",
"nspkg"
"nspkg",
"azure-keyvault"
]
NON_MANAGEMENT_CODE_5_ALLOWED = [
"azure-keyvault"
Expand Down
7 changes: 7 additions & 0 deletions scripts/devops_tasks/setup_execute_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,13 @@ def execute_global_install_and_test(
action="store_true",
)

parser.add_argument(
"--tenvparallel",
default=False,
help=("Run individual tox env for each package in parallel."),
action="store_true",
)

parser.add_argument(
"--service",
help=(
Expand Down
27 changes: 27 additions & 0 deletions scripts/devops_tasks/tox_harness.py
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,26 @@ def execute_tox_parallel(tox_command_tuples):
exit(1)


def replace_dev_reqs(file):
adjusted_req_lines = []

with open(file, "r") as f:
for line in f:
args = [
part.strip()
for part in line.split()
if part and not part.strip() == "-e"
]
amended_line = " ".join(args)
adjusted_req_lines.append(amended_line)

with open(file, "w") as f:
# note that we directly use '\n' here instead of os.linesep due to how f.write() actually handles this stuff internally
# If a file is opened in text mode (the default), during write python will accidentally double replace due to "\r" being
# replaced with "\r\n" on Windows. Result: "\r\n\n". Extra line breaks!
f.write("\n".join(adjusted_req_lines))


def execute_tox_serial(tox_command_tuples):
for index, cmd_tuple in enumerate(tox_command_tuples):
tox_dir = os.path.join(cmd_tuple[1], "./.tox/")
Expand Down Expand Up @@ -260,9 +280,16 @@ def prep_and_run_tox(targeted_packages, parsed_args, options_array=[]):
with open(destination_dev_req, "w+") as file:
file.write("\n")

if in_ci():
replace_dev_reqs(destination_dev_req)
os.environ["TOX_PARALLEL_NO_SPINNER"] = "1"

if parsed_args.tox_env:
tox_execution_array.extend(["-e", parsed_args.tox_env])

if parsed_args.tenvparallel:
tox_execution_array.extend(["-p", "all"])

if local_options_array:
tox_execution_array.extend(["--"] + local_options_array)

Expand Down
Loading