Merge remote-tracking branch 'upstream/master'

docs/source/conf.py

@@ -41,7 +41,8 @@
 ]
 
 import sphinx_rtd_theme
-import os
+from pyquil import __version__
+
 
 def remove_secrets(app, what, name, obj, options, signature, return_annotation):
     if what == "class" and name == "pyquil.api.Connection":
@@ -85,9 +86,9 @@ def setup(app):
 # built documents.
 #
 # The short X.Y version.
-version = u'1.1.0'
+version = __version__
 # The full version, including alpha/beta/rc tags.
-release = u'1.1.0'
+release = __version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

pyquil/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.1.1"

setup.py

@@ -16,15 +16,15 @@
 ##############################################################################
 
 from setuptools import setup
+from pyquil import __version__
 
 setup(
     name="pyquil",
-    version="1.1.0",
+    version=__version__,
     author="Rigetti Computing",
     author_email="[email protected]",
     description="A Python library to generate Quantum Instruction Language (Quil) Programs.",
     url="https://github.com/rigetticomputing/pyquil.git",
-    download_url="https://github.com/rigetticomputing/pyquil/tarball/1.1.0",
     packages=["pyquil"],
     license="LICENSE",
     install_requires=[