Merge pull request rigetti#82 from rigetticomputing/ImproveSetup

Unify version source and use find_packages

docs/conf.py

@@ -16,6 +16,8 @@
 import os
 import sphinx_rtd_theme
 
+from grove import __version__
+
 # 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.
@@ -69,9 +71,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.2.0'
+version = __version__
 # The full version, including alpha/beta/rc tags.
-release = '1.2.0'
+release = __version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

grove/__init__.py

@@ -13,6 +13,4 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 ##############################################################################
-
-# init for grove
-from grove.pyvqe.vqe import VQE
+__version__ = '1.2.0'

setup.py

@@ -15,29 +15,17 @@
 #    limitations under the License.
 ##############################################################################
 
-from setuptools import setup
+from setuptools import setup, find_packages
+from grove import __version__
 
 setup(
     name="quantum-grove",
-    version="1.2.0",
+    version=__version__,
     author="Rigetti Computing",
     author_email="[email protected]",
     description="A collection of quantum algorithms built using pyQuil and Forest",
     url="https://github.com/rigetticomputing/grove.git",
-    packages=[
-        "grove",
-        "grove.pyqaoa",
-        "grove.pyvqe",
-        "grove.qft",
-        "grove.bernstein_vazirani",
-        "grove.simon",
-        "grove.amplification",
-        "grove.alpha",
-        "grove.alpha.phaseestimation",
-        "grove.alpha.deutsch_jozsa",
-        "grove.alpha.arbitrary_state",
-        "grove.alpha.fermion_transforms"
-    ],
+    packages=find_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
     install_requires=[
         'numpy',
         'scipy',
@@ -48,6 +36,7 @@
     ],
     setup_requires=['pytest-runner'],
     tests_require=[
+        'tox',
         'pytest >= 3.0.0',
         'mock'
     ],