Update CHANGES and version for 0.4.0rc1 (#21)

* Update CHANGES and version for 0.4.0rc1

* Fix setup.py version to not import

CHANGES.rst

@@ -1,41 +1,53 @@
 CHANGELOG
 =========
 
-0.3.1 (2018-10-03)
+0.4.0rc1 (2018-11-07)
+---------------------
+
+- DEPRECATED - the ``from_list`` method on ``ComparatorSet``
+- adds the ``QueryPair`` class
+- BREAKING - ``Comparator`` and ``ComparatorSet`` are instantiated with ``QueryPair`` objects
+- BREAKING - ``ComparatorSet.from_dict()`` requires the dict as the first argument
+- BREAKING - ``QueryResult.keys()`` and ``QueryResult.values()`` both return generators
+- the ``rquery`` passed to a ``QueryPair`` can be formatted with the ``lquery`` query result
+- adds the ``QueryResultCol`` class
+- adds the ``append``, ``pop``, ``extend``, and ``filter`` methods on ``QueryResult``
+- downgrades pandas version requirement to >=0.22.0
+- improves docstrings on ``QueryResult`` methods
+- adds slice handling to ``QueryResult``
+- adds ``empty`` property to ``QueryResult``
+
+0.3.2 (2018-10-04)
 ------------------
 
-- add `creds_file` to possible BigQueryDb init kwargs
+- adds MANIFEST.in for readme and changes
+
+0.3.1 (2018-10-03)
+------------------
 
-.. _section-1:
+- adds ``creds_file`` to possible BigQueryDb init kwargs
 
 0.3.0 (2018-10-03)
 ------------------
 
 -  DEPRECATED - the ``query_df`` method on ``BaseDb`` and subclasses
 -  DEPRECATED - the ``output`` kwarg for Comparator results
--  add the ``execute`` method on ``BaseDb`` and subclasses
--  add the QueryResult and QueryResultRow classes
--  add the ComparatorSet class
--  add ``list_tables`` and ``delete_table`` methods to ``BigQueryDb``
+-  adds the ``execute`` method on ``BaseDb`` and subclasses
+-  adds the ``QueryResult`` and ``QueryResultRow`` classes
+-  adds the ``ComparatorSet`` class
+-  adds ``list_tables`` and ``delete_table`` methods to ``BigQueryDb``
 -  cleans up some python 2/3 compatability using six
 
-.. _section-2:
-
 0.2.1 (2018-09-19)
 ------------------
 
 -  officially support Python 2.7, 3.6, and 3.7
 
-.. _section-3:
-
 0.2.0 (2018-09-18)
 ------------------
 
--  add ``query_df`` methods for returning pandas DataFrames
--  add ``output`` kwarg to Comparator to allow calling the ``query_df``
-   method
-
-.. _section-4:
+-  adds ``query_df`` methods for returning pandas DataFrames
+-  adds ``output`` kwarg to Comparator to allow calling the ``query_df`` method
 
 0.1.0 (2018-09-12)
 ------------------

comparator/__init__.py

@@ -9,4 +9,4 @@
 
 
 __all__ = [db, BASIC_COMP, LEN_COMP, FIRST_COMP, DEFAULT_COMP, DbConfig, Comparator, ComparatorSet, QueryPair]
-__version__ = '0.3.2'
+__version__ = '0.4.0rc1'

setup.py

@@ -1,20 +1,37 @@
+import re
+
 from io import open
 from setuptools import setup, find_packages
 
-with open('README.rst', encoding='utf-8') as f:
-    readme = f.read()
+README = 'README.rst'
+CHANGES = 'CHANGES.rst'
+VERSION_FILE = 'comparator/__init__.py'
+
+
+def read(path):
+    with open(path, encoding='utf-8') as f:
+        return f.read()
+
+
+def find_version():
+    version_file = read(VERSION_FILE)
+    version_match = re.search(
+        r"^__version__ = ['\"]([^'\"]*)['\"]",
+        version_file,
+        re.M)
+    if version_match:
+        return version_match.group(1)
 
-with open('CHANGES.rst', encoding='utf-8') as f:
-    changes = f.read()
+    raise RuntimeError("Unable to find version string.")
 
 
 setup(
     name='comparator',
-    version='0.3.2',
+    version=find_version(),
     author='Aaron Biller',
     author_email='aaronbiller@gmail.com',
     description='Utility for comparing results between data sources',
-    long_description=readme + '\n' + changes,
+    long_description=read(README) + '\n' + read(CHANGES),
     license='Apache 2.0',
     keywords='utility compare database',
     url='https://github.com/aaronbiller/comparator',