From b2ed31458f5d0e1a936fc689306fda77416285b1 Mon Sep 17 00:00:00 2001
From: Antoine de Torcy <adetorcy@email.unc.edu>
Date: Mon, 4 Dec 2017 14:20:41 -0500
Subject: [PATCH] [#3] Bump version to 0.7.0

---
 CHANGELOG.rst    | 54 ++++++++++++++++++++++++++++++++++++++++++++++++
 MANIFEST.in      |  2 +-
 irods/version.py |  2 +-
 setup.cfg        |  2 +-
 setup.py         | 11 +++++++---
 5 files changed, 65 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 5648dc1c..f757629a 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,60 @@ Changelog
 =========
 
 
+v0.7.0 (2017-12-15)
+-------------------
+- Dynamic instance method definition for Python2/3. [Antoine de Torcy]
+- Filter by collection path. [Antoine de Torcy]
+- Add truncate flag. [Antoine de Torcy]
+- Add update replica keyword. [Antoine de Torcy]
+- Client-side support for ALL_KW on put. [Antoine de Torcy]
+- Add server version to session properties. [Antoine de Torcy]
+- Pass object IO options in unpacked format. [Antoine de Torcy]
+- Refactor tests and session config. [Antoine de Torcy]
+- First pass at SSL support. [Antoine de Torcy]
+- Use reentrant lock in connection pool. [Antoine de Torcy]
+- Allow for cases with CS_NEG_DONT_CARE. [Antoine de Torcy]
+- First pass at client-server negotiation. [Antoine de Torcy]
+- Simplify session/account initialization. [Antoine de Torcy]
+- Expect multiple DNs per user. [Antoine de Torcy]
+- Use default resource host/path strings. [Antoine de Torcy]
+- Honor default resource setting. [Antoine de Torcy]
+- Add placeholder for formatting arguments. [Antoine de Torcy]
+- Add function get_html_string in results.py. [KERVELLEC Joseph]
+- Fix assertions. [Antoine de Torcy]
+- Test registration with checksum. [Antoine de Torcy]
+- Add admin option to AccessManager.set() [Antoine de Torcy]
+- Add file/dir registration. [Antoine de Torcy]
+- Remove call to sys.exc_clear() [Antoine de Torcy]
+- Force flag support on get. [Antoine de Torcy]
+- Fix intermittent encoding error. [Antoine de Torcy]
+- Update iRODSSession.configure() [Antoine de Torcy]
+- Set default iRODS authentication scheme to native. [Lazlo Westerhof]
+- Use the same naming as iRODS environment variable
+  irods_authentication_scheme. [Lazlo Westerhof]
+- Add connection timeout. [Antoine de Torcy]
+- Extend the query condition interface. [Antoine de Torcy]
+- Better handling of byte buffers. [Antoine de Torcy]
+- Python 3 fix. [Antoine de Torcy]
+- Set OPR_TYPE to 1 on put. [Antoine de Torcy]
+- Set default empty username in iRODSAccess. [Antoine de Torcy]
+- Add ability to set user passwords. [Antoine de Torcy]
+- First pass at iRODS ticket support - ticket generation - ticket based
+  access. [Antoine de Torcy]
+- Add dependencies to setup.py. [Antoine de Torcy]
+- Add object put/get test. [Antoine de Torcy]
+- Unpack error messages. [Antoine de Torcy]
+- Add CAT_UNKNOWN_SPECIFIC_QUERY exception. [Antoine de Torcy]
+- Commits for the english language, which apparently I'm qualified in..
+  [John Constable]
+- Document the use of the SpecificQuery class and irods_environment.jon
+  reading functionality. [John Constable]
+- Adds exists() to data_object manager to mirror collection manager.
+  [Alex Lemann]
+- Remove unused exceptions. [Antoine de Torcy]
+- Fix exception hierarchy. [Antoine de Torcy]
+
+
 v0.6.0 (2017-05-23)
 -------------------
 - Patch for GSI. [pdonorio]
diff --git a/MANIFEST.in b/MANIFEST.in
index c4dd42eb..3c469e1f 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1 +1 @@
-include AUTHORS CHANGELOG.rst LICENSE.txt README.md irods/test/unicode_sampler.xml
\ No newline at end of file
+include AUTHORS CHANGELOG.rst LICENSE.txt README.rst irods/test/README.rst irods/test/unicode_sampler.xml
\ No newline at end of file
diff --git a/irods/version.py b/irods/version.py
index fde151ab..19442947 100644
--- a/irods/version.py
+++ b/irods/version.py
@@ -1 +1 @@
-__version__ = '0.7.0a0'
\ No newline at end of file
+__version__ = '0.7.0'
\ No newline at end of file
diff --git a/setup.cfg b/setup.cfg
index b88034e4..5aef279b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,2 +1,2 @@
 [metadata]
-description-file = README.md
+description-file = README.rst
diff --git a/setup.py b/setup.py
index 1486c891..9f037459 100644
--- a/setup.py
+++ b/setup.py
@@ -5,8 +5,13 @@
 # Get package version
 version = {}
 here = os.path.abspath(os.path.dirname(__file__))
-with open(os.path.join(here, 'irods/version.py')) as f:
-    exec(f.read(), version)
+with open(os.path.join(here, 'irods/version.py')) as file:
+    exec(file.read(), version)
+
+
+# Get description
+with open('README.rst') as file:
+    long_description = file.read()
 
 
 setup(name='python-irodsclient',
@@ -14,10 +19,10 @@
       author='iRODS Consortium',
       author_email='support@irods.org',
       description='A python API for iRODS',
+      long_description=long_description,
       license='BSD',
       url='https://github.com/irods/python-irodsclient',
       keywords='irods',
-      long_description='README.rst',
       classifiers=[
                    'License :: OSI Approved :: BSD License',
                    'Development Status :: 4 - Beta',