Merging back the changes from master into dev

These were changes made to make the pypi package renderer happy. These
should be persisted across both branches.

HISTORY.rst

@@ -0,0 +1,19 @@
+.. :changelog:
+
+Release History
+===============
+
+0.0.2 (2017-01-30)
+------------------
+
+* Addresses an issue with lib.auth() not properly defaulting to 2FA
+* Fixes an issue with Overwrite for ADLUploader sometimes not being honored.
+* Fixes an issue with empty files not properly being uploaded and resulting in a hang in progress tracking.
+* Addition of a samples directory showcasing examples of how to use the client and upload and download logic.
+* General cleanup of documentation and comments.
+* This is still based on API version 2016-11-01
+
+0.0.1 (2016-11-21)
+------------------
+* Initial preview release. Based on API version 2016-11-01.
+* Includes initial ADLS filesystem functionality and extended upload and download support.

README.rst

@@ -54,7 +54,7 @@ To play with the code, here is a starting point:
     multithread.ADLDownloader(adl, "", 'my_temp_dir', 5, 2**24)
 
 Command Line Sample Usage
-------------------
+-------------------------
 To interact with the API at a higher-level, you can use the provided
 command-line interface in "samples/cli.py". You will need to set
 the appropriate environment variables as described above to connect to the
@@ -67,22 +67,6 @@ Azure Data Lake Store. Below is a simple sample, with more details beyond.
 
 Execute the program without arguments to access documentation.
 
-
-Contents
-========
-
-.. toctree::
-   api
-   :maxdepth: 2
-
-Indices and tables
-==================
-
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
-
-
 To start the CLI in interactive mode, run "python samples/cli.py"
 and then type "help" to see all available commands (similiar to Unix utilities):
 

setup.py

@@ -7,6 +7,8 @@ import re
 
 with open('README.rst', encoding='utf-8') as f:
     readme = f.read()
+with open('HISTORY.rst', encoding='utf-8') as f:
+    history = f.read()
 
 # Version extraction inspired from 'requests'
 with open('azure/datalake/store/__init__.py', 'r') as fd:
@@ -18,10 +20,10 @@ if not version:
 
 setup(name='azure-datalake-store',
       version=version,
-      description='Convenient Filesystem interface to Azure Data-lake Store',
+      description='Azure Data Lake Store Filesystem Client Library for Python',
       url='https://github.com/Azure/azure-data-lake-store-python',
       author='Microsoft Corporation',
-      author_email='',
+      author_email='ptvshelp@microsoft.com',
       license='MIT License',
       keywords='azure',
       classifiers=[
@@ -46,6 +48,6 @@ setup(name='azure-datalake-store',
           ":python_version<'3.4'": ['pathlib2'],
           ":python_version<='2.7'": ['futures'],
       },
-      long_description=readme,
+      long_description=readme + '\n\n' + history,
       zip_safe=False
 )