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.

Sign up for GitHub

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

Fix azure-cognitiveservices-nspkg (and sub nspkg) #4467

Merged
merged 6 commits into from
Mar 1, 2019
Merged

Fix azure-cognitiveservices-nspkg (and sub nspkg) #4467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6d16046
Fix azure-cognitiveservices-nspkg
lmazuel Mar 1, 2019
f196e77
Fix azure-cognitiveservices-language-nspkg
lmazuel Mar 1, 2019
04ad851
Fix indentation in Readme
lmazuel Mar 1, 2019
c1f01e8
Fix azure-cognitiveservices-search-nspkg
lmazuel Mar 1, 2019
83d2428
Fix azure-cognitiveservices-vision-nspkg
lmazuel Mar 1, 2019
6e8530c
Add missing import sys
lmazuel Mar 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion azure-cognitiveservices-knowledge-nspkg/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ This is the Microsoft Azure Cognitive Services Knowledge 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 <https://www.python.org/dev/peps/pep-0420/>` 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.
Since version 3.0, this is Python 2 package only, Python 3.x SDKs will use `PEP420 <https://www.python.org/dev/peps/pep-0420/>` 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.cognitiveservices.knowledge namespace.

Expand Down
2 changes: 2 additions & 0 deletions azure-cognitiveservices-language-nspkg/MANIFEST.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
include *.rst
include azure/cognitiveservices/__init__.py
include azure/cognitiveservices/language/__init__.py
2 changes: 1 addition & 1 deletion azure-cognitiveservices-language-nspkg/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This is the Microsoft Azure Cognitive Services Language 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 <https://www.python.org/dev/peps/pep-0420/>` as namespace package strategy.
This package will use `python_requires` to enforce Python 2 installation. This implies that you might see this package on Python 3 environment if you have pip < 9.0 or setuptools < 24.2.0.
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.cognitiveservices.language namespace.

Expand Down
2 changes: 0 additions & 2 deletions azure-cognitiveservices-language-nspkg/setup.cfg
View file
Open in desktop

This file was deleted.

21 changes: 15 additions & 6 deletions azure-cognitiveservices-language-nspkg/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# 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
Expand All @@ -23,9 +23,16 @@
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.cognitiveservices.language']

setup(
name='azure-cognitiveservices-language-nspkg',
version='3.0.0',
version='3.0.1',
description='Microsoft Azure Cognitive Services Language Namespace Package [Internal]',
long_description=open('README.rst', 'r').read(),
license='MIT License',
Expand All @@ -37,13 +44,15 @@
'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'License :: OSI Approved :: MIT License',
],
zip_safe=False,
packages=[
'azure.cognitiveservices.language',
],
python_requires='<3',
packages=PACKAGES,
install_requires=[
'azure-cognitiveservices-nspkg>=3.0.0',
]
Expand Down
1 change: 1 addition & 0 deletions azure-cognitiveservices-nspkg/MANIFEST.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
include *.rst
include azure/cognitiveservices/__init__.py
2 changes: 1 addition & 1 deletion azure-cognitiveservices-nspkg/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This is the Microsoft Azure Cognitive 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 <https://www.python.org/dev/peps/pep-0420/>` as namespace package strategy.
This package will use `python_requires` to enforce Python 2 installation. This implies that you might see this package on Python 3 environment if you have pip < 9.0 or setuptools < 24.2.0.
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.cognitiveservices namespace.

Expand Down
2 changes: 0 additions & 2 deletions azure-cognitiveservices-nspkg/setup.cfg
View file
Open in desktop

This file was deleted.

21 changes: 15 additions & 6 deletions azure-cognitiveservices-nspkg/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# 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
Expand All @@ -23,9 +23,16 @@
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.cognitiveservices']

setup(
name='azure-cognitiveservices-nspkg',
version='3.0.0',
version='3.0.1',
description='Microsoft Azure Cognitive Services Namespace Package [Internal]',
long_description=open('README.rst', 'r').read(),
license='MIT License',
Expand All @@ -37,13 +44,15 @@
'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'License :: OSI Approved :: MIT License',
],
zip_safe=False,
packages=[
'azure.cognitiveservices',
],
python_requires='<3',
packages=PACKAGES,
install_requires=[
'azure-nspkg>=3.0.0',
]
Expand Down
2 changes: 2 additions & 0 deletions azure-cognitiveservices-search-nspkg/MANIFEST.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
include *.rst
include azure/cognitiveservices/__init__.py
include azure/cognitiveservices/search/__init__.py
2 changes: 1 addition & 1 deletion azure-cognitiveservices-search-nspkg/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This is the Microsoft Azure Cognitive Services Search 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 <https://www.python.org/dev/peps/pep-0420/>` as namespace package strategy.
This package will use `python_requires` to enforce Python 2 installation. This implies that you might see this package on Python 3 environment if you have pip < 9.0 or setuptools < 24.2.0.
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.cognitiveservices.search namespace.

Expand Down
2 changes: 0 additions & 2 deletions azure-cognitiveservices-search-nspkg/setup.cfg
View file
Open in desktop

This file was deleted.

21 changes: 15 additions & 6 deletions azure-cognitiveservices-search-nspkg/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# 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
Expand All @@ -23,9 +23,16 @@
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.cognitiveservices.search']

setup(
name='azure-cognitiveservices-search-nspkg',
version='3.0.0',
version='3.0.1',
description='Microsoft Azure Cognitive Services Search Namespace Package [Internal]',
long_description=open('README.rst', 'r').read(),
license='MIT License',
Expand All @@ -37,13 +44,15 @@
'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'License :: OSI Approved :: MIT License',
],
zip_safe=False,
packages=[
'azure.cognitiveservices.search',
],
python_requires='<3',
packages=PACKAGES,
install_requires=[
'azure-cognitiveservices-nspkg>=3.0.0',
]
Expand Down
2 changes: 2 additions & 0 deletions azure-cognitiveservices-vision-nspkg/MANIFEST.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
include *.rst
include azure/cognitiveservices/__init__.py
include azure/cognitiveservices/vision/__init__.py
2 changes: 1 addition & 1 deletion azure-cognitiveservices-vision-nspkg/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This is the Microsoft Azure Cognitive Services Vision 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 <https://www.python.org/dev/peps/pep-0420/>` as namespace package strategy.
This package will use `python_requires` to enforce Python 2 installation. This implies that you might see this package on Python 3 environment if you have pip < 9.0 or setuptools < 24.2.0.
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.cognitiveservices.vision namespace.

Expand Down
2 changes: 0 additions & 2 deletions azure-cognitiveservices-vision-nspkg/setup.cfg
View file
Open in desktop

This file was deleted.

19 changes: 14 additions & 5 deletions azure-cognitiveservices-vision-nspkg/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# 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
Expand All @@ -23,6 +23,13 @@
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.cognitiveservices.vision']

setup(
name='azure-cognitiveservices-vision-nspkg',
version='3.0.0',
Expand All @@ -37,13 +44,15 @@
'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'License :: OSI Approved :: MIT License',
],
zip_safe=False,
packages=[
'azure.cognitiveservices.vision',
],
python_requires='<3',
packages=PACKAGES,
install_requires=[
'azure-cognitiveservices-nspkg>=3.0.0',
]
Expand Down