Merge branch 'temp-merging' into development

jacalata · web-flow · commit cd7e5d4f1413 · 2021-12-16T13:46:14.000-08:00
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,7 @@ python:
   - "3.7"
   - "3.8"
   - "3.9"
-  - "pypy"
+  - "pypy3" # pypy = python 2
 # command to install dependencies
 install:
   - "pip install -e ."
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 09 (December 2021)
+* Pypi upgraded to Python3
+
+## 08 (October 2021)
+* See dashboards in a workbook
+* Add shapes property
+* Add custom sql
+* Drop python 2, add up through 3.9
+
+
+## 08 (October 2021)
+* See dashboards in a workbook
+* Add shapes property
+* Add custom sql
+* Drop python 2, add up through 3.9
+
 
 ## 08 (October 2021)
 * See dashboards in a workbook
diff --git a/docs/docs/contributing.md b/docs/docs/contributing.md
@@ -56,3 +56,12 @@ For all other things, please submit a PR that includes the fix, documentation, o
 If the feature is complex or has multiple solutions that could be equally appropriate approaches, it would be helpful to file an issue to discuss the
 design trade-offs of each solution before implementing, to allow us to collectively arrive at the best solution, which most likely exists in the middle
 somewhere.
+
+
+## Release process
+
+We expect that everything merged into the development branch is ready to release on master. Releases can be made at any time - ideally it would be on a regular cadence but currently it is basically on request.
+- bump the version in setup.py
+- update the changelog: all commits to development should contain a meaningful message, the changelog can be built from these
+- merge to master. 
+This kicks off an automated release in github and then publish to pypi. 
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
     
 setup(
     name='tableaudocumentapi',
-    version='0.8',
+    version='0.9',
     author='Tableau',
     author_email='github@tableau.com',
     url='https://github.com/tableau/document-api-python',
