Skip to content

Commit

Permalink
Updated changelog
Browse files Browse the repository at this point in the history
  • Loading branch information
FlorianWilhelm committed Mar 21, 2018
1 parent 33dfcfb commit 1435852
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 9 deletions.
1 change: 1 addition & 0 deletions AUTHORS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ Contributors
* Anderson Bravalheri <andersonbravalheri@gmail.com>
* David Hilton <david.hilton.p@gmail.com>
* Pablo Aguiar <scorphus@gmail.com>
* Vicky C Lau <vcl2@sfu.ca>
16 changes: 11 additions & 5 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,29 @@ Changelog
Current version
===============

Version 3.0.2, 2018-03-20
Version 3.0.2, 2018-03-21
-------------------------

- Updated setuptools_scm to version 1.17.0
- Fix wrong docstring in skeleton.py about entry_points, issue #147
- Fix error with setuptools version 39.0 and above, issue #148
- Fixes in documentation, thanks Vicky

Version 2.5.9, 2018-03-20
-------------------------
Version 2.5.10, 2018-03-21
--------------------------

- Updated setuptools_scm to version 1.16.1
- Fix error with setuptools version 39.0 and above, issue #148
- Updated setuptools_scm to version 1.17.0


Older versions
==============

Version 2.5.9, 2018-03-20
-------------------------

- Updated setuptools_scm to version 1.16.1
- Fix error with setuptools version 39.0 and above, issue #148

Version 3.0.1, 2018-02-13
-------------------------

Expand Down
8 changes: 4 additions & 4 deletions src/pyscaffold/integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
import sys
from distutils.cmd import Command

from pyscaffold.contrib import ptr
from pyscaffold.contrib.setuptools_scm import get_version, discover
from pyscaffold.utils import check_setuptools_version
from pyscaffold.repo import get_git_root
from .contrib import ptr
from .contrib.setuptools_scm import get_version, discover
from .utils import check_setuptools_version
from .repo import get_git_root


def version2str(version):
Expand Down

0 comments on commit 1435852

Please sign in to comment.