Merge branch 'release/1.13.0'

raster-foundry · Oct 23, 2018 · febebab · febebab
2 parents f04e03c + be9531a
commit febebab
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 56 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,26 @@
+## Overview
+
+Brief description of what this PR does, and why it is needed.
+
+### Checklist
+
+- [ ] Description of PR is in an appropriate section of the [changelog](https://github.com/raster-foundry/raster-foundry-python-client/blob/develop/CHANGELOG.rst) and grouped with similar changes if possible
+
+### Demo
+
+Optional. Screenshots, `curl` examples, etc.
+
+### Notes
+
+Optional. Ancillary topics, caveats, alternative strategies that didn't work out, anything else.
+
+
+## Testing Instructions
+
+ * How to test this PR
+ * Prefer bulleted description
+ * Start after checking out this branch
+ * Include any setup required, such as bundling scripts, restarting services, etc.
+ * Include test case, and expected output
+
+Closes #XXX
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,39 @@
 Change Log
 ==========
 
+`Unreleased <https://github.com/raster-foundry/raster-foundry/tree/develop>`__
+------------------------------------------------------------------------------
+
+Added
+~~~~~
+
+Changed
+~~~~~~~
+
+Deprecated
+~~~~~~~~~~
+
+Removed
+~~~~~~~
+
+Fixed
+~~~~~
+
+Security
+~~~~~~~~
+
+
+`1.13.0 <https://github.com/raster-foundry/raster-foundry/tree/1.13.0>`__ (2018-10-23)
+--------------------------------------------------------------------------------------
+
+Changed
+~~~~~~~
+-  Sync release numbers with api spec versions
+
+-  Switched to `keepachangelog <https://keepachangelog.com/en/1.0.0/>`__
+   CHANGELOG format
+   `#69 <https://github.com/raster-foundry/raster-foundry-api-spec/pull/69>`__
+
 `0.7.0 <https://github.com/raster-foundry/raster-foundry-python-client/tree/0.7.0>`__ (2018-09-27)
 --------------------------------------------------------------------------------------------------
 
@@ -14,8 +47,6 @@ Changelog <https://github.com/raster-foundry/raster-foundry-python-client/compar
 -  Point to permanent location by default for spec
    `#59 <https://github.com/raster-foundry/raster-foundry-python-client/pull/59>`__
 
-.. _section-1:
-
 `0.6.0 <https://github.com/raster-foundry/raster-foundry-python-client/tree/0.6.0>`__ (2018-05-14)
 --------------------------------------------------------------------------------------------------
 
@@ -31,8 +62,6 @@ Changelog <https://github.com/raster-foundry/raster-foundry-python-client/compar
 -  Updates for Raster Vision integration
    `#44 <https://github.com/raster-foundry/raster-foundry-python-client/pull/44>`__
 
-.. _section-2:
-
 `0.5.0 <https://github.com/raster-foundry/raster-foundry-python-client/tree/0.5.0>`__ (2018-01-26)
 --------------------------------------------------------------------------------------------------
 
@@ -49,19 +78,17 @@ Changelog <https://github.com/raster-foundry/raster-foundry-python-client/compar
    `#38 <https://github.com/raster-foundry/raster-foundry-python-client/pull/38>`__
 -  Add method to evaluate a raster-vision model
    `#36 <https://github.com/raster-foundry/raster-foundry-python-client/pull/36>`__
--  Add options to start_prep_train_data
+-  Add options to start\_prep\_train\_data
    `#34 <https://github.com/raster-foundry/raster-foundry-python-client/pull/34>`__
 -  Add Planet Upload Support
    `#33 <https://github.com/raster-foundry/raster-foundry-python-client/pull/33>`__
--  Add method to start prep_train_data job
+-  Add method to start prep\_train\_data job
    `#32 <https://github.com/raster-foundry/raster-foundry-python-client/pull/32>`__
 -  Start raster-vision predict job
    `#30 <https://github.com/raster-foundry/raster-foundry-python-client/pull/30>`__
 -  Include missing install command in README
    `#28 <https://github.com/raster-foundry/raster-foundry-python-client/pull/28>`__
 
-.. _section-3:
-
 `0.4.1 <https://github.com/raster-foundry/raster-foundry-python-client/tree/0.4.1>`__ (2017-09-27)
 --------------------------------------------------------------------------------------------------
 
@@ -75,8 +102,6 @@ Changelog <https://github.com/raster-foundry/raster-foundry-python-client/compar
 -  Fix ipyleaflet install
    `#25 <https://github.com/raster-foundry/raster-foundry-python-client/pull/25>`__
 
-.. _section-4:
-
 `0.4.0 <https://github.com/raster-foundry/raster-foundry-python-client/tree/0.4.0>`__ (2017-09-07)
 --------------------------------------------------------------------------------------------------
 
@@ -85,13 +110,12 @@ Changelog <https://github.com/raster-foundry/raster-foundry-python-client/compar
 
 **Merged pull requests:**
 
--  Add \*args and \**kwargs to no_op function in notebook support check
+-  Add \*args and \*\*kwargs to no\_op function in notebook support
+   check
    `#24 <https://github.com/raster-foundry/raster-foundry-python-client/pull/24>`__
 -  Include Uploads example notebook
    `#23 <https://github.com/raster-foundry/raster-foundry-python-client/pull/23>`__
 
-.. _section-5:
-
 `0.3.0 <https://github.com/raster-foundry/raster-foundry-python-client/tree/0.3.0>`__ (2017-08-15)
 --------------------------------------------------------------------------------------------------
 
@@ -103,8 +127,6 @@ Changelog <https://github.com/raster-foundry/raster-foundry-python-client/compar
 -  Bump cryptography version to 2.x
    `#22 <https://github.com/raster-foundry/raster-foundry-python-client/pull/22>`__
 
-.. _section-6:
-
 `0.2.1 <https://github.com/raster-foundry/raster-foundry-python-client/tree/0.2.1>`__ (2017-08-10)
 --------------------------------------------------------------------------------------------------
 
@@ -116,8 +138,6 @@ Changelog <https://github.com/raster-foundry/raster-foundry-python-client/compar
 -  Correct repo references
    `#21 <https://github.com/raster-foundry/raster-foundry-python-client/pull/21>`__
 
-.. _section-7:
-
 `0.2.0 <https://github.com/raster-foundry/raster-foundry-python-client/tree/0.2.0>`__ (2017-08-10)
 --------------------------------------------------------------------------------------------------
 
@@ -143,8 +163,6 @@ Changelog <https://github.com/raster-foundry/raster-foundry-python-client/compar
 -  Add leaflet support to project model
    `#2 <https://github.com/raster-foundry/raster-foundry-python-client/pull/2>`__
 
-.. _section-8:
-
 `0.1.0 <https://github.com/raster-foundry/raster-foundry-python-client/tree/0.1.0>`__ (2017-05-04)
 --------------------------------------------------------------------------------------------------
 
@@ -155,6 +173,5 @@ Changelog <https://github.com/raster-foundry/raster-foundry-python-client/compar
 
 -  Port Python client from main repository
    `#1 <https://github.com/raster-foundry/raster-foundry-python-client/pull/1>`__
-
 -  *This Change Log was automatically generated
-   by*\ `github_changelog_generator <https://github.com/skywinder/Github-Changelog-Generator>`__
+   by*\ `github\_changelog\_generator <https://github.com/skywinder/Github-Changelog-Generator>`__
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -2,6 +2,7 @@ include spec.yml
 include LICENSE.txt
 include CHANGELOG.rst
 
+recursive-include .github *
 recursive-include tests *
 recursive-include examples *.ipynb
 recursive-include scripts *
diff --git a/README.rst b/README.rst
@@ -70,37 +70,3 @@ The test suite execution process is managed by ``tox``:
 .. code:: bash
 
    $ tox
-
-
-Releases
---------
-
-Releases are automatically published to PyPI through Travis CI when commits are tagged. The following ``git flow`` commands lead to a tagged commit that can be pushed to GitHub:
-
-
-.. code:: bash
-
-   $ git flow release start X.Y.Z
-   $ docker run -ti --rm -v "${PWD}:/changelog" -w "/changelog" "quay.io/azavea/github-changelog-generator:v1.14.3" \
-      --token "${GITHUB_TOKEN}" \
-      --future-release "X.Y.Z" \
-      --no-issues \
-      --no-author \
-      --release-branch develop
-   $ pandoc CHANGELOG.md -o CHANGELOG.rst
-   $ rm CHANGELOG.md
-   $ vim setup.py
-   $ git commit -m "X.Y.Z"
-   $ git flow release publish X.Y.Z
-   $ git flow release finish X.Y.Z
-
-
-After you've completed the ``git flow`` steps above, you'll need to push the changes from your local repository to the GitHub repository:
-
-.. code:: bash
-
-   $ git checkout develop
-   $ git push origin develop
-   $ git checkout master
-   $ git push origin master
-   $ git push --tags
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setuptools.setup(
     name="rasterfoundry",
-    version="0.7.1",
+    version="1.13.0",
     description='A Python client for Raster Foundry, a web platform for '
     'combining, analyzing, and publishing raster data.',
     long_description=open('README.rst').read(),