Skip to content

Commit 2ca9de1

Browse files
committed
Merge branch 'release/1.0.0'
2 parents a56a238 + f988f7f commit 2ca9de1

File tree

7 files changed

+36
-26
lines changed

7 files changed

+36
-26
lines changed

.bumpversion.cfg

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
[bumpversion]
2-
current_version = 0.0.1
2+
current_version = 1.0.0
33
commit = True
44
tag = False
55
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(?:-(?P<release>[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+(?P<build>[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?
6-
serialize =
7-
{major}.{minor}.{patch}-{release}+{build}
8-
{major}.{minor}.{patch}+{build}
9-
{major}.{minor}.{patch}-{release}
10-
{major}.{minor}.{patch}
6+
serialize =
7+
{major}.{minor}.{patch}-{release}+{build}
8+
{major}.{minor}.{patch}+{build}
9+
{major}.{minor}.{patch}-{release}
10+
{major}.{minor}.{patch}
1111

1212
[bumpversion:part:release]
1313
optional_value = production
1414
first_value = dev
15-
values =
16-
dev
17-
production
15+
values =
16+
dev
17+
production
1818

1919
[bumpverion:part:build]
2020
values = [0-9A-Za-z-]+
@@ -26,3 +26,4 @@ replace = __version__ = '{new_version}'
2626
[bumpversion:file:docs/source/conf.py]
2727
search = release = '{current_version}'
2828
replace = release = '{new_version}'
29+

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ matrix:
1111
env: TOXENV=py35
1212
- python: "3.5"
1313
env: TOXENV=manifest
14-
# - python: "3.5"
15-
# env: TOXENV=docs
14+
- python: "3.5"
15+
env: TOXENV=docs
1616

1717
before_install:
1818
- pip install codecov

README.rst

+9
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,15 @@ Read the the `contributing page <http://pushover-complete.readthedocs.io/en/late
4141

4242
The full list of contributors is in :code:`AUTHORS.rst` or `on GitHub <https://github.com/scolby33/pushover_complete/contributors>`_.
4343

44+
Changelog
45+
---------
46+
47+
1.0.0 <2016-05-09>
48+
^^^^^^^^^^^^^^^^^^
49+
50+
- Implementation of methods for the Pushover messages, sounds, users, receipt, subscriptions, groups, and licenses APIs
51+
- Documentation and build process
52+
4453
License
4554
-------
4655

docs/source/conf.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
# built documents.
6767
#
6868
# The full version, including alpha/beta/rc tags.
69-
release = '0.0.1'
69+
release = '1.0.0'
7070
# The short X.Y version.
7171
version = re.sub('(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(?:-(?P<release>[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+(?P<build>[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?',
7272
'\g<major>.\g<minor>.\g<patch>', release) # get the version number without any alpha/beta/rc/etc. tags
@@ -150,7 +150,8 @@
150150
# Add any paths that contain custom static files (such as style sheets) here,
151151
# relative to this directory. They are copied after the builtin static files,
152152
# so a file named "default.css" will overwrite the builtin "default.css".
153-
html_static_path = ['_static']
153+
# html_static_path = ['_static']
154+
html_static_path = []
154155

155156
# Add any extra paths that contain custom files (such as robots.txt or
156157
# .htaccess) here, relative to this directory. These files are copied

docs/source/contributing.rst

+9-10
Original file line numberDiff line numberDiff line change
@@ -169,15 +169,6 @@ The steps for making a release of :code:`pushover_complete` are:
169169
#. Run all tests one last time! ::
170170

171171
$ tox
172-
#. Publish the release branch::
173-
174-
$ git flow release publish {new_version}
175-
#. Finish the release branch::
176-
177-
$ git flow release finish -F {new_version}
178-
#. Push the new tag::
179-
180-
$ git push --tags
181172
#. Build the project::
182173

183174
$ python setup.py sdist bdist_wheel
@@ -230,8 +221,16 @@ The steps for making a release of :code:`pushover_complete` are:
230221
>>> pushover_complete.__version__
231222
'{new_version}'
232223
$ rm -rf tmp-virtualenv
233-
$ # another virtualenv; pip install pushover_complete`
234224
#. Check the metadata and such on the PyPI website
225+
#. Publish the release branch::
226+
227+
$ git flow release publish {new_version}
228+
#. Finish the release branch::
229+
230+
$ git flow release finish -F {new_version}
231+
#. Push the new tag::
232+
233+
$ git push --tags
235234
#. Upload the sdist and wheel to the release on GitHub
236235
#. Add a pretty changelog to the release on GitHub
237236
#. Bump the version to the next dev version::

src/pushover_complete/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
'PushoverAPI'
99
]
1010

11-
__version__ = '0.0.1'
11+
__version__ = '1.0.0'
1212

1313
__title__ = 'pushover_complete'
1414
__description__ = 'A Python 3 package for interacting with *all* aspects of the Pushover API'

tox.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# and then run "tox" from this directory.
55

66
[tox]
7-
envlist = coverage-clean, py35, manifest, coverage-report
7+
envlist = coverage-clean, py35, manifest, docs, coverage-report
88

99
[testenv]
1010
basepython = python
@@ -31,10 +31,10 @@ changedir = docs
3131
deps =
3232
sphinx
3333
sphinx_rtd_theme
34+
releases
3435
commands =
3536
mkdir -p {envtmpdir}
3637
cp -r source {envtmpdir}/source
37-
sphinx-apidoc -f -o {envtmpdir}/source/apidoc ../src
3838
sphinx-build -W -b html -d {envtmpdir}/doctrees {envtmpdir}/source {envtmpdir}/build/html
3939
sphinx-build -W -b coverage -d {envtmpdir}/doctrees {envtmpdir}/source {envtmpdir}/build/coverage
4040

0 commit comments

Comments
 (0)