Skip to content

Commit

Permalink
Merge branch '1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
bitprophet committed Jun 20, 2018
2 parents 82da420 + 160453d commit 055efd7
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
# public test helpers. Bleh.
fabric>=2.1.3,<3
Sphinx>=1.4,<1.7
releases>=0.6.1,<2.0
releases>=1.6,<2.0
alabaster>=0.7.7,<2.0
wheel==0.24
twine==1.11.0
invocations>=1.2.0,<2.0
invocations>=1.3.0,<2.0
pytest-relaxed==1.1.2
coverage==4.4.2
pytest-cov==2.4.0
Expand Down
1 change: 1 addition & 0 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
Changelog
=========

- :release:`1.0.1 <2018-06-20>`
- :bug:`23` Fix some outstanding Python 2-isms (use of ``iteritems``) in
`.info.distro_name` and `.info.distro_family`, as well as modules which
imported those -- such as `.packages`.
Expand Down
2 changes: 1 addition & 1 deletion patchwork/_version.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
__version_info__ = (1, 0, 0)
__version_info__ = (1, 0, 1)
__version__ = ".".join(map(str, __version_info__))

0 comments on commit 055efd7

Please sign in to comment.