Skip to content

Commit 0923955

Browse files
committed
Update CHANGELOG.md, AUTHORS.md, documentation
1 parent e882df9 commit 0923955

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

AUTHORS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
- Ville Weijo (@vweijo)
1212
- Ward Poelmans (@wpoely86)
1313

14-
This list was obtained 2018-04-27 by running `git shortlog -sn`
14+
This list was obtained 2018-05-01 by running `git shortlog -sn`

CHANGELOG.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22

33
## [Unreleased]
44

5+
## [Version 1.2.1] - 2018-05-01
6+
7+
### Fixed
8+
9+
- Import of local copy of the `pyparsing` module in Getkw. Thanks @loriab for
10+
the fix.
11+
- The `conf.py` documentation build script is restored to normal operation.
12+
513
## [Version 1.2.0] - 2018-04-27
614

715
### Added
@@ -559,7 +567,8 @@
559567

560568
## v1.0.0 - 2014-09-30 [YANKED]
561569

562-
[Unreleased]: https://github.com/PCMSolver/pcmsolver/compare/v1.2.0...HEAD
570+
[Unreleased]: https://github.com/PCMSolver/pcmsolver/compare/v1.2.1...HEAD
571+
[Version 1.2.0]: https://github.com/PCMSolver/pcmsolver/compare/v1.2.0...v1.2.1
563572
[Version 1.2.0]: https://github.com/PCMSolver/pcmsolver/compare/v1.2.0-rc1...v1.2.0
564573
[Version 1.2.0-rc1]: https://github.com/PCMSolver/pcmsolver/compare/v1.1.12...v1.2.0-rc1
565574
[Version 1.1.12]: https://github.com/PCMSolver/pcmsolver/compare/v1.1.11...v1.1.12

doc/programmers/versioning.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ This is the step-by-step guide to releasing a new version of PCMSolver:
7171
This list was obtained 2018-03-02 by running `git shortlog -sn`
7272

7373
#. **CHECK** that the ``.mailmap`` file is up-to-date.
74+
#. **CHECK** that the documentation builds locally.
7475
#. **ACT** to check all the changed files in.
7576
#. **OBSERVE** current versioning state
7677

0 commit comments

Comments
 (0)