Skip to content
This repository was archived by the owner on Dec 10, 2019. It is now read-only.

Commit febebab

Browse files
LknechtliLknechtli
committed
Merge branch 'release/1.13.0'
2 parents f04e03c + be9531a commit febebab

File tree

5 files changed

+66
-56
lines changed

5 files changed

+66
-56
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
## Overview
2+
3+
Brief description of what this PR does, and why it is needed.
4+
5+
### Checklist
6+
7+
- [ ] 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
8+
9+
### Demo
10+
11+
Optional. Screenshots, `curl` examples, etc.
12+
13+
### Notes
14+
15+
Optional. Ancillary topics, caveats, alternative strategies that didn't work out, anything else.
16+
17+
18+
## Testing Instructions
19+
20+
* How to test this PR
21+
* Prefer bulleted description
22+
* Start after checking out this branch
23+
* Include any setup required, such as bundling scripts, restarting services, etc.
24+
* Include test case, and expected output
25+
26+
Closes #XXX

‎CHANGELOG.rst

+38-21
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,39 @@
11
Change Log
22
==========
33

4+
`Unreleased <https://github.com/raster-foundry/raster-foundry/tree/develop>`__
5+
------------------------------------------------------------------------------
6+
7+
Added
8+
~~~~~
9+
10+
Changed
11+
~~~~~~~
12+
13+
Deprecated
14+
~~~~~~~~~~
15+
16+
Removed
17+
~~~~~~~
18+
19+
Fixed
20+
~~~~~
21+
22+
Security
23+
~~~~~~~~
24+
25+
26+
`1.13.0 <https://github.com/raster-foundry/raster-foundry/tree/1.13.0>`__ (2018-10-23)
27+
--------------------------------------------------------------------------------------
28+
29+
Changed
30+
~~~~~~~
31+
- Sync release numbers with api spec versions
32+
33+
- Switched to `keepachangelog <https://keepachangelog.com/en/1.0.0/>`__
34+
CHANGELOG format
35+
`#69 <https://github.com/raster-foundry/raster-foundry-api-spec/pull/69>`__
36+
437
`0.7.0 <https://github.com/raster-foundry/raster-foundry-python-client/tree/0.7.0>`__ (2018-09-27)
538
--------------------------------------------------------------------------------------------------
639

@@ -14,8 +47,6 @@ Changelog <https://github.com/raster-foundry/raster-foundry-python-client/compar
1447
- Point to permanent location by default for spec
1548
`#59 <https://github.com/raster-foundry/raster-foundry-python-client/pull/59>`__
1649

17-
.. _section-1:
18-
1950
`0.6.0 <https://github.com/raster-foundry/raster-foundry-python-client/tree/0.6.0>`__ (2018-05-14)
2051
--------------------------------------------------------------------------------------------------
2152

@@ -31,8 +62,6 @@ Changelog <https://github.com/raster-foundry/raster-foundry-python-client/compar
3162
- Updates for Raster Vision integration
3263
`#44 <https://github.com/raster-foundry/raster-foundry-python-client/pull/44>`__
3364

34-
.. _section-2:
35-
3665
`0.5.0 <https://github.com/raster-foundry/raster-foundry-python-client/tree/0.5.0>`__ (2018-01-26)
3766
--------------------------------------------------------------------------------------------------
3867

@@ -49,19 +78,17 @@ Changelog <https://github.com/raster-foundry/raster-foundry-python-client/compar
4978
`#38 <https://github.com/raster-foundry/raster-foundry-python-client/pull/38>`__
5079
- Add method to evaluate a raster-vision model
5180
`#36 <https://github.com/raster-foundry/raster-foundry-python-client/pull/36>`__
52-
- Add options to start_prep_train_data
81+
- Add options to start\_prep\_train\_data
5382
`#34 <https://github.com/raster-foundry/raster-foundry-python-client/pull/34>`__
5483
- Add Planet Upload Support
5584
`#33 <https://github.com/raster-foundry/raster-foundry-python-client/pull/33>`__
56-
- Add method to start prep_train_data job
85+
- Add method to start prep\_train\_data job
5786
`#32 <https://github.com/raster-foundry/raster-foundry-python-client/pull/32>`__
5887
- Start raster-vision predict job
5988
`#30 <https://github.com/raster-foundry/raster-foundry-python-client/pull/30>`__
6089
- Include missing install command in README
6190
`#28 <https://github.com/raster-foundry/raster-foundry-python-client/pull/28>`__
6291

63-
.. _section-3:
64-
6592
`0.4.1 <https://github.com/raster-foundry/raster-foundry-python-client/tree/0.4.1>`__ (2017-09-27)
6693
--------------------------------------------------------------------------------------------------
6794

@@ -75,8 +102,6 @@ Changelog <https://github.com/raster-foundry/raster-foundry-python-client/compar
75102
- Fix ipyleaflet install
76103
`#25 <https://github.com/raster-foundry/raster-foundry-python-client/pull/25>`__
77104

78-
.. _section-4:
79-
80105
`0.4.0 <https://github.com/raster-foundry/raster-foundry-python-client/tree/0.4.0>`__ (2017-09-07)
81106
--------------------------------------------------------------------------------------------------
82107

@@ -85,13 +110,12 @@ Changelog <https://github.com/raster-foundry/raster-foundry-python-client/compar
85110

86111
**Merged pull requests:**
87112

88-
- Add \*args and \**kwargs to no_op function in notebook support check
113+
- Add \*args and \*\*kwargs to no\_op function in notebook support
114+
check
89115
`#24 <https://github.com/raster-foundry/raster-foundry-python-client/pull/24>`__
90116
- Include Uploads example notebook
91117
`#23 <https://github.com/raster-foundry/raster-foundry-python-client/pull/23>`__
92118

93-
.. _section-5:
94-
95119
`0.3.0 <https://github.com/raster-foundry/raster-foundry-python-client/tree/0.3.0>`__ (2017-08-15)
96120
--------------------------------------------------------------------------------------------------
97121

@@ -103,8 +127,6 @@ Changelog <https://github.com/raster-foundry/raster-foundry-python-client/compar
103127
- Bump cryptography version to 2.x
104128
`#22 <https://github.com/raster-foundry/raster-foundry-python-client/pull/22>`__
105129

106-
.. _section-6:
107-
108130
`0.2.1 <https://github.com/raster-foundry/raster-foundry-python-client/tree/0.2.1>`__ (2017-08-10)
109131
--------------------------------------------------------------------------------------------------
110132

@@ -116,8 +138,6 @@ Changelog <https://github.com/raster-foundry/raster-foundry-python-client/compar
116138
- Correct repo references
117139
`#21 <https://github.com/raster-foundry/raster-foundry-python-client/pull/21>`__
118140

119-
.. _section-7:
120-
121141
`0.2.0 <https://github.com/raster-foundry/raster-foundry-python-client/tree/0.2.0>`__ (2017-08-10)
122142
--------------------------------------------------------------------------------------------------
123143

@@ -143,8 +163,6 @@ Changelog <https://github.com/raster-foundry/raster-foundry-python-client/compar
143163
- Add leaflet support to project model
144164
`#2 <https://github.com/raster-foundry/raster-foundry-python-client/pull/2>`__
145165

146-
.. _section-8:
147-
148166
`0.1.0 <https://github.com/raster-foundry/raster-foundry-python-client/tree/0.1.0>`__ (2017-05-04)
149167
--------------------------------------------------------------------------------------------------
150168

@@ -155,6 +173,5 @@ Changelog <https://github.com/raster-foundry/raster-foundry-python-client/compar
155173

156174
- Port Python client from main repository
157175
`#1 <https://github.com/raster-foundry/raster-foundry-python-client/pull/1>`__
158-
159176
- *This Change Log was automatically generated
160-
by*\ `github_changelog_generator <https://github.com/skywinder/Github-Changelog-Generator>`__
177+
by*\ `github\_changelog\_generator <https://github.com/skywinder/Github-Changelog-Generator>`__

‎MANIFEST.in

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ include spec.yml
22
include LICENSE.txt
33
include CHANGELOG.rst
44

5+
recursive-include .github *
56
recursive-include tests *
67
recursive-include examples *.ipynb
78
recursive-include scripts *

‎README.rst

-34
Original file line numberDiff line numberDiff line change
@@ -70,37 +70,3 @@ The test suite execution process is managed by ``tox``:
7070
.. code:: bash
7171
7272
$ tox
73-
74-
75-
Releases
76-
--------
77-
78-
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:
79-
80-
81-
.. code:: bash
82-
83-
$ git flow release start X.Y.Z
84-
$ docker run -ti --rm -v "${PWD}:/changelog" -w "/changelog" "quay.io/azavea/github-changelog-generator:v1.14.3" \
85-
--token "${GITHUB_TOKEN}" \
86-
--future-release "X.Y.Z" \
87-
--no-issues \
88-
--no-author \
89-
--release-branch develop
90-
$ pandoc CHANGELOG.md -o CHANGELOG.rst
91-
$ rm CHANGELOG.md
92-
$ vim setup.py
93-
$ git commit -m "X.Y.Z"
94-
$ git flow release publish X.Y.Z
95-
$ git flow release finish X.Y.Z
96-
97-
98-
After you've completed the ``git flow`` steps above, you'll need to push the changes from your local repository to the GitHub repository:
99-
100-
.. code:: bash
101-
102-
$ git checkout develop
103-
$ git push origin develop
104-
$ git checkout master
105-
$ git push origin master
106-
$ git push --tags

‎setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
setuptools.setup(
44
name="rasterfoundry",
5-
version="0.7.1",
5+
version="1.13.0",
66
description='A Python client for Raster Foundry, a web platform for '
77
'combining, analyzing, and publishing raster data.',
88
long_description=open('README.rst').read(),

0 commit comments

Comments
 (0)