Skip to content

Commit

Permalink
Merge pull request #4456 from bdbaddog/sphinx_handle_post_release_ver…
Browse files Browse the repository at this point in the history
…sions

Fix sphinx's conf.py to handle SCons versions like 4.6.0.post1
  • Loading branch information
bdbaddog authored Jan 2, 2024
2 parents 6cbb718 + ff70172 commit 9b01a5c
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
12 changes: 9 additions & 3 deletions CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,22 @@ NOTE: The 4.0.0 Release of SCons dropped Python 2.7 Support
NOTE: 4.3.0 now requires Python 3.6.0 and above. Python 3.5.x is no longer supported

RELEASE VERSION/DATE TO BE FILLED IN LATER

From Ataf Fazledin Ahamed:
- Use of NotImplemented instead of NotImplementedError for special methods
of _ListVariable class

From William Deegan:
- Fix sphinx config to handle SCons versions with post such as: 4.6.0.post1

From Michał Górny:
- Remove unecessary dependencies on pypi packages from setup.cfg

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

From Ataf Fazledin Ahamed:
- Use of NotImplemented instead of NotImplementedError for special methods
of _ListVariable class


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

Expand Down
4 changes: 2 additions & 2 deletions RELEASE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ DOCUMENTATION
DEVELOPMENT
-----------

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

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

git shortlog --no-merges -ns 4.0.1..HEAD
git shortlog --no-merges -ns 4.6.0..HEAD
5 changes: 3 additions & 2 deletions doc/sphinx/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,9 @@
# The full version, including alpha/beta/rc tags:
release = __version__
# The short X.Y version.
major, minor, _ = __version__.split('.')
version = '.'.join([major, minor])
version_parts = __version__.split('.')
major, minor, patch = version_parts[0:3]
version = '.'.join([major, minor,patch])

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

0 comments on commit 9b01a5c

Please sign in to comment.