|
 |
4772082 |
From 865c54896e6158c1195e5ec8352f300cbf10920f Mon Sep 17 00:00:00 2001
|
|
|
4772082 |
From: Bryan Van de Ven <bryan@bokeh.org>
|
|
|
4772082 |
Date: Tue, 2 Mar 2021 21:53:55 -0800
|
|
|
4772082 |
Subject: [PATCH] Bryanv/2 3 1 forwardports (#10987)
|
|
|
4772082 |
|
|
|
4772082 |
* Add missing comma in example code (#10973)
|
|
|
4772082 |
|
|
|
4772082 |
* update to versioneer 0.19 (#10969)
|
|
|
4772082 |
|
|
|
4772082 |
* update to versioneer 0.19
|
|
|
4772082 |
|
|
|
4772082 |
* unused loop var
|
|
|
4772082 |
|
|
|
4772082 |
* Add note re. Chrome/MacOS bug (#10964)
|
|
|
4772082 |
|
|
|
4772082 |
* Add note re. Chrome/MacOS bug
|
|
|
4772082 |
|
|
|
4772082 |
* Make wording consistent with preceding paragraph
|
|
|
4772082 |
|
|
|
4772082 |
* Link to GH issue
|
|
|
4772082 |
|
|
|
4772082 |
* Add information about Bokeh channel for installation (#10953)
|
|
|
4772082 |
|
|
|
4772082 |
* Add info about Bokeh channel on Anaconda
|
|
|
4772082 |
|
|
|
4772082 |
* Add info on new releases
|
|
|
4772082 |
|
|
|
4772082 |
Co-authored-by: Timo Cornelius Metzger <ticon@gmx.net>
|
|
|
4772082 |
---
|
|
|
4772082 |
bokeh/_version.py | 65 ++---
|
|
|
4772082 |
bokeh/models/widgets/inputs.py | 8 +
|
|
|
4772082 |
.../source/docs/first_steps/first_steps_9.rst | 2 +-
|
|
|
4772082 |
.../source/docs/first_steps/installation.rst | 8 +
|
|
|
4772082 |
versioneer.py | 234 ++++++++++--------
|
|
|
4772082 |
5 files changed, 188 insertions(+), 129 deletions(-)
|
|
|
4772082 |
|
|
|
4772082 |
diff --git a/versioneer.py b/versioneer.py
|
|
|
4772082 |
index 60e4efb714f..eaf1aba67bd 100644
|
|
|
4772082 |
--- a/versioneer.py
|
|
|
4772082 |
+++ b/versioneer.py
|
|
|
4772082 |
@@ -337,9 +331,9 @@ def get_config_from_root(root):
|
|
|
4772082 |
# configparser.NoOptionError (if it lacks "VCS="). See the docstring at
|
|
|
4772082 |
# the top of versioneer.py for instructions on writing your setup.cfg .
|
|
|
4772082 |
setup_cfg = os.path.join(root, "setup.cfg")
|
|
|
4772082 |
- parser = configparser.SafeConfigParser()
|
|
|
4772082 |
+ parser = configparser.ConfigParser()
|
|
|
4772082 |
with open(setup_cfg, "r") as f:
|
|
|
4772082 |
- parser.readfp(f)
|
|
|
4772082 |
+ parser.read_file(f)
|
|
|
4772082 |
VCS = parser.get("versioneer", "VCS") # mandatory
|
|
|
4772082 |
|
|
|
4772082 |
def get(parser, name):
|