Skip to content

Commit 92ac9d4

Browse files
committed
Consolidate all version strings to future/__init__.py
1 parent 9100b02 commit 92ac9d4

File tree

5 files changed

+8
-26
lines changed

5 files changed

+8
-26
lines changed

docs/conf.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
from __future__ import absolute_import, print_function
1515
import sys, os
16+
from future import __version__
1617
import sphinx_bootstrap_theme
1718

1819
# If extensions (or modules to document with autodoc) are in another directory,
@@ -52,8 +53,8 @@
5253
#
5354
# if 'dev' in release:
5455
# release = release.split('dev')[0] + 'dev'
55-
release = '0.12.5-dev'
56-
version = release # was: '.'.join(release.split('.')[:2])
56+
# release = '0.12.5-dev'
57+
# version = release # was: '.'.join(release.split('.')[:2])
5758

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

docs/credits.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ Patches
5555
- Nicolas Delaby
5656
- Corey Farwell
5757
- Eric Firing
58+
- Lion Krischer
5859
- Marcin Kuzminski
5960
- Joshua Landau
6061
- German Larrain

libfuturize/main.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@
6565
from future.builtins import *
6666
import future
6767
import future.utils
68-
69-
__version__ = '0.12.5-dev'
68+
from future import __version__
7069

7170
import sys
7271
import logging
@@ -83,11 +82,6 @@
8382

8483
fixer_pkg = 'libfuturize.fixes'
8584

86-
if __version__ != future.__version__:
87-
warn('The libfuturize and future packages have different versions. '
88-
'This may break the futurize script. Please ensure the versions '
89-
'are consistent.')
90-
9185

9286
def main(args=None):
9387
"""Main program.

libpasteurize/main.py

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
"""
3232

3333
from __future__ import (absolute_import, print_function, unicode_literals)
34-
from future.builtins import *
3534

3635
import sys
3736
import logging
@@ -40,16 +39,10 @@
4039
from lib2to3 import refactor
4140

4241
import future
42+
from future import __version__
43+
from future.builtins import *
4344
from libpasteurize.fixes import fix_names
4445

45-
__version__ = '0.12.5-dev'
46-
47-
if __version__ != future.__version__:
48-
warn('The libfuturize and future packages have different versions. '
49-
'This may break the pasteurize script. Please ensure the versions '
50-
'are consistent.')
51-
52-
5346

5447
def main(args=None):
5548
"""Main program.

past/__init__.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,8 @@
8888
# from past.builtins import *
8989

9090
from past.translation import install_hooks as autotranslate
91+
from future import __version__, __copyright__, __license__
9192

9293
__title__ = 'past'
9394
__author__ = 'Ed Schofield'
94-
__license__ = 'MIT'
95-
__copyright__ = 'Copyright 2014 Python Charmers Pty Ltd'
96-
__ver_major__ = 0
97-
__ver_minor__ = 12
98-
__ver_patch__ = 5
99-
__ver_sub__ = '-dev'
100-
__version__ = "%d.%d.%d%s" % (__ver_major__, __ver_minor__,
101-
__ver_patch__, __ver_sub__)
10295

0 commit comments

Comments
 (0)