Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion azure-mgmt-datalake-analytics/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
include *.rst
include azure_bdist_wheel.py
2 changes: 1 addition & 1 deletion azure-mgmt-datalake-analytics/azure/__init__.py
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-datalake-analytics/azure/mgmt/__init__.py
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__)
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__)
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ class JobState(str, Enum):
starting = "Starting"
paused = "Paused"
waiting_for_capacity = "WaitingForCapacity"
yielded = "Yielded"
finalizing = "Finalizing"


class JobResult(str, Enum):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class JobInformation(JobInformationBasic):
:ivar state: The job state. When the job is in the Ended state, refer to
Result and ErrorMessage for details. Possible values include: 'Accepted',
'Compiling', 'Ended', 'New', 'Queued', 'Running', 'Scheduling',
'Starting', 'Paused', 'WaitingForCapacity'
'Starting', 'Paused', 'WaitingForCapacity', 'Yielded', 'Finalizing'
:vartype state: str or ~azure.mgmt.datalake.analytics.job.models.JobState
:ivar result: The result of job execution or the current result of the
running job. Possible values include: 'None', 'Succeeded', 'Cancelled',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class JobInformationBasic(Model):
:ivar state: The job state. When the job is in the Ended state, refer to
Result and ErrorMessage for details. Possible values include: 'Accepted',
'Compiling', 'Ended', 'New', 'Queued', 'Running', 'Scheduling',
'Starting', 'Paused', 'WaitingForCapacity'
'Starting', 'Paused', 'WaitingForCapacity', 'Yielded', 'Finalizing'
:vartype state: str or ~azure.mgmt.datalake.analytics.job.models.JobState
:ivar result: The result of job execution or the current result of the
running job. Possible values include: 'None', 'Succeeded', 'Cancelled',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class JobInformationBasic(Model):
:ivar state: The job state. When the job is in the Ended state, refer to
Result and ErrorMessage for details. Possible values include: 'Accepted',
'Compiling', 'Ended', 'New', 'Queued', 'Running', 'Scheduling',
'Starting', 'Paused', 'WaitingForCapacity'
'Starting', 'Paused', 'WaitingForCapacity', 'Yielded', 'Finalizing'
:vartype state: str or ~azure.mgmt.datalake.analytics.job.models.JobState
:ivar result: The result of job execution or the current result of the
running job. Possible values include: 'None', 'Succeeded', 'Cancelled',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class JobInformation(JobInformationBasic):
:ivar state: The job state. When the job is in the Ended state, refer to
Result and ErrorMessage for details. Possible values include: 'Accepted',
'Compiling', 'Ended', 'New', 'Queued', 'Running', 'Scheduling',
'Starting', 'Paused', 'WaitingForCapacity'
'Starting', 'Paused', 'WaitingForCapacity', 'Yielded', 'Finalizing'
:vartype state: str or ~azure.mgmt.datalake.analytics.job.models.JobState
:ivar result: The result of job execution or the current result of the
running job. Possible values include: 'None', 'Succeeded', 'Cancelled',
Expand Down
54 changes: 0 additions & 54 deletions azure-mgmt-datalake-analytics/azure_bdist_wheel.py

This file was deleted.

1 change: 0 additions & 1 deletion azure-mgmt-datalake-analytics/setup.cfg
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
[bdist_wheel]
universal=1
azure-namespace-package=azure-mgmt-datalake-nspkg
18 changes: 10 additions & 8 deletions azure-mgmt-datalake-analytics/setup.py
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-datalake-analytics"
Expand Down Expand Up @@ -76,11 +70,19 @@
'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',
'azure.mgmt.datalake',
]),
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-datalake-nspkg'],
}
)