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

Jump to bottom

[AutoPR botservice/resource-manager] typo: Microsoft.BotService #3906

Merged
merged 2 commits into from
Nov 30, 2018
Merged

[AutoPR botservice/resource-manager] typo: Microsoft.BotService #3906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6af4311
Generated from 77075e9baa504c1b4b206ee925823c3b7589cecf
AutorestCI Nov 30, 2018
b48bc8b
Packaging update of azure-mgmt-botservice
azuresdkci Nov 30, 2018
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
4 changes: 3 additions & 1 deletion azure-mgmt-botservice/MANIFEST.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
include *.rst
include azure_bdist_wheel.py
include azure/__init__.py
include azure/mgmt/__init__.py

2 changes: 1 addition & 1 deletion azure-mgmt-botservice/azure/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__import__('pkg_resources').declare_namespace(__name__)
__path__ = __import__('pkgutil').extend_path(__path__, __name__)
2 changes: 1 addition & 1 deletion azure-mgmt-botservice/azure/mgmt/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__import__('pkg_resources').declare_namespace(__name__)
__path__ = __import__('pkgutil').extend_path(__path__, __name__)
8 changes: 4 additions & 4 deletions azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider_properties.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ class ServiceProviderProperties(Model):

:ivar id: Id for Service Provider
:vartype id: str
:ivar display_name: Diplay Name of the Service Provider
:ivar display_name: Display Name of the Service Provider
:vartype display_name: str
:ivar service_provider_name: Diplay Name of the Service Provider
:ivar service_provider_name: Display Name of the Service Provider
:vartype service_provider_name: str
:ivar dev_portal_url: Diplay Name of the Service Provider
:ivar dev_portal_url: Display Name of the Service Provider
:vartype dev_portal_url: str
:ivar icon_url: Diplay Name of the Service Provider
:ivar icon_url: Display Name of the Service Provider
:vartype icon_url: str
:param parameters: The list of parameters for the Service Provider
:type parameters:
Expand Down
8 changes: 4 additions & 4 deletions azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider_properties_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ class ServiceProviderProperties(Model):

:ivar id: Id for Service Provider
:vartype id: str
:ivar display_name: Diplay Name of the Service Provider
:ivar display_name: Display Name of the Service Provider
:vartype display_name: str
:ivar service_provider_name: Diplay Name of the Service Provider
:ivar service_provider_name: Display Name of the Service Provider
:vartype service_provider_name: str
:ivar dev_portal_url: Diplay Name of the Service Provider
:ivar dev_portal_url: Display Name of the Service Provider
:vartype dev_portal_url: str
:ivar icon_url: Diplay Name of the Service Provider
:ivar icon_url: Display Name of the Service Provider
:vartype icon_url: str
:param parameters: The list of parameters for the Service Provider
:type parameters:
Expand Down
54 changes: 0 additions & 54 deletions azure-mgmt-botservice/azure_bdist_wheel.py
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion azure-mgmt-botservice/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
[bdist_wheel]
universal=1
azure-namespace-package=azure-mgmt-nspkg
17 changes: 9 additions & 8 deletions azure-mgmt-botservice/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@
import os.path
from io import open
from setuptools import find_packages, setup
try:
from azure_bdist_wheel import cmdclass
except ImportError:
from distutils import log as logger
logger.warn("Wheel is not available, disabling bdist_wheel hook")
cmdclass = {}

# Change the PACKAGE_NAME only to change folder and different name
PACKAGE_NAME = "azure-mgmt-botservice"
Expand Down Expand Up @@ -76,11 +70,18 @@
'License :: OSI Approved :: MIT License',
],
zip_safe=False,
packages=find_packages(exclude=["tests"]),
packages=find_packages(exclude=[
'tests',
# Exclude packages that will be covered by PEP420 or nspkg
'azure',
'azure.mgmt',
]),
install_requires=[
'msrest>=0.5.0',
'msrestazure>=0.4.32,<2.0.0',
'azure-common~=1.1',
],
cmdclass=cmdclass
extras_require={
":python_version<'3.0'": ['azure-mgmt-nspkg'],
}
)