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

[AutoPR reservations/resource-manager] Reservations RP 2018-06-01 Preview: Add new reserved resource type RedHat #3725

Merged
merged 4 commits into from
Nov 2, 2018
Merged

[AutoPR reservations/resource-manager] Reservations RP 2018-06-01 Preview: Add new reserved resource type RedHat #3725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2bac591
Generated from 1502eaa09d37733a664e6dfbe14a2f3224f66bc8
AutorestCI Oct 31, 2018
80c2562
Generated from ebf3ab084f69b5e9aeaeb0de1509c5963ca4d85c
AutorestCI Oct 31, 2018
64e0961
Packaging update of azure-mgmt-reservations
azuresdkci Oct 31, 2018
bc42c1d
Generated from 07969ca3858ae7344a6528ec6bb2d6656c06f534
AutorestCI Oct 31, 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-reservations/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-reservations/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-reservations/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__)
1 change: 1 addition & 0 deletions azure-mgmt-reservations/azure/mgmt/reservations/models/azure_reservation_api_enums.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ class ReservedResourceType(str, Enum):
sql_databases = "SqlDatabases"
suse_linux = "SuseLinux"
cosmos_db = "CosmosDb"
red_hat = "RedHat"


class InstanceFlexibility(str, Enum):
Expand Down
2 changes: 1 addition & 1 deletion azure-mgmt-reservations/azure/mgmt/reservations/models/reservation_properties.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class ReservationProperties(Model):
sending a request.

:param reserved_resource_type: Possible values include: 'VirtualMachines',
'SqlDatabases', 'SuseLinux', 'CosmosDb'
'SqlDatabases', 'SuseLinux', 'CosmosDb', 'RedHat'
:type reserved_resource_type: str or
~azure.mgmt.reservations.models.ReservedResourceType
:param instance_flexibility: Possible values include: 'On', 'Off',
Expand Down
2 changes: 1 addition & 1 deletion azure-mgmt-reservations/azure/mgmt/reservations/models/reservation_properties_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class ReservationProperties(Model):
sending a request.

:param reserved_resource_type: Possible values include: 'VirtualMachines',
'SqlDatabases', 'SuseLinux', 'CosmosDb'
'SqlDatabases', 'SuseLinux', 'CosmosDb', 'RedHat'
:type reserved_resource_type: str or
~azure.mgmt.reservations.models.ReservedResourceType
:param instance_flexibility: Possible values include: 'On', 'Off',
Expand Down
2 changes: 1 addition & 1 deletion azure-mgmt-reservations/azure/mgmt/reservations/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
# regenerated.
# --------------------------------------------------------------------------

VERSION = "0.3.0"
VERSION = "0.3.2"

54 changes: 0 additions & 54 deletions azure-mgmt-reservations/azure_bdist_wheel.py
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion azure-mgmt-reservations/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-reservations/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-reservations"
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'],
}
)