Merge pull request #10 from mcneel/sbaer/0.12.1

patch for merge conflict on github
mcneel · Oct 23, 2020 · 4a0643e · 4a0643e
2 parents ef8ffbd + 4b0dcb2
commit 4a0643e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/compute_rhino3d/Util.py b/compute_rhino3d/Util.py
@@ -2,7 +2,7 @@
 import json
 import requests
 
-__version__ = '0.12.0'
+__version__ = '0.12.1'
 
 url = 'https://compute.rhino3d.com/'
 authToken = ''

diff --git a/docs/conf.py b/docs/conf.py
@@ -20,13 +20,13 @@
 # -- Project information -----------------------------------------------------
 
 project = u'compute_rhino3d'
-copyright = u'2019, Robert McNeel & Associates'
+copyright = u'2020, Robert McNeel & Associates'
 author = u'Robert McNeel & Associates'
 
 # The short X.Y version
 version = u''
 # The full version, including alpha/beta/rc tags
-release = u'0.8.0'
+release = u'0.12.1'
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/setup.py b/setup.py
@@ -30,7 +30,7 @@
 
 setuptools.setup(
     name="compute_rhino3d",
-    version="0.12.0",
+    version="0.12.1",
     packages=['compute_rhino3d'],
     author="Robert McNeel & Associates",
     author_email="steve@mcneel.com",