summaryrefslogtreecommitdiff
path: root/sphinx/__init__.py
diff options
context:
space:
mode:
Diffstat (limited to 'sphinx/__init__.py')
-rw-r--r--sphinx/__init__.py14
1 files changed, 5 insertions, 9 deletions
diff --git a/sphinx/__init__.py b/sphinx/__init__.py
index 8caea80d0..574ede346 100644
--- a/sphinx/__init__.py
+++ b/sphinx/__init__.py
@@ -19,10 +19,6 @@ from subprocess import PIPE
from .deprecation import RemovedInNextVersionWarning
-if False:
- # For type annotation
- from typing import Any # NOQA
-
# by default, all DeprecationWarning under sphinx package will be emit.
# Users can avoid this by using environment variable: PYTHONWARNINGS=
@@ -32,8 +28,8 @@ if 'PYTHONWARNINGS' not in os.environ:
warnings.filterwarnings('ignore', "'U' mode is deprecated",
DeprecationWarning, module='docutils.io')
-__version__ = '3.1.0+'
-__released__ = '3.1.0' # used when Sphinx builds its own docs
+__version__ = '4.0.0+'
+__released__ = '4.0.0' # used when Sphinx builds its own docs
#: Version info for better programmatic use.
#:
@@ -43,7 +39,7 @@ __released__ = '3.1.0' # used when Sphinx builds its own docs
#:
#: .. versionadded:: 1.2
#: Before version 1.2, check the string ``sphinx.__version__``.
-version_info = (3, 1, 0, 'beta', 0)
+version_info = (4, 0, 0, 'beta', 0)
package_dir = path.abspath(path.dirname(__file__))
@@ -57,8 +53,8 @@ if __version__.endswith('+'):
try:
ret = subprocess.run(['git', 'show', '-s', '--pretty=format:%h'],
cwd=package_dir,
- stdout=PIPE, stderr=PIPE)
+ stdout=PIPE, stderr=PIPE, encoding='ascii')
if ret.stdout:
- __display_version__ += '/' + ret.stdout.decode('ascii').strip()
+ __display_version__ += '/' + ret.stdout.strip()
except Exception:
pass