Skip to content

Commit ff70172

Browse files
committed
Fix sphinx's conf.py to handle SCons versions like 4.6.0.post1
1 parent 6cbb718 commit ff70172

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

CHANGES.txt

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,22 @@ NOTE: The 4.0.0 Release of SCons dropped Python 2.7 Support
88
NOTE: 4.3.0 now requires Python 3.6.0 and above. Python 3.5.x is no longer supported
99

1010
RELEASE VERSION/DATE TO BE FILLED IN LATER
11+
12+
From Ataf Fazledin Ahamed:
13+
- Use of NotImplemented instead of NotImplementedError for special methods
14+
of _ListVariable class
15+
16+
From William Deegan:
17+
- Fix sphinx config to handle SCons versions with post such as: 4.6.0.post1
18+
1119
From Michał Górny:
1220
- Remove unecessary dependencies on pypi packages from setup.cfg
1321

1422
From Sten Grüner:
1523
- Fix of the --debug=sconscript option to return exist statements when using return
1624
statement with stop flag enabled
1725

18-
From Ataf Fazledin Ahamed:
19-
- Use of NotImplemented instead of NotImplementedError for special methods
20-
of _ListVariable class
26+
2127

2228
RELEASE 4.6.0 - Sun, 19 Nov 2023 17:22:20 -0700
2329

RELEASE.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ DOCUMENTATION
5656
DEVELOPMENT
5757
-----------
5858

59-
- List visible changes in the way SCons is developed
59+
- Fix sphinx config to handle SCons versions with post such as: 4.6.0.post1
6060

6161
Thanks to the following contributors listed below for their contributions to this release.
6262
==========================================================================================
6363
.. code-block:: text
6464

65-
git shortlog --no-merges -ns 4.0.1..HEAD
65+
git shortlog --no-merges -ns 4.6.0..HEAD

doc/sphinx/conf.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,9 @@
9898
# The full version, including alpha/beta/rc tags:
9999
release = __version__
100100
# The short X.Y version.
101-
major, minor, _ = __version__.split('.')
102-
version = '.'.join([major, minor])
101+
version_parts = __version__.split('.')
102+
major, minor, patch = version_parts[0:3]
103+
version = '.'.join([major, minor,patch])
103104

104105
# The language for content autogenerated by Sphinx. Refer to documentation
105106
# for a list of supported languages.

0 commit comments

Comments
 (0)