From d22d9c38682d4540bf646932987ba9dfbbc3508d Mon Sep 17 00:00:00 2001 From: Paul Van Eck Date: Tue, 31 Jan 2023 15:03:14 -0800 Subject: [PATCH] [Monitor] Remove monitor nspkg (#27842) This is no longer needed. Signed-off-by: Paul Van Eck --- .../sdk_packaging.toml | 1 - .../azure-monitor-query/sdk_packaging.toml | 1 - sdk/nspkg/azure-monitor-nspkg/CHANGELOG.md | 13 ---- sdk/nspkg/azure-monitor-nspkg/MANIFEST.in | 3 - sdk/nspkg/azure-monitor-nspkg/README.md | 16 ----- .../azure-monitor-nspkg/azure/__init__.py | 1 - .../azure/monitor/__init__.py | 1 - .../azure-monitor-nspkg/dev_requirements.txt | 2 - .../azure-monitor-nspkg/sdk_packaging.toml | 2 - sdk/nspkg/azure-monitor-nspkg/setup.py | 59 ------------------- shared_requirements.txt | 1 - 11 files changed, 100 deletions(-) delete mode 100644 sdk/nspkg/azure-monitor-nspkg/CHANGELOG.md delete mode 100644 sdk/nspkg/azure-monitor-nspkg/MANIFEST.in delete mode 100644 sdk/nspkg/azure-monitor-nspkg/README.md delete mode 100644 sdk/nspkg/azure-monitor-nspkg/azure/__init__.py delete mode 100644 sdk/nspkg/azure-monitor-nspkg/azure/monitor/__init__.py delete mode 100644 sdk/nspkg/azure-monitor-nspkg/dev_requirements.txt delete mode 100644 sdk/nspkg/azure-monitor-nspkg/sdk_packaging.toml delete mode 100644 sdk/nspkg/azure-monitor-nspkg/setup.py diff --git a/sdk/monitor/azure-monitor-ingestion/sdk_packaging.toml b/sdk/monitor/azure-monitor-ingestion/sdk_packaging.toml index 7b54443a1b33..bc89ecfddf5b 100644 --- a/sdk/monitor/azure-monitor-ingestion/sdk_packaging.toml +++ b/sdk/monitor/azure-monitor-ingestion/sdk_packaging.toml @@ -1,7 +1,6 @@ [packaging] auto_update = false package_name = "azure-monitor-ingestion" -package_nspkg = "azure-monitor-nspkg" package_pprint_name = "Monitor Ingestion" package_doc_id = "monitor-ingestion" is_stable = false diff --git a/sdk/monitor/azure-monitor-query/sdk_packaging.toml b/sdk/monitor/azure-monitor-query/sdk_packaging.toml index e433bc434275..efd98b3f246b 100644 --- a/sdk/monitor/azure-monitor-query/sdk_packaging.toml +++ b/sdk/monitor/azure-monitor-query/sdk_packaging.toml @@ -1,7 +1,6 @@ [packaging] auto_update = false package_name = "azure-monitor-query" -package_nspkg = "azure-monitor-nspkg" package_pprint_name = "Monitor Query" package_doc_id = "monitor-query" is_stable = false diff --git a/sdk/nspkg/azure-monitor-nspkg/CHANGELOG.md b/sdk/nspkg/azure-monitor-nspkg/CHANGELOG.md deleted file mode 100644 index 737e949467c3..000000000000 --- a/sdk/nspkg/azure-monitor-nspkg/CHANGELOG.md +++ /dev/null @@ -1,13 +0,0 @@ -# Release History - -## 1.1.0b1 (Unreleased) - -### Features Added - -### Breaking Changes - -### Bugs Fixed - -### Other Changes - -## 1.0.0 (2021-06-08) diff --git a/sdk/nspkg/azure-monitor-nspkg/MANIFEST.in b/sdk/nspkg/azure-monitor-nspkg/MANIFEST.in deleted file mode 100644 index 944d91b3b7df..000000000000 --- a/sdk/nspkg/azure-monitor-nspkg/MANIFEST.in +++ /dev/null @@ -1,3 +0,0 @@ -include *.md -include azure/__init__.py -include azure/monitor/__init__.py diff --git a/sdk/nspkg/azure-monitor-nspkg/README.md b/sdk/nspkg/azure-monitor-nspkg/README.md deleted file mode 100644 index 049095aa81af..000000000000 --- a/sdk/nspkg/azure-monitor-nspkg/README.md +++ /dev/null @@ -1,16 +0,0 @@ -# Microsoft Azure SDK for Python - -This is the Microsoft Azure monitor Services namespace package. - -This package is not intended to be installed directly by the end user. - -Since version 3.0, this is Python 2 package only, Python 3.x SDKs will use `PEP420 ` as namespace package strategy. -To avoid issues with package servers that does not support `python_requires`, a Python 3 package is installed but is empty. - -It provides the necessary files for other packages to extend the azure.ai namespace. - -If you are looking to install the Azure client libraries, see the -`azure `__ bundle package. - - -![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fsdk%2Ftextanalytics%2Fazure-ai-nspkg%2FREADME.png) \ No newline at end of file diff --git a/sdk/nspkg/azure-monitor-nspkg/azure/__init__.py b/sdk/nspkg/azure-monitor-nspkg/azure/__init__.py deleted file mode 100644 index 69e3be50dac4..000000000000 --- a/sdk/nspkg/azure-monitor-nspkg/azure/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__path__ = __import__('pkgutil').extend_path(__path__, __name__) diff --git a/sdk/nspkg/azure-monitor-nspkg/azure/monitor/__init__.py b/sdk/nspkg/azure-monitor-nspkg/azure/monitor/__init__.py deleted file mode 100644 index 69e3be50dac4..000000000000 --- a/sdk/nspkg/azure-monitor-nspkg/azure/monitor/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__path__ = __import__('pkgutil').extend_path(__path__, __name__) diff --git a/sdk/nspkg/azure-monitor-nspkg/dev_requirements.txt b/sdk/nspkg/azure-monitor-nspkg/dev_requirements.txt deleted file mode 100644 index c7c93cfae649..000000000000 --- a/sdk/nspkg/azure-monitor-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-monitor-nspkg/sdk_packaging.toml b/sdk/nspkg/azure-monitor-nspkg/sdk_packaging.toml deleted file mode 100644 index e7687fdae93b..000000000000 --- a/sdk/nspkg/azure-monitor-nspkg/sdk_packaging.toml +++ /dev/null @@ -1,2 +0,0 @@ -[packaging] -auto_update = false \ No newline at end of file diff --git a/sdk/nspkg/azure-monitor-nspkg/setup.py b/sdk/nspkg/azure-monitor-nspkg/setup.py deleted file mode 100644 index f604721e572b..000000000000 --- a/sdk/nspkg/azure-monitor-nspkg/setup.py +++ /dev/null @@ -1,59 +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. -#-------------------------------------------------------------------------- -import sys -from setuptools import setup - -# azure v0.x is not compatible with this package -# azure v0.x used to have a __version__ attribute (newer versions don't) -try: - import azure - try: - ver = azure.__version__ - raise Exception( - 'This package is incompatible with azure=={}. '.format(ver) + - 'Uninstall it with "pip uninstall azure".' - ) - except AttributeError: - pass -except ImportError: - pass - -PACKAGES = [] -# Do an empty package on Python 3 and not python_requires, since not everybody is ready -# https://github.com/Azure/azure-sdk-for-python/issues/3447 -# https://github.com/Azure/azure-sdk-for-python/issues/3481 -if sys.version_info[0] < 3: - PACKAGES = ['azure.monitor'] - -setup( - name='azure-monitor-nspkg', - version='1.1.0b1', - description='Microsoft Azure monitor Namespace Package [Internal]', - long_description=open('README.md', 'r').read(), - license='MIT License', - author='Microsoft Corporation', - author_email='azpysdkhelp@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', - 'License :: OSI Approved :: MIT License', - ], - zip_safe=False, - packages=PACKAGES, - install_requires=[ - 'azure-nspkg>=3.0.0', - ] -) diff --git a/shared_requirements.txt b/shared_requirements.txt index 3370d8c33ca0..91a9450348f7 100644 --- a/shared_requirements.txt +++ b/shared_requirements.txt @@ -2,7 +2,6 @@ azure-ai-nspkg azure-ai-translation-nspkg azure-ai-language-nspkg azure-iot-nspkg -azure-monitor-nspkg azure-appconfiguration<2.0.0,>=1.2.0 azure-applicationinsights~=0.1.0 azure-batch~=4.1