Merge pull request #557 from dronekit/release_branch_2_1_0_update

Update setup.py and doc.conf to release 2.1.0

Author: hamishwillee

docs/conf.py

@@ -41,17 +41,17 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'DroneKit Air: Python'
+project = u'DroneKit Python'
 copyright = u'2015-2016, 3D Robotics'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '0.5'
+version = '2.1'
 # The full version, including alpha/beta/rc tags.
-release = '0.5'
+release = '2.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, Extension
 import platform
 
-version = '2.0.2'
+version = '2.1.0'
 
 setup(name='dronekit',
       zip_safe=True,