diff options
| author | Ned Deily <nad@python.org> | 2019-12-18 20:41:32 -0500 |
|---|---|---|
| committer | Ned Deily <nad@python.org> | 2019-12-18 20:41:32 -0500 |
| commit | e5c7f464d1b6bf153189da67c870e759635aa73e (patch) | |
| tree | d528097cc3d8608ba503e68e0f31c69c61409a45 | |
| parent | b8bbdf049b0472b8edc4298bfa61e62e3a584e98 (diff) | |
| parent | 43364a7ae01fbe4288ef42622259a0038ce1edcc (diff) | |
| download | cpython-git-e5c7f464d1b6bf153189da67c870e759635aa73e.tar.gz | |
Merge tag 'v3.7.6' into 3.7
| -rw-r--r-- | Include/patchlevel.h | 6 | ||||
| -rw-r--r-- | Lib/pydoc_data/topics.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS.d/3.7.6.rst | 7 | ||||
| -rw-r--r-- | README.rst | 4 |
4 files changed, 13 insertions, 6 deletions
diff --git a/Include/patchlevel.h b/Include/patchlevel.h index ad8f804cb7..ee26960323 100644 --- a/Include/patchlevel.h +++ b/Include/patchlevel.h @@ -19,11 +19,11 @@ #define PY_MAJOR_VERSION 3 #define PY_MINOR_VERSION 7 #define PY_MICRO_VERSION 6 -#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_GAMMA -#define PY_RELEASE_SERIAL 1 +#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL +#define PY_RELEASE_SERIAL 0 /* Version as a string */ -#define PY_VERSION "3.7.6rc1+" +#define PY_VERSION "3.7.6" /*--end constants--*/ /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2. diff --git a/Lib/pydoc_data/topics.py b/Lib/pydoc_data/topics.py index 7fee53bfc8..0438309135 100644 --- a/Lib/pydoc_data/topics.py +++ b/Lib/pydoc_data/topics.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Autogenerated by Sphinx on Wed Dec 11 00:13:54 2019 +# Autogenerated by Sphinx on Wed Dec 18 13:43:31 2019 topics = {'assert': 'The "assert" statement\n' '**********************\n' '\n' diff --git a/Misc/NEWS.d/3.7.6.rst b/Misc/NEWS.d/3.7.6.rst new file mode 100644 index 0000000000..87d5f97cd4 --- /dev/null +++ b/Misc/NEWS.d/3.7.6.rst @@ -0,0 +1,7 @@ +.. bpo: 38295 +.. date: 2019-12-17-03-43-04 +.. nonce: hgDvlB +.. release date: 2019-12-18 +.. section: macOS + +Prevent failure of test_relative_path in test_py_compile on macOS Catalina. diff --git a/README.rst b/README.rst index 276506b143..27425dd449 100644 --- a/README.rst +++ b/README.rst @@ -1,5 +1,5 @@ -This is Python version 3.7.6 candidate 1+ -========================================= +This is Python version 3.7.6 +============================ .. image:: https://travis-ci.org/python/cpython.svg?branch=3.7 :alt: CPython build status on Travis CI |