Author: Matti Picus <[email protected]>
Branch: py3.6
Changeset: r96086:c8a4e88385a8
Date: 2019-02-19 09:57 +0200
http://bitbucket.org/pypy/pypy/changeset/c8a4e88385a8/
Log: fix marginally useful whatsnew for branch
diff --git a/pypy/doc/test/test_whatsnew.py b/pypy/doc/test/test_whatsnew.py
--- a/pypy/doc/test/test_whatsnew.py
+++ b/pypy/doc/test/test_whatsnew.py
@@ -89,7 +89,7 @@
startrev, documented = parse_doc(last_whatsnew)
merged, branch = get_merged_branches(ROOT, startrev, '')
merged.discard('default')
- merged.discard('py3.5')
+ merged.discard('py3.6')
merged.discard('')
not_documented = merged.difference(documented)
not_merged = documented.difference(merged)
@@ -100,7 +100,7 @@
print '\n'.join(not_merged)
print
assert not not_documented
- if branch == 'py3.5':
+ if branch == 'py3.6':
assert not not_merged
else:
assert branch in documented, 'Please document this branch before
merging: %s' % branch
diff --git a/pypy/doc/whatsnew-pypy3-head.rst b/pypy/doc/whatsnew-pypy3-head.rst
--- a/pypy/doc/whatsnew-pypy3-head.rst
+++ b/pypy/doc/whatsnew-pypy3-head.rst
@@ -2,9 +2,10 @@
What's new in PyPy3 7.0+
========================
-.. this is the revision after release-pypy3.5-v7.0
-.. startrev: 9d2fa7c63b7c
+.. this is the revision after release-pypy3.6-v7.0
+.. startrev: 33fe3b2cf186
-.. branch: unicode-utf8-py3
+.. branch: py3.5
-Use utf8 instead of rpython-level unicode
\ No newline at end of file
+Merge in py.35 and use this branch as the primary pypy3 one
+
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
