merge 1.2 branch (1.2.5.post1)

biocommons · Feb 1, 2019 · a2130fb · a2130fb
2 parents 4afa1e7 + 24de291
commit a2130fb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 20 deletions.
diff --git a/.hgtags b/.hgtags
@@ -33,3 +33,4 @@ fec459c74d4d774225509a7e518f4ca075bbda1d 1.2.2
 b4348f21bb7244c398ba7cf7132363f99bc3f1b5 1.2.4
 093bf68e2c1da73b49c1eb9ef0c98d09735daf7f 1.2.5
 22d40457ccd03be7e20810383c7a6e6029046377 1.2.5.post0
+c54f31d20f30dd2285ca3f11242a41b8749b4b29 1.2.5.post1
diff --git a/doc/changelog/1.2/1.2.5.clog b/doc/changelog/1.2/1.2.5.clog
@@ -2,11 +2,10 @@ clog format: 1; -*-outline-*-
 * 1.2.5 (2019-02-01)
 Changes since 1.2.4 (2018-09-28).
 ** Special Attention
-** Deprecations
+Python 2.7 versions of hgvs are now deprecated and will become
+unsupported on April 1, 2019.  See
+`Migrating-to-Python-3.6 <https://github.com/biocommons/org/wiki/Migrating-to-Python-3.6>`__.
 ** Bug Fixes
-** New Features
-** Other Changes
+*** Fixes #546: relevant transcripts should be wholly within transcript bounds [86412924353b]
 ** Internal and Developer Changes
-*** Added changelog for 1.2.5 [17a7d42]
-*** Fixes #546: relevant transcripts should be wholly within transcript bounds [9ebe355]
 *** fix testing bug that caused py3.5 env to be undefined on travis [5146b07]
diff --git a/doc/changelog/1.2/1.2.5.rst b/doc/changelog/1.2/1.2.5.rst
@@ -7,26 +7,16 @@ Changes since 1.2.4 (2018-09-28).
 Special Attention
 $$$$$$$$$$$$$$$$$$
 
-
-Deprecations
-$$$$$$$$$$$$$
-
+Python 2.7 versions of hgvs are now deprecated and will become
+unsupported on April 1, 2019.  See
+`Migrating-to-Python-3.6 <https://github.com/biocommons/org/wiki/Migrating-to-Python-3.6>`__.
 
 Bug Fixes
 $$$$$$$$$$
 
-
-New Features
-$$$$$$$$$$$$$
-
-
-Other Changes
-$$$$$$$$$$$$$$
-
+* Fixes `#546 <https://github.com/biocommons/hgvs/issues/546/>`_: relevant transcripts should be wholly within transcript bounds [`86412924353b <https://github.com/biocommons/hgvs/commit/86412924353b>`_]
 
 Internal and Developer Changes
 $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$
 
-* Added changelog for 1.2.5 [`17a7d42 <https://github.com/biocommons/hgvs/commit/17a7d42>`_]
-* Fixes `#546 <https://github.com/biocommons/hgvs/issues/546/>`_: relevant transcripts should be wholly within transcript bounds [`9ebe355 <https://github.com/biocommons/hgvs/commit/9ebe355>`_]
 * fix testing bug that caused py3.5 env to be undefined on travis [`5146b07 <https://github.com/biocommons/hgvs/commit/5146b07>`_]
diff --git a/doc/changelog/1.2/Makefile b/doc/changelog/1.2/Makefile
@@ -39,7 +39,7 @@ next.clog:: hg-git-remap.pl
 	clogger . | perl -p0  hg-git-remap.pl >$@
 
 .PRECIOUS: %.clog
-%.clog:: hg-git-remap.pl
+%.clog:: # hg-git-remap.pl
 	clogger $* | perl -p0  hg-git-remap.pl >$@