From fe122e53108a2d361a4710bd0a0ce88e08070446 Mon Sep 17 00:00:00 2001 From: Paul Van Eck Date: Tue, 20 Sep 2022 08:45:05 -0700 Subject: [PATCH] [RemoteRendering] Python 3.6 removal and cleanup (#26277) MixedReality RemoteRendering had necessary files updated to reflect that Python 3.7 is now the minimum supported version. The mixedreality-nspkg dev dependency was also removed, and since the nspkg is no longer used by any package, it was removed as well. Signed-off-by: Paul Van Eck Signed-off-by: Paul Van Eck --- .../azure-mixedreality-nspkg/CHANGELOG.md | 5 --- .../azure-mixedreality-nspkg/MANIFEST.in | 3 -- sdk/nspkg/azure-mixedreality-nspkg/README.md | 11 ----- .../azure/__init__.py | 1 - .../azure/mixedreality/__init__.py | 0 .../dev_requirements.txt | 2 - sdk/nspkg/azure-mixedreality-nspkg/setup.cfg | 2 - sdk/nspkg/azure-mixedreality-nspkg/setup.py | 41 ------------------- sdk/nspkg/ci.yml | 3 -- .../CHANGELOG.md | 2 +- .../README.md | 6 +-- .../dev_requirements.txt | 2 - .../setup.py | 3 +- shared_requirements.txt | 1 - 14 files changed, 5 insertions(+), 77 deletions(-) delete mode 100644 sdk/nspkg/azure-mixedreality-nspkg/CHANGELOG.md delete mode 100644 sdk/nspkg/azure-mixedreality-nspkg/MANIFEST.in delete mode 100644 sdk/nspkg/azure-mixedreality-nspkg/README.md delete mode 100644 sdk/nspkg/azure-mixedreality-nspkg/azure/__init__.py delete mode 100644 sdk/nspkg/azure-mixedreality-nspkg/azure/mixedreality/__init__.py delete mode 100644 sdk/nspkg/azure-mixedreality-nspkg/dev_requirements.txt delete mode 100644 sdk/nspkg/azure-mixedreality-nspkg/setup.cfg delete mode 100644 sdk/nspkg/azure-mixedreality-nspkg/setup.py diff --git a/sdk/nspkg/azure-mixedreality-nspkg/CHANGELOG.md b/sdk/nspkg/azure-mixedreality-nspkg/CHANGELOG.md deleted file mode 100644 index 627c355468b5..000000000000 --- a/sdk/nspkg/azure-mixedreality-nspkg/CHANGELOG.md +++ /dev/null @@ -1,5 +0,0 @@ -# Release History - -## 1.0.0 (Unreleased) - -- Initial release diff --git a/sdk/nspkg/azure-mixedreality-nspkg/MANIFEST.in b/sdk/nspkg/azure-mixedreality-nspkg/MANIFEST.in deleted file mode 100644 index 092b64f9159b..000000000000 --- a/sdk/nspkg/azure-mixedreality-nspkg/MANIFEST.in +++ /dev/null @@ -1,3 +0,0 @@ -include *.md -include azure/__init__.py -include azure/mixedreality/__init__.py \ No newline at end of file diff --git a/sdk/nspkg/azure-mixedreality-nspkg/README.md b/sdk/nspkg/azure-mixedreality-nspkg/README.md deleted file mode 100644 index 995038c70840..000000000000 --- a/sdk/nspkg/azure-mixedreality-nspkg/README.md +++ /dev/null @@ -1,11 +0,0 @@ -# Microsoft Azure Mixed Reality SDK for Python - -This is the Microsoft Azure Mixed Reality namespace package. - -This package is not intended to be installed directly by the end user. - -It provides the necessary files for other packages to extend the -azure.mixedreality namespace. - -The complete list of available packages can be found at: -https://aka.ms/azsdk/python/all diff --git a/sdk/nspkg/azure-mixedreality-nspkg/azure/__init__.py b/sdk/nspkg/azure-mixedreality-nspkg/azure/__init__.py deleted file mode 100644 index 69e3be50dac4..000000000000 --- a/sdk/nspkg/azure-mixedreality-nspkg/azure/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__path__ = __import__('pkgutil').extend_path(__path__, __name__) diff --git a/sdk/nspkg/azure-mixedreality-nspkg/azure/mixedreality/__init__.py b/sdk/nspkg/azure-mixedreality-nspkg/azure/mixedreality/__init__.py deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/sdk/nspkg/azure-mixedreality-nspkg/dev_requirements.txt b/sdk/nspkg/azure-mixedreality-nspkg/dev_requirements.txt deleted file mode 100644 index c7c93cfae649..000000000000 --- a/sdk/nspkg/azure-mixedreality-nspkg/dev_requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ --e ../../../tools/azure-sdk-tools --e ../../../tools/azure-devtools diff --git a/sdk/nspkg/azure-mixedreality-nspkg/setup.cfg b/sdk/nspkg/azure-mixedreality-nspkg/setup.cfg deleted file mode 100644 index 3480374bc2f2..000000000000 --- a/sdk/nspkg/azure-mixedreality-nspkg/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[bdist_wheel] -universal=1 \ No newline at end of file diff --git a/sdk/nspkg/azure-mixedreality-nspkg/setup.py b/sdk/nspkg/azure-mixedreality-nspkg/setup.py deleted file mode 100644 index a80cc7d1344c..000000000000 --- a/sdk/nspkg/azure-mixedreality-nspkg/setup.py +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env python - -# ------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -------------------------------------------------------------------------- - -from setuptools import setup - -setup( - name='azure-mixedreality-nspkg', - version='1.0.0', - description='Microsoft Azure Mixed Reality Namespace Package [Internal]', - long_description=open('README.md', 'r').read(), - license='MIT License', - author='Microsoft Corporation', - author_email='azurepysdk@microsoft.com', - url='https://github.com/Azure/azure-sdk-for-python/', - classifiers=[ - 'Development Status :: 5 - Production/Stable', - - 'Programming Language :: Python', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.5', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'License :: OSI Approved :: MIT License', - ], - zip_safe=False, - packages=[ - 'azure.mixedreality', - ], - install_requires=[ - 'azure-nspkg>=2.0.0', - ] -) \ No newline at end of file diff --git a/sdk/nspkg/ci.yml b/sdk/nspkg/ci.yml index b88454fd1a75..2ab0323060b1 100644 --- a/sdk/nspkg/ci.yml +++ b/sdk/nspkg/ci.yml @@ -70,9 +70,6 @@ extends: - name: azure-search-nspkg safeName: azuresearchnspkg skipVerifyChangeLog: true - - name: azure-mixedreality-nspkg - safeName: azuremixedrealitynspkg - skipVerifyChangeLog: true - name: azure-security-nspkg safeName: azuresecuritynspkg skipVerifyChangeLog: true diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/CHANGELOG.md b/sdk/remoterendering/azure-mixedreality-remoterendering/CHANGELOG.md index ba21f4a272aa..ddf977027aab 100644 --- a/sdk/remoterendering/azure-mixedreality-remoterendering/CHANGELOG.md +++ b/sdk/remoterendering/azure-mixedreality-remoterendering/CHANGELOG.md @@ -6,7 +6,7 @@ ### Other Changes -- Python 2.7 is no longer supported. Please use Python version 3.6 or later. +- Python 2.7 is no longer supported. Please use Python version 3.7 or later. ## 1.0.0b1 (2021-11-15) diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/README.md b/sdk/remoterendering/azure-mixedreality-remoterendering/README.md index f1bf6cd4067b..00c69f2f806a 100644 --- a/sdk/remoterendering/azure-mixedreality-remoterendering/README.md +++ b/sdk/remoterendering/azure-mixedreality-remoterendering/README.md @@ -254,7 +254,7 @@ The following snippet describes how to request that a new rendering session be s ### Extend the lease time of a session -If a session is approaching its maximum lease time, but you want to keep it alive, you will need to make a call to +If a session is approaching its maximum lease time, but you want to keep it alive, you will need to make a call to increase its maximum lease time. This example shows how to query the current properties and then extend the lease if it will expire soon. @@ -336,7 +336,7 @@ The Remote Rendering client library will raise exceptions defined in [Azure Core ### Async APIs -This library also includes a complete async API supported on Python 3.5+. To use it, you must +This library also includes a complete async API supported on Python 3.7+. To use it, you must first install an async transport, such as [aiohttp](https://pypi.org/project/aiohttp/). Async clients are found under the `azure.mixedreality.remoterendering.aio` namespace. @@ -377,4 +377,4 @@ to build and test the code. [azure_identity]: https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/identity/azure-identity [pip]: https://pypi.org/project/pip/ -[sdk_logging_docs]: https://docs.microsoft.com/azure/developer/python/azure-sdk-logging \ No newline at end of file +[sdk_logging_docs]: https://docs.microsoft.com/azure/developer/python/azure-sdk-logging diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/dev_requirements.txt b/sdk/remoterendering/azure-mixedreality-remoterendering/dev_requirements.txt index 7cab278fd6d1..aacb04dd10bc 100644 --- a/sdk/remoterendering/azure-mixedreality-remoterendering/dev_requirements.txt +++ b/sdk/remoterendering/azure-mixedreality-remoterendering/dev_requirements.txt @@ -1,8 +1,6 @@ -e ../../../tools/azure-sdk-tools ../../core/azure-core -../../nspkg/azure-mixedreality-nspkg ../../mixedreality/azure-mixedreality-authentication aiohttp>=3.0 -e ../../identity/azure-identity -e ../../../tools/azure-devtools - diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/setup.py b/sdk/remoterendering/azure-mixedreality-remoterendering/setup.py index aaf9359da7ec..4885c6576826 100644 --- a/sdk/remoterendering/azure-mixedreality-remoterendering/setup.py +++ b/sdk/remoterendering/azure-mixedreality-remoterendering/setup.py @@ -44,7 +44,6 @@ 'Programming Language :: Python', 'Programming Language :: Python :: 3 :: Only', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', @@ -61,7 +60,7 @@ package_data={ 'pytyped': ['py.typed'], }, - python_requires=">=3.6", + python_requires=">=3.7", install_requires=[ 'azure-core<2.0.0,>=1.6.0', 'azure-mixedreality-authentication>=1.0.0b1', diff --git a/shared_requirements.txt b/shared_requirements.txt index 7ab44bc374ed..d11b94254c6c 100644 --- a/shared_requirements.txt +++ b/shared_requirements.txt @@ -89,7 +89,6 @@ azure-mgmt-subscription~=0.2.0 azure-mgmt-trafficmanager~=0.50.0 azure-mgmt-web~=0.35.0 azure-messaging-nspkg -azure-mixedreality-nspkg azure-mixedreality-authentication azure-nspkg azure-keyvault-nspkg