diff --git a/doc/sphinx/ref/azure.cosmos.auth.rst b/doc/sphinx/ref/azure.cosmos.auth.rst deleted file mode 100644 index 5b51703e86b3..000000000000 --- a/doc/sphinx/ref/azure.cosmos.auth.rst +++ /dev/null @@ -1,7 +0,0 @@ -azure.cosmos.auth module -======================== - -.. automodule:: azure.cosmos.auth - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/sphinx/ref/azure.cosmos.container.rst b/doc/sphinx/ref/azure.cosmos.container.rst deleted file mode 100644 index 4bdd4a3f664d..000000000000 --- a/doc/sphinx/ref/azure.cosmos.container.rst +++ /dev/null @@ -1,7 +0,0 @@ -azure.cosmos.container module -============================= - -.. automodule:: azure.cosmos.container - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/sphinx/ref/azure.cosmos.cosmos_client.rst b/doc/sphinx/ref/azure.cosmos.cosmos_client.rst deleted file mode 100644 index 6e3d7e333c4c..000000000000 --- a/doc/sphinx/ref/azure.cosmos.cosmos_client.rst +++ /dev/null @@ -1,7 +0,0 @@ -azure.cosmos.cosmos\_client module -================================== - -.. automodule:: azure.cosmos.cosmos_client - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/sphinx/ref/azure.cosmos.database.rst b/doc/sphinx/ref/azure.cosmos.database.rst deleted file mode 100644 index f76ecaa24b69..000000000000 --- a/doc/sphinx/ref/azure.cosmos.database.rst +++ /dev/null @@ -1,7 +0,0 @@ -azure.cosmos.database module -============================ - -.. automodule:: azure.cosmos.database - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/sphinx/ref/azure.cosmos.documents.rst b/doc/sphinx/ref/azure.cosmos.documents.rst deleted file mode 100644 index 0f0258fe9784..000000000000 --- a/doc/sphinx/ref/azure.cosmos.documents.rst +++ /dev/null @@ -1,7 +0,0 @@ -azure.cosmos.documents module -============================= - -.. automodule:: azure.cosmos.documents - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/sphinx/ref/azure.cosmos.offer.rst b/doc/sphinx/ref/azure.cosmos.offer.rst deleted file mode 100644 index 4cd12bfda7a1..000000000000 --- a/doc/sphinx/ref/azure.cosmos.offer.rst +++ /dev/null @@ -1,7 +0,0 @@ -azure.cosmos.offer module -========================= - -.. automodule:: azure.cosmos.offer - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/sphinx/ref/azure.cosmos.partition_key.rst b/doc/sphinx/ref/azure.cosmos.partition_key.rst deleted file mode 100644 index 4ba3b919078a..000000000000 --- a/doc/sphinx/ref/azure.cosmos.partition_key.rst +++ /dev/null @@ -1,7 +0,0 @@ -azure.cosmos.partition\_key module -================================== - -.. automodule:: azure.cosmos.partition_key - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/sphinx/ref/azure.cosmos.permission.rst b/doc/sphinx/ref/azure.cosmos.permission.rst deleted file mode 100644 index e3d4b968a4f1..000000000000 --- a/doc/sphinx/ref/azure.cosmos.permission.rst +++ /dev/null @@ -1,7 +0,0 @@ -azure.cosmos.permission module -============================== - -.. automodule:: azure.cosmos.permission - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/sphinx/ref/azure.cosmos.rst b/doc/sphinx/ref/azure.cosmos.rst index 223c5d09b63e..1a00e80192dc 100644 --- a/doc/sphinx/ref/azure.cosmos.rst +++ b/doc/sphinx/ref/azure.cosmos.rst @@ -6,19 +6,9 @@ Submodules .. toctree:: - azure.cosmos.auth - azure.cosmos.container - azure.cosmos.cosmos_client - azure.cosmos.database azure.cosmos.diagnostics - azure.cosmos.documents azure.cosmos.errors azure.cosmos.http_constants - azure.cosmos.offer - azure.cosmos.partition_key - azure.cosmos.permission - azure.cosmos.scripts - azure.cosmos.user Module contents --------------- diff --git a/doc/sphinx/ref/azure.cosmos.scripts.rst b/doc/sphinx/ref/azure.cosmos.scripts.rst deleted file mode 100644 index 7b2b9bdd80cb..000000000000 --- a/doc/sphinx/ref/azure.cosmos.scripts.rst +++ /dev/null @@ -1,7 +0,0 @@ -azure.cosmos.scripts module -=========================== - -.. automodule:: azure.cosmos.scripts - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/sphinx/ref/azure.cosmos.user.rst b/doc/sphinx/ref/azure.cosmos.user.rst deleted file mode 100644 index 1d4b665562fc..000000000000 --- a/doc/sphinx/ref/azure.cosmos.user.rst +++ /dev/null @@ -1,7 +0,0 @@ -azure.cosmos.user module -======================== - -.. automodule:: azure.cosmos.user - :members: - :undoc-members: - :show-inheritance: diff --git a/sdk/cosmos/azure-cosmos/MANIFEST.in b/sdk/cosmos/azure-cosmos/MANIFEST.in index d9252e22d644..e17b88ae2710 100644 --- a/sdk/cosmos/azure-cosmos/MANIFEST.in +++ b/sdk/cosmos/azure-cosmos/MANIFEST.in @@ -2,8 +2,5 @@ include README.md include HISTORY.md include LICENSE.txt include azure/__init__.py -recursive-include doc *.bat -recursive-include doc *.py -recursive-include doc *.rst -recursive-include doc Makefile +include samples/examples.py recursive-include test *.py \ No newline at end of file diff --git a/sdk/cosmos/azure-cosmos/README.md b/sdk/cosmos/azure-cosmos/README.md index 271f0a378191..bfb8b304d3e4 100644 --- a/sdk/cosmos/azure-cosmos/README.md +++ b/sdk/cosmos/azure-cosmos/README.md @@ -63,7 +63,7 @@ export ACCOUNT_KEY=$(az cosmosdb list-keys --resource-group $RES_GROUP --name $A Once you've populated the `ACCOUNT_URI` and `ACCOUNT_KEY` environment variables, you can create the [CosmosClient][ref_cosmosclient]. ```Python -from azure.cosmos import CosmosClient, Container, Database, PartitionKey, errors +from azure.cosmos import CosmosClient, PartitionKey, errors import os url = os.environ['ACCOUNT_URI'] @@ -271,14 +271,14 @@ For more extensive documentation on the Cosmos DB service, see the [Azure Cosmos [cosmos_sql_queries]: https://docs.microsoft.com/azure/cosmos-db/how-to-sql-query [cosmos_ttl]: https://docs.microsoft.com/azure/cosmos-db/time-to-live [python]: https://www.python.org/downloads/ -[ref_container_delete_item]: https://azure.github.io/azure-sdk-for-python/ref/azure.cosmos.container.html#azure.cosmos.container.ContainerProxy.delete_item -[ref_container_query_items]: https://azure.github.io/azure-sdk-for-python/ref/azure.cosmos.container.html#azure.cosmos.container.ContainerProxy.query_items -[ref_container_upsert_item]: https://azure.github.io/azure-sdk-for-python/ref/azure.cosmos.container.html#azure.cosmos.container.ContainerProxy.upsert_item -[ref_container]: https://azure.github.io/azure-sdk-for-python/ref/azure.cosmos.container.html +[ref_container_delete_item]: https://azure.github.io/azure-sdk-for-python/ref/azure.cosmos.html#azure.cosmos.ContainerProxy.delete_item +[ref_container_query_items]: https://azure.github.io/azure-sdk-for-python/ref/azure.cosmos.html#azure.cosmos.ContainerProxy.query_items +[ref_container_upsert_item]: https://azure.github.io/azure-sdk-for-python/ref/azure.cosmos.html#azure.cosmos.ContainerProxy.upsert_item +[ref_container]: https://azure.github.io/azure-sdk-for-python/ref/azure.cosmos.html#azure.cosmos.ContainerProxy [ref_cosmos_sdk]: https://azure.github.io/azure-sdk-for-python/ref/azure.cosmos.html -[ref_cosmosclient_create_database]: https://azure.github.io/azure-sdk-for-python/ref/azure.cosmos.cosmos_client.html#azure.cosmos.cosmos_client.CosmosClient.create_database -[ref_cosmosclient]: https://azure.github.io/azure-sdk-for-python/ref/azure.cosmos.cosmos_client.html -[ref_database]: https://azure.github.io/azure-sdk-for-python/ref/azure.cosmos.database.html +[ref_cosmosclient_create_database]: https://azure.github.io/azure-sdk-for-python/ref/azure.cosmos.html#azure.cosmos.CosmosClient.create_database +[ref_cosmosclient]: https://azure.github.io/azure-sdk-for-python/ref/azure.cosmos.html#azure.cosmos.CosmosClient +[ref_database]: https://azure.github.io/azure-sdk-for-python/ref/azure.cosmos.html#azure.cosmos.DatabaseProxy [ref_httpfailure]: https://azure.github.io/azure-sdk-for-python/ref/azure.cosmos.errors.html#azure.cosmos.errors.CosmosHttpResponseError [sample_database_mgmt]: https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/cosmos/azure-cosmos/samples/DatabaseManagement [sample_document_mgmt]: https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/cosmos/azure-cosmos/samples/DocumentManagement diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/__init__.py b/sdk/cosmos/azure-cosmos/azure/cosmos/__init__.py index 91182d089e7b..1f73d170e3c4 100644 --- a/sdk/cosmos/azure-cosmos/azure/cosmos/__init__.py +++ b/sdk/cosmos/azure-cosmos/azure/cosmos/__init__.py @@ -25,6 +25,7 @@ from .database import DatabaseProxy from .user import UserProxy from .scripts import ScriptsProxy +from .offer import Offer from .documents import ( ConsistencyLevel, DataType, @@ -35,6 +36,7 @@ SSLConfiguration, TriggerOperation, TriggerType, + DatabaseAccount, ) from .partition_key import PartitionKey from .permission import Permission @@ -48,6 +50,8 @@ "Permission", "ScriptsProxy", "UserProxy", + "Offer", + "DatabaseAccount", "ConsistencyLevel", "DataType", "IndexKind", diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/_cosmos_client_connection.py b/sdk/cosmos/azure-cosmos/azure/cosmos/_cosmos_client_connection.py index de0eeb4ed394..52e3bd3cf5ff 100644 --- a/sdk/cosmos/azure-cosmos/azure/cosmos/_cosmos_client_connection.py +++ b/sdk/cosmos/azure-cosmos/azure/cosmos/_cosmos_client_connection.py @@ -36,8 +36,8 @@ UserAgentPolicy, NetworkTraceLoggingPolicy, CustomHookPolicy, + DistributedTracingPolicy, ProxyPolicy) -from azure.core.pipeline.policies.distributed_tracing import DistributedTracingPolicy # type: ignore from . import _base as base from . import documents diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/_retry_utility.py b/sdk/cosmos/azure-cosmos/azure/cosmos/_retry_utility.py index 20362d09aa32..ef67a7b69fbd 100644 --- a/sdk/cosmos/azure-cosmos/azure/cosmos/_retry_utility.py +++ b/sdk/cosmos/azure-cosmos/azure/cosmos/_retry_utility.py @@ -160,9 +160,9 @@ def send(self, request): :type request: ~azure.core.pipeline.PipelineRequest :return: Returns the PipelineResponse or raises error if maximum retries exceeded. :rtype: ~azure.core.pipeline.PipelineResponse - :raises: ~azure.core.exceptions.AzureError if maximum retries exceeded. - :raises: ~azure.cosmos.CosmosClientTimeoutError if specified timeout exceeded. - :raises: ~azure.core.exceptions.ClientAuthenticationError if authentication + :raises ~azure.core.exceptions.AzureError: Maximum retries exceeded. + :raises ~azure.cosmos.errors.CosmosClientTimeoutError: Specified timeout exceeded. + :raises ~azure.core.exceptions.ClientAuthenticationError: Authentication failed. """ absolute_timeout = request.context.options.pop('timeout', None) per_request_timeout = request.context.options.pop('connection_timeout', 0) diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/container.py b/sdk/cosmos/azure-cosmos/azure/cosmos/container.py index 5e03290cfde3..73441d19f5ab 100644 --- a/sdk/cosmos/azure-cosmos/azure/cosmos/container.py +++ b/sdk/cosmos/azure-cosmos/azure/cosmos/container.py @@ -127,8 +127,8 @@ def read( :param populate_quota_info: Enable returning collection storage quota information in response headers. :param request_options: Dictionary of additional properties to be used for the request. :param response_hook: a callable invoked with the response metadata - :raise `CosmosHttpResponseError`: Raised if the container couldn't be retrieved. This includes - if the container does not exist. + :raises ~azure.cosmos.errors.CosmosHttpResponseError: Raised if the container couldn't be retrieved. + This includes if the container does not exist. :returns: Dict representing the retrieved container. :rtype: dict[str, Any] """ @@ -173,12 +173,12 @@ def read_item( :param request_options: Dictionary of additional properties to be used for the request. :param response_hook: a callable invoked with the response metadata :returns: Dict representing the item to be retrieved. - :raise `CosmosHttpResponseError`: If the given item couldn't be retrieved. + :raises ~azure.cosmos.errors.CosmosHttpResponseError: The given item couldn't be retrieved. :rtype: dict[str, Any] .. admonition:: Example: - .. literalinclude:: ../../samples/examples.py + .. literalinclude:: ../samples/examples.py :start-after: [START update_item] :end-before: [END update_item] :language: python @@ -323,7 +323,7 @@ def query_items( .. admonition:: Example: - .. literalinclude:: ../../samples/examples.py + .. literalinclude:: ../samples/examples.py :start-after: [START query_items] :end-before: [END query_items] :language: python @@ -331,7 +331,7 @@ def query_items( :caption: Get all products that have not been discontinued: :name: query_items - .. literalinclude:: ../../samples/examples.py + .. literalinclude:: ../samples/examples.py :start-after: [START query_items_param] :end-before: [END query_items_param] :language: python @@ -392,7 +392,8 @@ def replace_item( :param request_options: Dictionary of additional properties to be used for the request. :param response_hook: a callable invoked with the response metadata :returns: A dict representing the item after replace went through. - :raise `CosmosHttpResponseError`: If the replace failed or the item with given id does not exist. + :raises ~azure.cosmos.errors.CosmosHttpResponseError: The replace failed or the item with + given id does not exist. :rtype: dict[str, Any] """ item_link = self._get_document_link(item) @@ -437,7 +438,7 @@ def upsert_item( :param request_options: Dictionary of additional properties to be used for the request. :param response_hook: a callable invoked with the response metadata :returns: A dict representing the upserted item. - :raise `CosmosHttpResponseError`: If the given item could not be upserted. + :raises ~azure.cosmos.errors.CosmosHttpResponseError: The given item could not be upserted. :rtype: dict[str, Any] """ request_options = build_options(kwargs) @@ -482,7 +483,7 @@ def create_item( :param request_options: Dictionary of additional properties to be used for the request. :param response_hook: a callable invoked with the response metadata :returns: A dict representing the new item. - :raises `CosmosHttpResponseError`: If item with the given ID already exists. + :raises ~azure.cosmos.errors.CosmosHttpResponseError: Item with the given ID already exists. :rtype: dict[str, Any] """ request_options = build_options(kwargs) @@ -529,8 +530,8 @@ def delete_item( :param post_trigger_include: trigger id to be used as post operation trigger. :param request_options: Dictionary of additional properties to be used for the request. :param response_hook: a callable invoked with the response metadata - :raises `CosmosHttpResponseError`: The item wasn't deleted successfully. If the item does not - exist in the container, a `404` error is returned. + :raises ~azure.cosmos.errors.CosmosHttpResponseError: The item wasn't deleted successfully. + :raises ~azure.cosmos.errors.CosmosResourceNotFoundError: The item does not exist in the container. :rtype: None """ request_options = build_options(kwargs) @@ -557,8 +558,9 @@ def read_offer(self, **kwargs): :param response_hook: a callable invoked with the response metadata :returns: Offer for the container. - :raise CosmosHttpResponseError: If no offer exists for the container or if the offer could not be retrieved. - :rtype: ~azure.cosmos.offer.Offer + :raises ~azure.cosmos.errors.CosmosHttpResponseError: No offer exists for the container or + the offer could not be retrieved. + :rtype: ~azure.cosmos.Offer """ response_hook = kwargs.pop('response_hook', None) properties = self._get_properties() @@ -587,8 +589,9 @@ def replace_throughput(self, throughput, **kwargs): :param throughput: The throughput to be set (an integer). :param response_hook: a callable invoked with the response metadata :returns: Offer for the container, updated with new throughput. - :raise CosmosHttpResponseError: If no offer exists for the container or if the offer could not be updated. - :rtype: ~azure.cosmos.offer.Offer + :raises ~azure.cosmos.errors.CosmosHttpResponseError: No offer exists for the container + or the offer could not be updated. + :rtype: ~azure.cosmos.Offer """ response_hook = kwargs.pop('response_hook', None) properties = self._get_properties() @@ -691,7 +694,7 @@ def get_conflict(self, conflict, partition_key, **kwargs): :param request_options: Dictionary of additional properties to be used for the request. :param response_hook: a callable invoked with the response metadata :returns: A dict representing the retrieved conflict. - :raise `CosmosHttpResponseError`: If the given conflict couldn't be retrieved. + :raises ~azure.cosmos.errors.CosmosHttpResponseError: The given conflict couldn't be retrieved. :rtype: dict[str, Any] """ request_options = build_options(kwargs) @@ -716,8 +719,8 @@ def delete_conflict(self, conflict, partition_key, **kwargs): :param partition_key: Partition key for the conflict to delete. :param request_options: Dictionary of additional properties to be used for the request. :param response_hook: a callable invoked with the response metadata - :raises `CosmosHttpResponseError`: The conflict wasn't deleted successfully. If the conflict - does not exist in the container, a `404` error is returned. + :raises ~azure.cosmos.errors.CosmosHttpResponseError: The conflict wasn't deleted successfully. + :raises ~azure.cosmos.errors.CosmosResourceNotFoundError: The conflict does not exist in the container. :rtype: None """ request_options = build_options(kwargs) diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/cosmos_client.py b/sdk/cosmos/azure-cosmos/azure/cosmos/cosmos_client.py index 82ff11459b3c..c7065f8f8e5b 100644 --- a/sdk/cosmos/azure-cosmos/azure/cosmos/cosmos_client.py +++ b/sdk/cosmos/azure-cosmos/azure/cosmos/cosmos_client.py @@ -128,7 +128,7 @@ class CosmosClient(object): :param str url: The URL of the Cosmos DB account. :param credential: Can be the account key, or a dictionary of resource tokens. - :type credential: str or dict(str, str) + :type credential: str or dict[str, str] :param str consistency_level: Consistency level to use for the session. The default value is "Session". @@ -144,9 +144,9 @@ class CosmosClient(object): *media_read_mode* - The mode for use with downloading attachment content - default value is `Buffered`. - *proxy_config* - Instance of ~azure.cosmos.documents.ProxyConfiguration. + *proxy_config* - Instance of `azure.cosmos.ProxyConfiguration`. - *ssl_config* - Instance of ~azure.cosmos.documents.SSLConfiguration. + *ssl_config* - Instance of `azure.cosmos.SSLConfiguration`. *connection_verify* - Whether to verify the connection, default value is True. @@ -171,17 +171,12 @@ class CosmosClient(object): *enable_endpoint_discovery* - Enable endpoint discovery for geo-replicated database accounts. Default is True. *preferred_locations* - The preferred locations for geo-replicated database accounts. - When `enable_endpoint_discovery` is true and `preferred_locations` is non-empty, - the client will use this list to evaluate the final location, taking into consideration - the order specified in `preferred_locations` list. The locations in this list are specified - as the names of the azure Cosmos locations like, 'West US', 'East US', 'Central India' - and so on. - *connection_policy* - An instance of ~azure.cosmos.documents.ConnectionPolicy + *connection_policy* - An instance of `azure.cosmos.documents.ConnectionPolicy` .. admonition:: Example: - .. literalinclude:: ../../samples/examples.py + .. literalinclude:: ../samples/examples.py :start-after: [START create_client] :end-before: [END create_client] :language: python @@ -255,19 +250,22 @@ def create_database( # pylint: disable=redefined-builtin :param id: ID (name) of the database to create. :param str session_token: Token for use with Session consistency. - :param dict(str, str) initial_headers: Initial headers to be sent as part of the request. - :param dict(str, str) access_condition: Conditions Associated with the request. + :param initial_headers: Initial headers to be sent as part of the request. + :type initial_headers: dict[str, str] + :param access_condition: Conditions Associated with the request. + :type access_condition: dict[str, str] :param bool populate_query_metrics: Enable returning query metrics in response headers. :param int offer_throughput: The provisioned throughput for this offer. - :param dict(str, Any) request_options: Dictionary of additional properties to be used for the request. + :param request_options: Dictionary of additional properties to be used for the request. + :type request_options: dict[str, Any] :param Callable response_hook: a callable invoked with the response metadata :returns: A DatabaseProxy instance representing the new database. - :rtype: ~azure.cosmos.database.DatabaseProxy - :raises `CosmosResourceExistsError`: If database with the given ID already exists. + :rtype: ~azure.cosmos.DatabaseProxy + :raises ~azure.cosmos.errors.CosmosResourceExistsError: Database with the given ID already exists. .. admonition:: Example: - .. literalinclude:: ../../samples/examples.py + .. literalinclude:: ../samples/examples.py :start-after: [START create_database] :end-before: [END create_database] :language: python @@ -306,15 +304,18 @@ def create_database_if_not_exists( # pylint: disable=redefined-builtin :param id: ID (name) of the database to read or create. :param str session_token: Token for use with Session consistency. - :param dict(str, str) initial_headers: Initial headers to be sent as part of the request. - :param dict(str, str) access_condition: Conditions Associated with the request. + :param initial_headers: Initial headers to be sent as part of the request. + :type initial_headers: dict[str, str] + :param access_condition: Conditions Associated with the request. + :type access_condition: dict[str, str] :param bool populate_query_metrics: Enable returning query metrics in response headers. :param int offer_throughput: The provisioned throughput for this offer. - :param dict(str, Any) request_options: Dictionary of additional properties to be used for the request. + :param request_options: Dictionary of additional properties to be used for the request. + :type request_options: dict[str, Any] :param Callable response_hook: a callable invoked with the response metadata :returns: A DatabaseProxy instance representing the database. - :rtype: ~azure.cosmos.database.DatabaseProxy - :raise CosmosHttpResponseError: The database read or creation failed. + :rtype: ~azure.cosmos.DatabaseProxy + :raises ~azure.cosmos.errors.CosmosHttpResponseError: The database read or creation failed. """ try: database_proxy = self.get_database_client(id) @@ -338,9 +339,9 @@ def get_database_client(self, database): :param database: The ID (name), dict representing the properties or `DatabaseProxy` instance of the database to read. - :type database: str or dict(str, str) or ~azure.cosmos.database.DatabaseProxy + :type database: str or dict(str, str) or ~azure.cosmos.DatabaseProxy :returns: A `DatabaseProxy` instance representing the retrieved database. - :rtype: ~azure.cosmos.database.DatabaseProxy + :rtype: ~azure.cosmos.DatabaseProxy """ if isinstance(database, DatabaseProxy): id_value = database.id @@ -364,9 +365,11 @@ def list_databases( :param int max_item_count: Max number of items to be returned in the enumeration operation. :param str session_token: Token for use with Session consistency. - :param dict(str, str) initial_headers: Initial headers to be sent as part of the request. + :param initial_headers: Initial headers to be sent as part of the request. + :type initial_headers: dict[str, str] :param bool populate_query_metrics: Enable returning query metrics in response headers. - :param dict(str, str) feed_options: Dictionary of additional properties to be used for the request. + :param feed_options: Dictionary of additional properties to be used for the request. + :type feed_options: dict[str, str] :param Callable response_hook: a callable invoked with the response metadata :returns: An Iterable of database properties (dicts). :rtype: Iterable[dict[str, str]] @@ -403,9 +406,11 @@ def query_databases( served as indexing was opted out on the requested paths. :param int max_item_count: Max number of items to be returned in the enumeration operation. :param str session_token: Token for use with Session consistency. - :param dict[str, str] initial_headers: Initial headers to be sent as part of the request. + :param initial_headers: Initial headers to be sent as part of the request. + :type initial_headers: dict[str, str] :param bool populate_query_metrics: Enable returning query metrics in response headers. - :param dict[str, Any] feed_options: Dictionary of additional properties to be used for the request. + :param feed_options: Dictionary of additional properties to be used for the request. + :type feed_options: dict[str, Any] :param Callable response_hook: a callable invoked with the response metadata :returns: An Iterable of database properties (dicts). :rtype: Iterable[dict[str, str]] @@ -446,14 +451,17 @@ def delete_database( :param database: The ID (name), dict representing the properties or :class:`DatabaseProxy` instance of the database to delete. - :type database: str or dict(str, str) or ~azure.cosmos.database.DatabaseProxy + :type database: str or dict(str, str) or ~azure.cosmos.DatabaseProxy :param str session_token: Token for use with Session consistency. - :param dict[str, str] initial_headers: Initial headers to be sent as part of the request. - :param dict[str, str] access_condition: Conditions Associated with the request. + :param initial_headers: Initial headers to be sent as part of the request. + :type initial_headers: dict[str, str] + :param access_condition: Conditions Associated with the request. + :type access_condition: dict[str, str] :param bool populate_query_metrics: Enable returning query metrics in response headers. - :param dict[str, str] request_options: Dictionary of additional properties to be used for the request. + :param request_options: Dictionary of additional properties to be used for the request. + :type request_options: dict[str, Any] :param Callable response_hook: a callable invoked with the response metadata - :raise CosmosHttpResponseError: If the database couldn't be deleted. + :raises ~azure.cosmos.errors.CosmosHttpResponseError: If the database couldn't be deleted. :rtype: None """ request_options = build_options(kwargs) @@ -474,7 +482,7 @@ def get_database_account(self, **kwargs): :param Callable response_hook: a callable invoked with the response metadata :returns: A `DatabaseAccount` instance representing the Cosmos DB Database Account. - :rtype: ~azure.cosmos.documents.DatabaseAccount + :rtype: ~azure.cosmos.DatabaseAccount """ response_hook = kwargs.pop('response_hook', None) result = self.client_connection.GetDatabaseAccount(**kwargs) diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/database.py b/sdk/cosmos/azure-cosmos/azure/cosmos/database.py index c7c70945579b..cc5067d003db 100644 --- a/sdk/cosmos/azure-cosmos/azure/cosmos/database.py +++ b/sdk/cosmos/azure-cosmos/azure/cosmos/database.py @@ -121,7 +121,7 @@ def read(self, populate_query_metrics=None, **kwargs): :param request_options: Dictionary of additional properties to be used for the request. :param response_hook: a callable invoked with the response metadata :rtype: Dict[Str, Any] - :raise `CosmosHttpResponseError`: If the given database couldn't be retrieved. + :raises ~azure.cosmos.errors.CosmosHttpResponseError: If the given database couldn't be retrieved. """ # TODO this helper function should be extracted from CosmosClient from .cosmos_client import CosmosClient @@ -174,12 +174,12 @@ def create_container( :param request_options: Dictionary of additional properties to be used for the request. :param response_hook: a callable invoked with the response metadata :returns: A `ContainerProxy` instance representing the new container. - :raise CosmosHttpResponseError: The container creation failed. - :rtype: ~azure.cosmos.container.ContainerProxy + :raises ~azure.cosmos.errors.CosmosHttpResponseError: The container creation failed. + :rtype: ~azure.cosmos.ContainerProxy .. admonition:: Example: - .. literalinclude:: ../../samples/examples.py + .. literalinclude:: ../samples/examples.py :start-after: [START create_container] :end-before: [END create_container] :language: python @@ -187,7 +187,7 @@ def create_container( :caption: Create a container with default settings: :name: create_container - .. literalinclude:: ../../samples/examples.py + .. literalinclude:: ../samples/examples.py :start-after: [START create_container_with_settings] :end-before: [END create_container_with_settings] :language: python @@ -258,8 +258,8 @@ def create_container_if_not_exists( :param request_options: Dictionary of additional properties to be used for the request. :param response_hook: a callable invoked with the response metadata :returns: A `ContainerProxy` instance representing the container. - :raise CosmosHttpResponseError: The container read or creation failed. - :rtype: ~azure.cosmos.container.ContainerProxy + :raises ~azure.cosmos.errors.CosmosHttpResponseError: The container read or creation failed. + :rtype: ~azure.cosmos.ContainerProxy """ try: @@ -301,7 +301,7 @@ def delete_container( :param populate_query_metrics: Enable returning query metrics in response headers. :param request_options: Dictionary of additional properties to be used for the request. :param response_hook: a callable invoked with the response metadata - :raise CosmosHttpResponseError: If the container couldn't be deleted. + :raises ~azure.cosmos.errors.CosmosHttpResponseError: If the container couldn't be deleted. :rtype: None """ request_options = build_options(kwargs) @@ -321,11 +321,11 @@ def get_container_client(self, container): :param container: The ID (name) of the container, a :class:`ContainerProxy` instance, or a dict representing the properties of the container to be retrieved. - :rtype: ~azure.cosmos.container.ContainerProxy + :rtype: ~azure.cosmos.ContainerProxy .. admonition:: Example: - .. literalinclude:: ../../samples/examples.py + .. literalinclude:: ../samples/examples.py :start-after: [START get_container] :end-before: [END get_container] :language: python @@ -359,7 +359,7 @@ def list_containers(self, max_item_count=None, populate_query_metrics=None, **kw .. admonition:: Example: - .. literalinclude:: ../../samples/examples.py + .. literalinclude:: ../samples/examples.py :start-after: [START list_containers] :end-before: [END list_containers] :language: python @@ -451,14 +451,14 @@ def replace_container( :param populate_query_metrics: Enable returning query metrics in response headers. :param request_options: Dictionary of additional properties to be used for the request. :param response_hook: a callable invoked with the response metadata - :raise `CosmosHttpResponseError`: Raised if the container couldn't be replaced. This includes - if the container with given id does not exist. + :raises ~azure.cosmos.errors.CosmosHttpResponseError: Raised if the container couldn't be replaced. + This includes if the container with given id does not exist. :returns: A `ContainerProxy` instance representing the container after replace completed. - :rtype: ~azure.cosmos.container.ContainerProxy + :rtype: ~azure.cosmos.ContainerProxy .. admonition:: Example: - .. literalinclude:: ../../samples/examples.py + .. literalinclude:: ../samples/examples.py :start-after: [START reset_container_properties] :end-before: [END reset_container_properties] :language: python @@ -557,8 +557,8 @@ def get_user_client(self, user): :param user: The ID (name), dict representing the properties or :class:`UserProxy` instance of the user to be retrieved. :returns: A `UserProxy` instance representing the retrieved user. - :raise `CosmosHttpResponseError`: If the given user couldn't be retrieved. - :rtype: ~azure.cosmos.user.UserProxy + :raises ~azure.cosmos.errors.CosmosHttpResponseError: If the given user couldn't be retrieved. + :rtype: ~azure.cosmos.UserProxy """ if isinstance(user, UserProxy): id_value = user.id @@ -577,16 +577,16 @@ def create_user(self, body, **kwargs): To update or replace an existing user, use the :func:`ContainerProxy.upsert_user` method. :param body: A dict-like object with an `id` key and value representing the user to be created. - The user ID must be unique within the database, and consist of no more than 255 characters. + The user ID must be unique within the database, and consist of no more than 255 characters. :param request_options: Dictionary of additional properties to be used for the request. :param response_hook: a callable invoked with the response metadata :returns: A `UserProxy` instance representing the new user. - :raise `CosmosHttpResponseError`: If the given user couldn't be created. - :rtype: ~azure.cosmos.user.UserProxy + :raises ~azure.cosmos.errors.CosmosHttpResponseError: If the given user couldn't be created. + :rtype: ~azure.cosmos.UserProxy .. admonition:: Example: - .. literalinclude:: ../../samples/examples.py + .. literalinclude:: ../samples/examples.py :start-after: [START create_user] :end-before: [END create_user] :language: python @@ -618,8 +618,8 @@ def upsert_user(self, body, **kwargs): :param request_options: Dictionary of additional properties to be used for the request. :param response_hook: a callable invoked with the response metadata :returns: A `UserProxy` instance representing the upserted user. - :raise `CosmosHttpResponseError`: If the given user could not be upserted. - :rtype: ~azure.cosmos.user.UserProxy + :raises ~azure.cosmos.errors.CosmosHttpResponseError: If the given user could not be upserted. + :rtype: ~azure.cosmos.UserProxy """ request_options = build_options(kwargs) response_hook = kwargs.pop('response_hook', None) @@ -652,8 +652,9 @@ def replace_user( :param request_options: Dictionary of additional properties to be used for the request. :param response_hook: a callable invoked with the response metadata :returns: A `UserProxy` instance representing the user after replace went through. - :raise `CosmosHttpResponseError`: If the replace failed or the user with given id does not exist. - :rtype: ~azure.cosmos.user.UserProxy + :raises ~azure.cosmos.errors.CosmosHttpResponseError: If the replace failed or the user with given + id does not exist. + :rtype: ~azure.cosmos.UserProxy """ request_options = build_options(kwargs) response_hook = kwargs.pop('response_hook', None) @@ -682,8 +683,8 @@ def delete_user(self, user, **kwargs): instance of the user to be deleted. :param request_options: Dictionary of additional properties to be used for the request. :param response_hook: a callable invoked with the response metadata - :raises `CosmosHttpResponseError`: The user wasn't deleted successfully. If the user does not - exist in the container, a `404` error is returned. + :raises ~azure.cosmos.errors.CosmosHttpResponseError: The user wasn't deleted successfully. + :raises ~azure.cosmos.errors.CosmosResourceNotFoundError: The user does not exist in the container. :rtype: None """ request_options = build_options(kwargs) @@ -703,8 +704,9 @@ def read_offer(self, **kwargs): :param response_hook: a callable invoked with the response metadata :returns: Offer for the database. - :raise CosmosHttpResponseError: If no offer exists for the database or if the offer could not be retrieved. - :rtype: ~azure.cosmos.offer.Offer + :raises ~azure.cosmos.errors.CosmosHttpResponseError: If no offer exists for the database or if the + offer could not be retrieved. + :rtype: ~azure.cosmos.Offer """ response_hook = kwargs.pop('response_hook', None) properties = self._get_properties() @@ -733,8 +735,9 @@ def replace_throughput(self, throughput, **kwargs): :param throughput: The throughput to be set (an integer). :param response_hook: a callable invoked with the response metadata :returns: Offer for the database, updated with new throughput. - :raise CosmosHttpResponseError: If no offer exists for the database or if the offer could not be updated. - :rtype: ~azure.cosmos.offer.Offer + :raises ~azure.cosmos.errors.CosmosHttpResponseError: If no offer exists for the database or if the + offer could not be updated. + :rtype: ~azure.cosmos.Offer """ response_hook = kwargs.pop('response_hook', None) properties = self._get_properties() diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/scripts.py b/sdk/cosmos/azure-cosmos/azure/cosmos/scripts.py index d7208f918c4c..8cb9e95d3b82 100644 --- a/sdk/cosmos/azure-cosmos/azure/cosmos/scripts.py +++ b/sdk/cosmos/azure-cosmos/azure/cosmos/scripts.py @@ -107,7 +107,7 @@ def get_stored_procedure(self, sproc, **kwargs): :param sproc: The ID (name) or dict representing stored procedure to retrieve. :param request_options: Dictionary of additional properties to be used for the request. :returns: A dict representing the retrieved stored procedure. - :raise `CosmosHttpResponseError`: If the given stored procedure couldn't be retrieved. + :raises ~azure.cosmos.errors.CosmosHttpResponseError: If the given stored procedure couldn't be retrieved. :rtype: dict[str, Any] """ request_options = build_options(kwargs) @@ -125,7 +125,7 @@ def create_stored_procedure(self, body, **kwargs): :param body: A dict-like object representing the sproc to create. :param request_options: Dictionary of additional properties to be used for the request. :returns: A dict representing the new stored procedure. - :raise `CosmosHttpResponseError`: If the given stored procedure couldn't be created. + :raises ~azure.cosmos.errors.CosmosHttpResponseError: If the given stored procedure couldn't be created. :rtype: dict[str, Any] """ request_options = build_options(kwargs) @@ -143,7 +143,8 @@ def replace_stored_procedure(self, sproc, body, **kwargs): :param body: A dict-like object representing the sproc to replace. :param request_options: Dictionary of additional properties to be used for the request. :returns: A dict representing the stored procedure after replace went through. - :raise `CosmosHttpResponseError`: If the replace failed or the stored procedure with given id does not exist. + :raises ~azure.cosmos.errors.CosmosHttpResponseError: If the replace failed or the stored + procedure with given id does not exist. :rtype: dict[str, Any] """ request_options = build_options(kwargs) @@ -162,8 +163,8 @@ def delete_stored_procedure(self, sproc, **kwargs): :param sproc: The ID (name) or dict representing stored procedure to be deleted. :param request_options: Dictionary of additional properties to be used for the request. - :raises `CosmosHttpResponseError`: The sproc wasn't deleted successfully. If the sproc does not - exist in the container, a `404` error is returned. + :raises ~azure.cosmos.errors.CosmosHttpResponseError: The sproc wasn't deleted successfully. + :raises ~azure.cosmos.errors.CosmosResourceNotFoundError: The sproc does not exist in the container. :rtype: None """ request_options = build_options(kwargs) @@ -190,8 +191,8 @@ def execute_stored_procedure( :param partition_key: Specifies the partition key to indicate which partition the sproc should execute on. :param request_options: Dictionary of additional properties to be used for the request. :returns: Result of the executed stored procedure for the given parameters. - :raise `CosmosHttpResponseError`: If the stored procedure execution failed or if the stored procedure with - given id does not exists in the container. + :raises ~azure.cosmos.errors.CosmosHttpResponseError: If the stored procedure execution failed + or if the stored procedure with given id does not exists in the container. :rtype: dict[str, Any] """ @@ -261,7 +262,7 @@ def get_trigger(self, trigger, **kwargs): :param trigger: The ID (name) or dict representing trigger to retrieve. :param request_options: Dictionary of additional properties to be used for the request. :returns: A dict representing the retrieved trigger. - :raise `CosmosHttpResponseError`: If the given trigger couldn't be retrieved. + :raises ~azure.cosmos.errors.CosmosHttpResponseError: If the given trigger couldn't be retrieved. :rtype: dict[str, Any] """ request_options = build_options(kwargs) @@ -279,7 +280,7 @@ def create_trigger(self, body, **kwargs): :param body: A dict-like object representing the trigger to create. :param request_options: Dictionary of additional properties to be used for the request. :returns: A dict representing the new trigger. - :raise `CosmosHttpResponseError`: If the given trigger couldn't be created. + :raises ~azure.cosmos.errors.CosmosHttpResponseError: If the given trigger couldn't be created. :rtype: dict[str, Any] """ request_options = build_options(kwargs) @@ -297,7 +298,8 @@ def replace_trigger(self, trigger, body, **kwargs): :param body: A dict-like object representing the trigger to replace. :param request_options: Dictionary of additional properties to be used for the request. :returns: A dict representing the trigger after replace went through. - :raise `CosmosHttpResponseError`: If the replace failed or the trigger with given id does not exist. + :raises ~azure.cosmos.errors.CosmosHttpResponseError: If the replace failed or the trigger with given + id does not exist. :rtype: dict[str, Any] """ request_options = build_options(kwargs) @@ -316,8 +318,8 @@ def delete_trigger(self, trigger, **kwargs): :param trigger: The ID (name) or dict representing trigger to be deleted. :param request_options: Dictionary of additional properties to be used for the request. - :raises `CosmosHttpResponseError`: The trigger wasn't deleted successfully. If the trigger does not - exist in the container, a `404` error is returned. + :raises ~azure.cosmos.errors.CosmosHttpResponseError: The trigger wasn't deleted successfully. + :raises ~azure.cosmos.errors.CosmosResourceNotFoundError: The trigger does not exist in the container. :rtype: None """ request_options = build_options(kwargs) @@ -375,7 +377,7 @@ def get_user_defined_function(self, udf, **kwargs): :param udf: The ID (name) or dict representing udf to retrieve. :param request_options: Dictionary of additional properties to be used for the request. :returns: A dict representing the retrieved user defined function. - :raise `CosmosHttpResponseError`: If the given user defined function couldn't be retrieved. + :raises ~azure.cosmos.errors.CosmosHttpResponseError: If the given user defined function couldn't be retrieved. :rtype: Iterable[dict[str, Any]] """ request_options = build_options(kwargs) @@ -393,7 +395,7 @@ def create_user_defined_function(self, body, **kwargs): :param body: A dict-like object representing the udf to create. :param request_options: Dictionary of additional properties to be used for the request. :returns: A dict representing the new user defined function. - :raise `CosmosHttpResponseError`: If the given user defined function couldn't be created. + :raises ~azure.cosmos.errors.CosmosHttpResponseError: If the given user defined function couldn't be created. :rtype: dict[str, Any] """ request_options = build_options(kwargs) @@ -411,7 +413,7 @@ def replace_user_defined_function(self, udf, body, **kwargs): :param body: A dict-like object representing the udf to replace. :param request_options: Dictionary of additional properties to be used for the request. :returns: A dict representing the user defined function after replace went through. - :raise `CosmosHttpResponseError`: If the replace failed or the user defined function with + :raises ~azure.cosmos.errors.CosmosHttpResponseError: If the replace failed or the user defined function with given id does not exist. :rtype: dict[str, Any] """ @@ -431,8 +433,8 @@ def delete_user_defined_function(self, udf, **kwargs): :param udf: The ID (name) or dict representing udf to be deleted. :param request_options: Dictionary of additional properties to be used for the request. - :raises `CosmosHttpResponseError`: The udf wasn't deleted successfully. If the udf does not - exist in the container, a `404` error is returned. + :raises ~azure.cosmos.errors.CosmosHttpResponseError: The udf wasn't deleted successfully. + :raises ~azure.cosmos.errors.CosmosResourceNotFoundError: The UDF does not exist in the container. :rtype: None """ request_options = build_options(kwargs) diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/user.py b/sdk/cosmos/azure-cosmos/azure/cosmos/user.py index 9328548206b8..9352d6755582 100644 --- a/sdk/cosmos/azure-cosmos/azure/cosmos/user.py +++ b/sdk/cosmos/azure-cosmos/azure/cosmos/user.py @@ -72,7 +72,7 @@ def read(self, **kwargs): :param request_options: Dictionary of additional properties to be used for the request. :param response_hook: a callable invoked with the response metadata :returns: A :class:`UserProxy` instance representing the retrieved user. - :raise `CosmosHttpResponseError`: If the given user couldn't be retrieved. + :raises ~azure.cosmos.errors.CosmosHttpResponseError: If the given user couldn't be retrieved. :rtype: dict[str, Any] """ request_options = build_options(kwargs) @@ -157,7 +157,7 @@ def get_permission(self, permission, **kwargs): :param request_options: Dictionary of additional properties to be used for the request. :param response_hook: a callable invoked with the response metadata :returns: A dict representing the retrieved permission. - :raise `CosmosHttpResponseError`: If the given permission couldn't be retrieved. + :raises ~azure.cosmos.errors.CosmosHttpResponseError: If the given permission couldn't be retrieved. :rtype: dict[str, Any] """ request_options = build_options(kwargs) @@ -189,7 +189,7 @@ def create_permission(self, body, **kwargs): :param request_options: Dictionary of additional properties to be used for the request. :param response_hook: a callable invoked with the response metadata :returns: A dict representing the new permission. - :raise `CosmosHttpResponseError`: If the given permission couldn't be created. + :raises ~azure.cosmos.errors.CosmosHttpResponseError: If the given permission couldn't be created. :rtype: dict[str, Any] """ request_options = build_options(kwargs) @@ -221,7 +221,7 @@ def upsert_permission(self, body, **kwargs): :param request_options: Dictionary of additional properties to be used for the request. :param response_hook: a callable invoked with the response metadata :returns: A dict representing the upserted permission. - :raise `CosmosHttpResponseError`: If the given permission could not be upserted. + :raises ~azure.cosmos.errors.CosmosHttpResponseError: If the given permission could not be upserted. :rtype: dict[str, Any] """ request_options = build_options(kwargs) @@ -254,7 +254,8 @@ def replace_permission(self, permission, body, **kwargs): :param request_options: Dictionary of additional properties to be used for the request. :param response_hook: a callable invoked with the response metadata :returns: A dict representing the permission after replace went through. - :raise `CosmosHttpResponseError`: If the replace failed or the permission with given id does not exist. + :raises ~azure.cosmos.errors.CosmosHttpResponseError: If the replace failed or the permission + with given id does not exist. :rtype: dict[str, Any] """ request_options = build_options(kwargs) @@ -285,8 +286,8 @@ def delete_permission(self, permission, **kwargs): instance of the permission to be replaced. :param request_options: Dictionary of additional properties to be used for the request. :param response_hook: a callable invoked with the response metadata - :raises `CosmosHttpResponseError`: The permission wasn't deleted successfully. If the permission does - not exist for the user, a `404` error is returned. + :raises ~azure.cosmos.errors.CosmosHttpResponseError: The permission wasn't deleted successfully. + :raises ~azure.cosmos.errors.CosmosResourceNotFoundError: The permission does not exist for the user. :rtype: None """ request_options = build_options(kwargs) diff --git a/sdk/cosmos/azure-cosmos/doc/Makefile b/sdk/cosmos/azure-cosmos/doc/Makefile deleted file mode 100644 index f76148eb7e27..000000000000 --- a/sdk/cosmos/azure-cosmos/doc/Makefile +++ /dev/null @@ -1,177 +0,0 @@ -# Makefile for Sphinx documentation -# - -# You can set these variables from the command line. -SPHINXOPTS = -SPHINXBUILD = sphinx-build -PAPER = -BUILDDIR = _build - -# User-friendly check for sphinx-build -ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1) -$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/) -endif - -# Internal variables. -PAPEROPT_a4 = -D latex_paper_size=a4 -PAPEROPT_letter = -D latex_paper_size=letter -ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . -# the i18n builder cannot share the environment and doctrees with the others -I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . - -.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext - -help: - @echo "Please use \`make ' where is one of" - @echo " html to make standalone HTML files" - @echo " dirhtml to make HTML files named index.html in directories" - @echo " singlehtml to make a single large HTML file" - @echo " pickle to make pickle files" - @echo " json to make JSON files" - @echo " htmlhelp to make HTML files and a HTML help project" - @echo " qthelp to make HTML files and a qthelp project" - @echo " devhelp to make HTML files and a Devhelp project" - @echo " epub to make an epub" - @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" - @echo " latexpdf to make LaTeX files and run them through pdflatex" - @echo " latexpdfja to make LaTeX files and run them through platex/dvipdfmx" - @echo " text to make text files" - @echo " man to make manual pages" - @echo " texinfo to make Texinfo files" - @echo " info to make Texinfo files and run them through makeinfo" - @echo " gettext to make PO message catalogs" - @echo " changes to make an overview of all changed/added/deprecated items" - @echo " xml to make Docutils-native XML files" - @echo " pseudoxml to make pseudoxml-XML files for display purposes" - @echo " linkcheck to check all external links for integrity" - @echo " doctest to run all doctests embedded in the documentation (if enabled)" - -clean: - rm -rf $(BUILDDIR)/* - -html: - $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html - @echo - @echo "Build finished. The HTML pages are in $(BUILDDIR)/html." - -dirhtml: - $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml - @echo - @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml." - -singlehtml: - $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml - @echo - @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml." - -pickle: - $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle - @echo - @echo "Build finished; now you can process the pickle files." - -json: - $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json - @echo - @echo "Build finished; now you can process the JSON files." - -htmlhelp: - $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp - @echo - @echo "Build finished; now you can run HTML Help Workshop with the" \ - ".hhp project file in $(BUILDDIR)/htmlhelp." - -qthelp: - $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp - @echo - @echo "Build finished; now you can run "qcollectiongenerator" with the" \ - ".qhcp project file in $(BUILDDIR)/qthelp, like this:" - @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/azure-cosmos.qhcp" - @echo "To view the help file:" - @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/azure-cosmos.qhc" - -devhelp: - $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp - @echo - @echo "Build finished." - @echo "To view the help file:" - @echo "# mkdir -p $$HOME/.local/share/devhelp/azure-cosmos" - @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/azure-cosmos" - @echo "# devhelp" - -epub: - $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub - @echo - @echo "Build finished. The epub file is in $(BUILDDIR)/epub." - -latex: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex - @echo - @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex." - @echo "Run \`make' in that directory to run these through (pdf)latex" \ - "(use \`make latexpdf' here to do that automatically)." - -latexpdf: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex - @echo "Running LaTeX files through pdflatex..." - $(MAKE) -C $(BUILDDIR)/latex all-pdf - @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." - -latexpdfja: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex - @echo "Running LaTeX files through platex and dvipdfmx..." - $(MAKE) -C $(BUILDDIR)/latex all-pdf-ja - @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." - -text: - $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text - @echo - @echo "Build finished. The text files are in $(BUILDDIR)/text." - -man: - $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man - @echo - @echo "Build finished. The manual pages are in $(BUILDDIR)/man." - -texinfo: - $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo - @echo - @echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo." - @echo "Run \`make' in that directory to run these through makeinfo" \ - "(use \`make info' here to do that automatically)." - -info: - $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo - @echo "Running Texinfo files through makeinfo..." - make -C $(BUILDDIR)/texinfo info - @echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo." - -gettext: - $(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale - @echo - @echo "Build finished. The message catalogs are in $(BUILDDIR)/locale." - -changes: - $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes - @echo - @echo "The overview file is in $(BUILDDIR)/changes." - -linkcheck: - $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck - @echo - @echo "Link check complete; look for any errors in the above output " \ - "or in $(BUILDDIR)/linkcheck/output.txt." - -doctest: - $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest - @echo "Testing of doctests in the sources finished, look at the " \ - "results in $(BUILDDIR)/doctest/output.txt." - -xml: - $(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml - @echo - @echo "Build finished. The XML files are in $(BUILDDIR)/xml." - -pseudoxml: - $(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml - @echo - @echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml." diff --git a/sdk/cosmos/azure-cosmos/doc/__init__.py b/sdk/cosmos/azure-cosmos/doc/__init__.py deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/sdk/cosmos/azure-cosmos/doc/conf.py b/sdk/cosmos/azure-cosmos/doc/conf.py deleted file mode 100644 index 09fbff29c5b9..000000000000 --- a/sdk/cosmos/azure-cosmos/doc/conf.py +++ /dev/null @@ -1,227 +0,0 @@ -# -*- coding: utf-8 -*- -# -# azure-cosmos documentation build configuration file, created by -# sphinx-quickstart on Fri Jun 27 15:42:45 2014. -# -# This file is execfile()d with the current directory set to its -# containing dir. -# -# Note that not all possible configuration values are present in this -# autogenerated file. -# -# All configuration values have a default; values that are commented out -# serve to show the default. - -import sys -import os - -# If extensions (or modules to document with autodoc) are in another directory, -# add these directories to sys.path here. If the directory is relative to the -# documentation root, use os.path.abspath to make it absolute, like shown here. -sys.path.insert(0, os.path.abspath('..')) - -# -- General configuration ------------------------------------------------ - -# If your documentation needs a minimal Sphinx version, state it here. -#needs_sphinx = '1.0' - -# Add any Sphinx extension module names here, as strings. They can be -# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom -# ones. -extensions = ['sphinx.ext.autodoc', 'sphinx.ext.autosummary', 'sphinx.ext.doctest', - 'sphinx.ext.viewcode'] - -# Add any paths that contain templates here, relative to this directory. -templates_path = ['_templates'] - -# The suffix of source filenames. -source_suffix = '.rst' - -# The encoding of source files. -#source_encoding = 'utf-8-sig' - -# The master toctree document. -master_doc = 'index' - -# General information about the project. -project = u'azure-cosmos' -copyright = u'2017, Microsoft' - -# The version info for the project you're documenting, acts as replacement for -# |version| and |release|, also used in various other places throughout the -# built documents. -# -# The short X.Y version. -version = '4.0.0b1' -# The full version, including alpha/beta/rc tags. -release = '4.0.0b1' - -# The language for content autogenerated by Sphinx. Refer to documentation -# for a list of supported languages. -#language = None - -# There are two options for replacing |today|: either, you set today to some -# non-false value, then it is used: -#today = '' -# Else, today_fmt is used as the format for a strftime call. -#today_fmt = '%B %d, %Y' - -# List of patterns, relative to source directory, that match files and -# directories to ignore when looking for source files. -exclude_patterns = ['_build'] - -# The reST default role (used for this markup: `text`) to use for all -# documents. -#default_role = None - -# If true, '()' will be appended to :func: etc. cross-reference text. -#add_function_parentheses = True - -# If true, the current module name will be prepended to all description -# unit titles (such as .. function::). -#add_module_names = True - -# If true, sectionauthor and moduleauthor directives will be shown in the -# output. They are ignored by default. -#show_authors = False - -# The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' - -# A list of ignored prefixes for module index sorting. -#modindex_common_prefix = [] - -# If true, keep warnings as "system message" paragraphs in the built documents. -#keep_warnings = False - -# -- Options for extensions ---------------------------------------------------- -autoclass_content = 'both' - -# -- Options for HTML output ---------------------------------------------- - -# The theme to use for HTML and HTML Help pages. See the documentation for -# a list of builtin themes. -html_theme = 'default' -html_theme_options = {'collapsiblesidebar': True} - -# Theme options are theme-specific and customize the look and feel of a theme -# further. For a list of options available for each theme, see the -# documentation. -#html_theme_options = {} - -# Add any paths that contain custom themes here, relative to this directory. -#html_theme_path = [] - -# The name for this set of Sphinx documents. If None, it defaults to -# " v documentation". -#html_title = None - -# A shorter title for the navigation bar. Default is the same as html_title. -#html_short_title = None - -# The name of an image file (relative to this directory) to place at the top -# of the sidebar. -#html_logo = None - -# The name of an image file (within the static path) to use as favicon of the -# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 -# pixels large. -#html_favicon = None - -# Add any paths that contain custom static files (such as style sheets) here, -# relative to this directory. They are copied after the builtin static files, -# so a file named "default.css" will overwrite the builtin "default.css". -# html_static_path = ['_static'] - -# Add any extra paths that contain custom files (such as robots.txt or -# .htaccess) here, relative to this directory. These files are copied -# directly to the root of the documentation. -#html_extra_path = [] - -# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, -# using the given strftime format. -#html_last_updated_fmt = '%b %d, %Y' - -# If true, SmartyPants will be used to convert quotes and dashes to -# typographically correct entities. -#html_use_smartypants = True - -# Custom sidebar templates, maps document names to template names. -#html_sidebars = {} - -# Additional templates that should be rendered to pages, maps page names to -# template names. -#html_additional_pages = {} - -# If false, no module index is generated. -#html_domain_indices = True - -# If false, no index is generated. -#html_use_index = True - -# If true, the index is split into individual pages for each letter. -#html_split_index = False - -# If true, links to the reST sources are added to the pages. -#html_show_sourcelink = True - -# If true, "Created using Sphinx" is shown in the HTML footer. Default is True. -#html_show_sphinx = True - -# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. -#html_show_copyright = True - -# If true, an OpenSearch description file will be output, and all pages will -# contain a tag referring to it. The value of this option must be the -# base URL from which the finished HTML is served. -#html_use_opensearch = '' - -# This is the file name suffix for HTML files (e.g. ".xhtml"). -#html_file_suffix = None - -# Output file base name for HTML help builder. -htmlhelp_basename = 'azure-cosmosdoc' - - -# -- Options for LaTeX output --------------------------------------------- - -latex_elements = { -# The paper size ('letterpaper' or 'a4paper'). -#'papersize': 'letterpaper', - -# The font size ('10pt', '11pt' or '12pt'). -#'pointsize': '10pt', - -# Additional stuff for the LaTeX preamble. -#'preamble': '', -} - -# Grouping the document tree into LaTeX files. List of tuples -# (source start file, target name, title, -# author, documentclass [howto, manual, or own class]). -latex_documents = [ - ('index', 'azure-cosmos.tex', u'azure-cosmos Documentation', - u'Microsoft', 'manual'), -] - -# The name of an image file (relative to this directory) to place at the top of -# the title page. -#latex_logo = None - -# For "manual" documents, if this is true, then toplevel headings are parts, -# not chapters. -#latex_use_parts = False - -# If true, show page references after internal links. -#latex_show_pagerefs = False - -# If true, show URL addresses after external links. -#latex_show_urls = False - -# Documents to append as an appendix to all manuals. -#latex_appendices = [] - -# If false, no module index is generated. -#latex_domain_indices = True - - diff --git a/sdk/cosmos/azure-cosmos/doc/index.rst b/sdk/cosmos/azure-cosmos/doc/index.rst deleted file mode 100644 index b3c201a3d59c..000000000000 --- a/sdk/cosmos/azure-cosmos/doc/index.rst +++ /dev/null @@ -1,78 +0,0 @@ -.. azure-cosmos documentation master file, created by - sphinx-quickstart on Fri Jun 27 15:42:45 2014. - You can adapt this file completely to your liking, but it should at least - contain the root `toctree` directive. - -Azure Cosmos Python SDK -======================================== - -System Requirements: --------------------- - - The supported Python versions are 2.7, 3.3, 3.4 and 3.5. To download Python, please visit https://www.python.org/download/releases. - - - Python Tools for Visual Studio is required when using Microsoft Visual - Studio to develop Python applications. To download Python Tools for Visual Studio, please visit http://microsoft.github.io/PTVS. - - -Installation: -------------- - - Method 1: - - 1. Download the Azure Cosmos Python SDK source from - https://github.com/Azure/azure-cosmos-python which is needed to manage the Azure Cosmos database service. - - 2. Execute the following setup script in bash shell: - - .. code-block:: bash - - $ python setup.py install - - Method 2: - - 1. Install the Azure Cosmos Python SDK using pip. - For more information on pip, please visit https://pypi.python.org/pypi/pip - - 2. Execute the following in bash shell: - - .. code-block:: bash - - $ pip install azure-cosmos - -To run tests: -------------- - - .. code-block:: bash - - $ python -m unittest discover -s .\test -p "*.py" - - If you use Microsoft Visual Studio, open the project file python.pyproj, - and run all the tests in Test Explorer. - - -To generate documentations: ---------------------------- - - Install Sphinx: http://sphinx-doc.org/install.html - - .. code-block:: bash - - $ cd doc - $ sphinx-apidoc -f -e -o api ..\azure - $ make.bat html - - -Indices and tables -================== - -* :ref:`genindex` -* :ref:`modindex` -* :ref:`search` - -.. toctree:: - :hidden: - - api/azure - api/modules \ No newline at end of file diff --git a/sdk/cosmos/azure-cosmos/doc/make.bat b/sdk/cosmos/azure-cosmos/doc/make.bat deleted file mode 100644 index 2b4d4c3a9092..000000000000 --- a/sdk/cosmos/azure-cosmos/doc/make.bat +++ /dev/null @@ -1,242 +0,0 @@ -@ECHO OFF - -REM Command file for Sphinx documentation - -if "%SPHINXBUILD%" == "" ( - set SPHINXBUILD=sphinx-build -) -set BUILDDIR=_build -set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% . -set I18NSPHINXOPTS=%SPHINXOPTS% . -if NOT "%PAPER%" == "" ( - set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS% - set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS% -) - -if "%1" == "" goto help - -if "%1" == "help" ( - :help - echo.Please use `make ^` where ^ is one of - echo. html to make standalone HTML files - echo. dirhtml to make HTML files named index.html in directories - echo. singlehtml to make a single large HTML file - echo. pickle to make pickle files - echo. json to make JSON files - echo. htmlhelp to make HTML files and a HTML help project - echo. qthelp to make HTML files and a qthelp project - echo. devhelp to make HTML files and a Devhelp project - echo. epub to make an epub - echo. latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter - echo. text to make text files - echo. man to make manual pages - echo. texinfo to make Texinfo files - echo. gettext to make PO message catalogs - echo. changes to make an overview over all changed/added/deprecated items - echo. xml to make Docutils-native XML files - echo. pseudoxml to make pseudoxml-XML files for display purposes - echo. linkcheck to check all external links for integrity - echo. doctest to run all doctests embedded in the documentation if enabled - goto end -) - -if "%1" == "clean" ( - for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i - del /q /s %BUILDDIR%\* - goto end -) - - -%SPHINXBUILD% 2> nul -if errorlevel 9009 ( - echo. - echo.The 'sphinx-build' command was not found. Make sure you have Sphinx - echo.installed, then set the SPHINXBUILD environment variable to point - echo.to the full path of the 'sphinx-build' executable. Alternatively you - echo.may add the Sphinx directory to PATH. - echo. - echo.If you don't have Sphinx installed, grab it from - echo.http://sphinx-doc.org/ - exit /b 1 -) - -if "%1" == "html" ( - %SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The HTML pages are in %BUILDDIR%/html. - goto end -) - -if "%1" == "dirhtml" ( - %SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml. - goto end -) - -if "%1" == "singlehtml" ( - %SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml. - goto end -) - -if "%1" == "pickle" ( - %SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle - if errorlevel 1 exit /b 1 - echo. - echo.Build finished; now you can process the pickle files. - goto end -) - -if "%1" == "json" ( - %SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json - if errorlevel 1 exit /b 1 - echo. - echo.Build finished; now you can process the JSON files. - goto end -) - -if "%1" == "htmlhelp" ( - %SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp - if errorlevel 1 exit /b 1 - echo. - echo.Build finished; now you can run HTML Help Workshop with the ^ -.hhp project file in %BUILDDIR%/htmlhelp. - goto end -) - -if "%1" == "qthelp" ( - %SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp - if errorlevel 1 exit /b 1 - echo. - echo.Build finished; now you can run "qcollectiongenerator" with the ^ -.qhcp project file in %BUILDDIR%/qthelp, like this: - echo.^> qcollectiongenerator %BUILDDIR%\qthelp\azure-cosmos.qhcp - echo.To view the help file: - echo.^> assistant -collectionFile %BUILDDIR%\qthelp\azure-cosmos.ghc - goto end -) - -if "%1" == "devhelp" ( - %SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. - goto end -) - -if "%1" == "epub" ( - %SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The epub file is in %BUILDDIR%/epub. - goto end -) - -if "%1" == "latex" ( - %SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex - if errorlevel 1 exit /b 1 - echo. - echo.Build finished; the LaTeX files are in %BUILDDIR%/latex. - goto end -) - -if "%1" == "latexpdf" ( - %SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex - cd %BUILDDIR%/latex - make all-pdf - cd %BUILDDIR%/.. - echo. - echo.Build finished; the PDF files are in %BUILDDIR%/latex. - goto end -) - -if "%1" == "latexpdfja" ( - %SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex - cd %BUILDDIR%/latex - make all-pdf-ja - cd %BUILDDIR%/.. - echo. - echo.Build finished; the PDF files are in %BUILDDIR%/latex. - goto end -) - -if "%1" == "text" ( - %SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The text files are in %BUILDDIR%/text. - goto end -) - -if "%1" == "man" ( - %SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The manual pages are in %BUILDDIR%/man. - goto end -) - -if "%1" == "texinfo" ( - %SPHINXBUILD% -b texinfo %ALLSPHINXOPTS% %BUILDDIR%/texinfo - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The Texinfo files are in %BUILDDIR%/texinfo. - goto end -) - -if "%1" == "gettext" ( - %SPHINXBUILD% -b gettext %I18NSPHINXOPTS% %BUILDDIR%/locale - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The message catalogs are in %BUILDDIR%/locale. - goto end -) - -if "%1" == "changes" ( - %SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes - if errorlevel 1 exit /b 1 - echo. - echo.The overview file is in %BUILDDIR%/changes. - goto end -) - -if "%1" == "linkcheck" ( - %SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck - if errorlevel 1 exit /b 1 - echo. - echo.Link check complete; look for any errors in the above output ^ -or in %BUILDDIR%/linkcheck/output.txt. - goto end -) - -if "%1" == "doctest" ( - %SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest - if errorlevel 1 exit /b 1 - echo. - echo.Testing of doctests in the sources finished, look at the ^ -results in %BUILDDIR%/doctest/output.txt. - goto end -) - -if "%1" == "xml" ( - %SPHINXBUILD% -b xml %ALLSPHINXOPTS% %BUILDDIR%/xml - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The XML files are in %BUILDDIR%/xml. - goto end -) - -if "%1" == "pseudoxml" ( - %SPHINXBUILD% -b pseudoxml %ALLSPHINXOPTS% %BUILDDIR%/pseudoxml - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The pseudo-XML files are in %BUILDDIR%/pseudoxml. - goto end -) - -:end diff --git a/sdk/cosmos/azure-cosmos/requirements.txt b/sdk/cosmos/azure-cosmos/requirements.txt index 5d92f68f2287..1d2d3a185c90 100644 --- a/sdk/cosmos/azure-cosmos/requirements.txt +++ b/sdk/cosmos/azure-cosmos/requirements.txt @@ -1,2 +1,2 @@ -azure-core<2.0.0,>=1.0.0b3 +azure-core<2.0.0,>=1.0.0b4 six>=1.6 \ No newline at end of file diff --git a/sdk/cosmos/azure-cosmos/setup.py b/sdk/cosmos/azure-cosmos/setup.py index fbf49b5e4527..7972b7525768 100644 --- a/sdk/cosmos/azure-cosmos/setup.py +++ b/sdk/cosmos/azure-cosmos/setup.py @@ -63,14 +63,13 @@ "samples.Shared", "samples.Shared.config", "test", - "doc", # Exclude packages that will be covered by PEP420 or nspkg "azure", ] ), install_requires=[ 'six >=1.6', - 'azure-core<2.0.0,>=1.0.0b3' + 'azure-core<2.0.0,>=1.0.0b4' ], extras_require={ ":python_version<'3.4'": ['enum34>=1.0.4'], diff --git a/shared_requirements.txt b/shared_requirements.txt index 1643bcfefa70..20c69b9d8d54 100644 --- a/shared_requirements.txt +++ b/shared_requirements.txt @@ -111,7 +111,6 @@ opencensus-ext-azure>=0.3.1 #override azure-keyvault-certificates azure-core<2.0.0,>=1.0.0b2 #override azure-keyvault-keys azure-core<2.0.0,>=1.0.0b2 #override azure-keyvault-secrets azure-core<2.0.0,>=1.0.0b2 -#override azure-cosmos azure-core<2.0.0,>=1.0.0b3 #override azure-eventhub-checkpointstoreblob-aio azure-storage-blob<=12.0.0b4,>=12.0.0b2 #override azure-eventhub-checkpointstoreblob-aio aiohttp<4.0,>=3.0 #override azure-appconfiguration azure-core<2.0.0,>=1.0.0b4