From d9d3fc32f0b7584af5c371639bc7882449bb6f6d Mon Sep 17 00:00:00 2001 From: David Lord Date: Wed, 1 Nov 2017 07:57:12 -0700 Subject: [PATCH] clean up MANIFEST.in clean up make-release.py for py3 add rst extension to CHANGES for GitHub clean up changelog formatting --- CHANGES => CHANGES.rst | 232 ++++++++++++++++++++++------------------ MANIFEST.in | 20 ++-- docs/changelog.rst | 2 +- scripts/make-release.py | 76 +++++++------ 4 files changed, 184 insertions(+), 146 deletions(-) rename CHANGES => CHANGES.rst (83%) diff --git a/CHANGES b/CHANGES.rst similarity index 83% rename from CHANGES rename to CHANGES.rst index f55718c3d..0f5d2c6db 100644 --- a/CHANGES +++ b/CHANGES.rst @@ -1,27 +1,29 @@ -Jinja2 Changelog -================ +Jinja Changelog +=============== + Version 2.10 ------------ -(feature release, release date to be decided) -- Added a new extension node called `OverlayScope` which can be used to +released on November 8th 2017 + +- Added a new extension node called ``OverlayScope`` which can be used to create an unoptimized scope that will look up all variables from a derived context. -- Added an `in` test that works like the in operator. This can be used - in combination with `reject` and `select`. -- Added `previtem` and `nextitem` to loop contexts, providing access to the +- Added an ``in`` test that works like the in operator. This can be used + in combination with ``reject`` and ``select``. +- Added ``previtem`` and ``nextitem`` to loop contexts, providing access to the previous/next item in the loop. If such an item does not exist, the value is undefined. -- Added `changed(*values)` to loop contexts, providing an easy way of checking - whether a value has changed since the last iteration (or rather since the - last call of the method) -- Added a `namespace` function that creates a special object which allows - attribute assignment using the `set` tag. This can be used to carry data +- Added ``changed(*values)`` to loop contexts, providing an easy way of + checking whether a value has changed since the last iteration (or rather + since the last call of the method) +- Added a ``namespace`` function that creates a special object which allows + attribute assignment using the ``set`` tag. This can be used to carry data across scopes, e.g. from a loop body to code that comes after the loop. -- Added a `trimmed` modifier to `{% trans %}` to strip linebreaks and +- Added a ``trimmed`` modifier to ``{% trans %}`` to strip linebreaks and surrounding whitespace. Also added a new policy to enable this for all - `trans` blocks. + ``trans`` blocks. - The ``random`` filter is no longer incorrectly constant folded and will produce a new random choice each time the template is rendered. (`#478`_) - Added a ``unique`` filter. (`#469`_) @@ -34,6 +36,13 @@ Version 2.10 - Add a ``NativeEnvironment`` that renders templates to native Python types instead of strings. (`#708`_) - Added filter support to the block ``set`` tag. (`#489`_) +- ``tojson`` filter marks output as safe to match documented behavior. + (`#718`_) +- Resolved a bug where getting debug locals for tracebacks could + modify template context. +- Fixed a bug where having many ``{% elif ... %}`` blocks resulted in a + "too many levels of indentation" error. These blocks now compile to + native ``elif ..:`` instead of ``else: if ..:`` (`#759`_) .. _#469: https://github.com/pallets/jinja/pull/469 .. _#475: https://github.com/pallets/jinja/pull/475 @@ -45,48 +54,41 @@ Version 2.10 .. _#685: https://github.com/pallets/jinja/pull/685 .. _#692: https://github.com/pallets/jinja/pull/692 .. _#708: https://github.com/pallets/jinja/pull/708 - -Version 2.9.7 -------------- - -(bugfix release, in development) - -- ``tojson`` filter marks output as safe to match documented behavior. - (`#718`_) -- Resolved a bug where getting debug locals for tracebacks could - modify template context. -- Fixed a bug where having many `{% elif ... %}` blocks resulted in a - "too many levels of indentation" error. These blocks now compile to - native `elif ..:` instead of `else: if ..:` (#759) - .. _#718: https://github.com/pallets/jinja/pull/718 +.. _#759: https://github.com/pallets/jinja/pull/759 + Version 2.9.6 ------------- + (bugfix release, released on April 3rd 2017) - Fixed custom context behavior in fast resolve mode (#675) + Version 2.9.5 ------------- + (bugfix release, released on January 28th 2017) -- Restored the original repr of the internal `_GroupTuple` because this +- Restored the original repr of the internal ``_GroupTuple`` because this caused issues with ansible and it was an unintended change. (#654) -- Added back support for custom contexts that override the old `resolve` +- Added back support for custom contexts that override the old ``resolve`` method since it was hard for people to spot that this could cause a regression. - Correctly use the buffer for the else block of for loops. This caused invalid syntax errors to be caused on 2.x and completely wrong behavior on Python 3 (#669) -- Resolve an issue where the `{% extends %}` tag could not be used with +- Resolve an issue where the ``{% extends %}`` tag could not be used with async environments. (#668) - Reduce memory footprint slightly by reducing our unicode database dump we use for identifier matching on Python 3 (#666) - Fixed autoescaping not working for macros in async compilation mode. (#671) + Version 2.9.4 ------------- + (bugfix release, released on January 10th 2017) - Solved some warnings for string literals. (#646) @@ -96,11 +98,13 @@ Version 2.9.4 - Resolved an issue where top-level output silencing after known extend blocks could generate invalid code when blocks where contained in if statements. (#651) -- Made the `truncate.leeway` default configurable to improve compatibility +- Made the ``truncate.leeway`` default configurable to improve compatibility with older templates. + Version 2.9.3 ------------- + (bugfix release, released on January 8th 2017) - Restored the use of blocks in macros to the extend that was possible @@ -111,15 +115,17 @@ Version 2.9.3 intended behavior in all situations however it does not restore the old behavior where limited assignments to outer scopes was possible. For more information and a discussion see #641 -- Resolved an issue where `block scoped` would not take advantage of the +- Resolved an issue where ``block scoped`` would not take advantage of the new scoping rules. In some more exotic cases a variable overriden in a local scope would not make it into a block. -- Change the code generation of the `with` statement to be in line with the +- Change the code generation of the ``with`` statement to be in line with the new scoping rules. This resolves some unlikely bugs in edge cases. This - also introduces a new internal `With` node that can be used by extensions. + also introduces a new internal ``With`` node that can be used by extensions. + Version 2.9.2 ------------- + (bugfix release, released on January 8th 2017) - Fixed a regression that caused for loops to not be able to use the same @@ -132,21 +138,24 @@ Version 2.9.2 explicit keyword argument for caller if it's given an explicit default. (#642) + Version 2.9.1 ------------- + (bugfix release, released on January 7th 2017) - Resolved a regression with call block scoping for macros. Nested caller blocks that used the same identifiers as outer macros could refer to the wrong variable incorrectly. + Version 2.9 ----------- (codename Derivation, released on January 7th 2017) - Change cache key definition in environment. This fixes a performance regression introduced in 2.8. -- Added support for `generator_stop` on supported Python versions +- Added support for ``generator_stop`` on supported Python versions (Python 3.5 and later) - Corrected a long standing issue with operator precedence of math operations not being what was expected. @@ -158,18 +167,18 @@ Version 2.9 - Restored behavior of Cycler for Python 3 users. - Subtraction now follows the same behavior as other operators on undefined values. -- `map` and friends will now give better error messages if you forgot to +- ``map`` and friends will now give better error messages if you forgot to quote the parameter. - Depend on MarkupSafe 0.23 or higher. -- Improved the `truncate` filter to support better truncation in case +- Improved the ``truncate`` filter to support better truncation in case the string is barely truncated at all. - Change the logic for macro autoescaping to be based on the runtime autoescaping information at call time instead of macro define time. -- Ported a modified version of the `tojson` filter from Flask to Jinja2 +- Ported a modified version of the ``tojson`` filter from Flask to Jinja2 and hooked it up with the new policy framework. -- Block sets are now marked `safe` by default. +- Block sets are now marked ``safe`` by default. - On Python 2 the asciification of ASCII strings can now be disabled with - the `compiler.ascii_str` policy. + the ``compiler.ascii_str`` policy. - Tests now no longer accept an arbitrary expression as first argument but a restricted one. This means that you can now properly use multiple tests in one expression without extra parentheses. In particular you can @@ -179,36 +188,33 @@ Version 2.9 designers and developers expect. There is now no more magic difference between the different include and import constructs. Context is now always propagated the same way. The only remaining differences is the defaults - for `with context` and `without context`. -- The `with` and `autoescape` tags are now built-in. -- Added the new `select_autoescape` function which helps configuring better + for ``with context`` and ``without context``. +- The ``with`` and ``autoescape`` tags are now built-in. +- Added the new ``select_autoescape`` function which helps configuring better autoescaping easier. - -Version 2.8.2 -------------- - -(bugfix release, unreleased) - - Fixed a runtime error in the sandbox when attributes of async generators were accessed. + Version 2.8.1 ------------- (bugfix release, released on December 29th 2016) -- Fixed the `for_qs` flag for `urlencode`. -- Fixed regression when applying `int` to non-string values. +- Fixed the ``for_qs`` flag for ``urlencode``. +- Fixed regression when applying ``int`` to non-string values. - SECURITY: if the sandbox mode is used format expressions are now sandboxed with the same rules as in Jinja. This solves various information leakage problems that can occur with format strings. + Version 2.8 ----------- + (codename Replacement, released on July 26th 2015) -- Added `target` parameter to urlize function. -- Added support for `followsymlinks` to the file system loader. +- Added ``target`` parameter to urlize function. +- Added support for ``followsymlinks`` to the file system loader. - The truncate filter now counts the length. - Added equalto filter that helps with select filters. - Changed cache keys to use absolute file names if available @@ -225,39 +231,45 @@ Version 2.8 - Fixed ``is number`` test to accept long integers in all Python versions. - Changed ``is number`` to accept Decimal as a number. - Added a check for default arguments followed by non-default arguments. This - change makes ``{% macro m(x, y=1, z) %}...{% endmacro %}`` a syntax error. The - previous behavior for this code was broken anyway (resulting in the default - value being applied to `y`). + change makes ``{% macro m(x, y=1, z) %}...{% endmacro %}`` a syntax error. + The previous behavior for this code was broken anyway (resulting in the + default value being applied to ``y``). - Add ability to use custom subclasses of ``jinja2.compiler.CodeGenerator`` and ``jinja2.runtime.Context`` by adding two new attributes to the environment - (`code_generator_class` and `context_class`) (pull request ``#404``). + (``code_generator_class`` and ``context_class``) (pull request ``#404``). - added support for context/environment/evalctx decorator functions on the finalize callback of the environment. - escape query strings for urlencode properly. Previously slashes were not escaped in that place. - Add 'base' parameter to 'int' filter. + Version 2.7.3 ------------- + (bugfix release, released on June 6th 2014) - Security issue: Corrected the security fix for the cache folder. This fix was provided by RedHat. + Version 2.7.2 ------------- + (bugfix release, released on January 10th 2014) - Prefix loader was not forwarding the locals properly to inner loaders. This is now fixed. - Security issue: Changed the default folder for the filesystem cache to be - user specific and read and write protected on UNIX systems. See `Debian bug - 734747`_ for more information. + user specific and read and write protected on UNIX systems. See + `Debian bug 734747`_ for more information. .. _Debian bug 734747: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=734747 + Version 2.7.1 ------------- + (bugfix release, released on August 7th 2013) - Fixed a bug with ``call_filter`` not working properly on environment @@ -271,8 +283,10 @@ Version 2.7.1 - Fixed a bug with the title filter not working on already uppercase strings. + Version 2.7 ----------- + (codename Translation, released on May 20th 2013) - Choice and prefix loaders now dispatch source and template lookup @@ -280,30 +294,32 @@ Version 2.7 advertised. - Fixed filesizeformat. - Added a non-silent option for babel extraction. -- Added `urlencode` filter that automatically quotes values for +- Added ``urlencode`` filter that automatically quotes values for URL safe usage with utf-8 as only supported encoding. If applications want to change this encoding they can override the filter. -- Added `keep-trailing-newline` configuration to environments and +- Added ``keep-trailing-newline`` configuration to environments and templates to optionally preserve the final trailing newline. -- Accessing `last` on the loop context no longer causes the iterator +- Accessing ``last`` on the loop context no longer causes the iterator to be consumed into a list. - Python requirement changed: 2.6, 2.7 or >= 3.3 are required now, supported by same source code, using the "six" compatibility library. -- Allow `contextfunction` and other decorators to be applied to `__call__`. -- Added support for changing from newline to different signs in the `wordwrap` +- Allow ``contextfunction`` and other decorators to be applied to ``__call__``. +- Added support for changing from newline to different signs in the ``wordwrap`` filter. - Added support for ignoring memcache errors silently. - Added support for keeping the trailing newline in templates. - Added finer grained support for stripping whitespace on the left side of blocks. -- Added `map`, `select`, `reject`, `selectattr` and `rejectattr` +- Added ``map``, ``select``, ``reject``, ``selectattr`` and ``rejectattr`` filters. -- Added support for `loop.depth` to figure out how deep inside a recursive +- Added support for ``loop.depth`` to figure out how deep inside a recursive loop the code is. - Disabled py_compile for pypy and python 3. + Version 2.6 ----------- + (codename Convolution, released on July 24th 2011) - internal attributes now raise an internal attribute error now instead @@ -336,23 +352,29 @@ Version 2.6 - added a mapping test to see if an object is a dict or an object with a similar interface. + Version 2.5.5 ------------- + (re-release of 2.5.4 with built documentation removed for filesize. Released on October 18th 2010) - built documentation is no longer part of release. + Version 2.5.4 ------------- + (bugfix release, released on October 17th 2010) - Fixed extensions not loading properly with overlays. - Work around a bug in cpython for the debugger that causes segfaults on 64bit big-endian architectures. + Version 2.5.3 ------------- + (bugfix release, released on October 17th 2010) - fixed an operator precedence error introduced in 2.5.2. Statements @@ -360,6 +382,7 @@ Version 2.5.3 first part of the expression ("(-foo).bar") instead of the more correct "-(foo.bar)". + Version 2.5.2 ------------- (bugfix release, released on August 18th 2010) @@ -368,8 +391,10 @@ Version 2.5.2 might still have from it (``--with-speedups``). - fixed a packaging error that excluded the new debug support. + Version 2.5.1 ------------- + (bugfix release, released on August 17th 2010) - StopIteration exceptions raised by functions called from templates @@ -378,7 +403,7 @@ Version 2.5.1 abort template execution) - improved performance of macro calls slightly. - babel extraction can now properly extract newstyle gettext calls. -- using the variable `num` in newstyle gettext for something else +- using the variable ``num`` in newstyle gettext for something else than the pluralize count will no longer raise a :exc:`KeyError`. - removed builtin markup class and switched to markupsafe. For backwards compatibility the pure Python implementation still exists but is @@ -387,8 +412,10 @@ Version 2.5.1 by default because it is only relevant for Python 2.4 - fixed an issue with unary operators having the wrong precedence. + Version 2.5 ----------- + (codename Incoherence, released on May 29th 2010) - improved the sort filter (should have worked like this for a @@ -400,14 +427,18 @@ Version 2.5 - it's now possible to register extensions after an environment was created. + Version 2.4.1 ------------- + (bugfix release, released on April 20th 2010) - fixed an error reporting bug for undefineds. + Version 2.4 ----------- + (codename Correlation, released on April 13th 2010) - the environment template loading functions now transparently @@ -423,16 +454,20 @@ Version 2.4 for evaluation contexts (:ref:`eval-context`). - extensions have a priority now. + Version 2.3.1 ------------- + (bugfix release, released on February 19th 2010) - fixed an error reporting bug on all python versions - fixed an error reporting bug on Python 2.4 + Version 2.3 ----------- -(3000 Pythons, released on February 10th 2010) + +(codename 3000 Pythons, released on February 10th 2010) - fixes issue with code generator that causes unbound variables to be generated if set was used in if-blocks and other small @@ -451,19 +486,23 @@ Version 2.3 - added with-statement extension. - experimental Python 3 support. + Version 2.2.1 ------------- + (bugfix release, released on September 14th 2009) - fixes some smaller problems for Jinja2 on Jython. + Version 2.2 ----------- + (codename Kong, released on September 13th 2009) - Include statements can now be marked with ``ignore missing`` to skip non existing templates. -- Priority of `not` raised. It's now possible to write `not foo in bar` +- Priority of ``not`` raised. It's now possible to write `not foo in bar` as an alias to `foo not in bar` like in python. Previously the grammar required parentheses (`not (foo in bar)`) which was odd. - Fixed a bug that caused syntax errors when defining macros or using the @@ -474,97 +513,84 @@ Version 2.2 - Fixed a bug that caused internal errors if names where used as iteration variable and regular variable *after* the loop if that variable was unused *before* the loop. (#331) -- Added support for optional `scoped` modifier to blocks. +- Added support for optional ``scoped`` modifier to blocks. - Added support for line-comments. -- Added the `meta` module. +- Added the ``meta`` module. - Renamed (undocumented) attribute "overlay" to "overlayed" on the environment because it was clashing with a method of the same name. - speedup extension is now disabled by default. + Version 2.1.1 ------------- -(Bugfix release) + +(bugfix release, released on December 25th 2008) - Fixed a translation error caused by looping over empty recursive loops. + Version 2.1 ----------- + (codename Yasuzō, released on November 23rd 2008) - fixed a bug with nested loops and the special loop variable. Before the change an inner loop overwrote the loop variable from the outer one after iteration. - - fixed a bug with the i18n extension that caused the explicit pluralization block to look up the wrong variable. - - fixed a limitation in the lexer that made ``{{ foo.0.0 }}`` impossible. - - index based subscribing of variables with a constant value returns an undefined object now instead of raising an index error. This was a bug caused by eager optimizing. - -- the i18n extension looks up `foo.ugettext` now followed by `foo.gettext` +- the i18n extension looks up ``foo.ugettext`` now followed by ``foo.gettext`` if an translations object is installed. This makes dealing with custom translations classes easier. - - fixed a confusing behavior with conditional extending. loops were partially executed under some conditions even though they were not part of a visible area. - -- added `sort` filter that works like `dictsort` but for arbitrary sequences. - +- added ``sort`` filter that works like ``dictsort`` but for arbitrary sequences. - fixed a bug with empty statements in macros. - - implemented a bytecode cache system. (:ref:`bytecode-cache`) - - the template context is now weakref-able - - inclusions and imports "with context" forward all variables now, not only the initial context. - -- added a cycle helper called `cycler`. - -- added a joining helper called `joiner`. - -- added a `compile_expression` method to the environment that allows compiling +- added a cycle helper called ``cycler``. +- added a joining helper called ``joiner``. +- added a ``compile_expression`` method to the environment that allows compiling of Jinja expressions into callable Python objects. - - fixed an escaping bug in urlize + Version 2.0 ----------- + (codename jinjavitus, released on July 17th 2008) - the subscribing of objects (looking up attributes and items) changed from slightly. It's now possible to give attributes or items a higher priority by either using dot-notation lookup or the bracket syntax. This also - changed the AST slightly. `Subscript` is gone and was replaced with + changed the AST slightly. ``Subscript`` is gone and was replaced with :class:`~jinja2.nodes.Getitem` and :class:`~jinja2.nodes.Getattr`. For more information see :ref:`the implementation details `. - - added support for preprocessing and token stream filtering for extensions. This would allow extensions to allow simplified gettext calls in template data and something similar. - - added :meth:`jinja2.environment.TemplateStream.dump`. - - added missing support for implicit string literal concatenation. ``{{ "foo" "bar" }}`` is equivalent to ``{{ "foobar" }}`` - -- `else` is optional for conditional expressions. If not given it evaluates - to `false`. - +- ``else`` is optional for conditional expressions. If not given it evaluates + to ``false``. - improved error reporting for undefined values by providing a position. - -- `filesizeformat` filter uses decimal prefixes now per default and can be +- ``filesizeformat`` filter uses decimal prefixes now per default and can be set to binary mode with the second parameter. - - fixed bug in finalizer + Version 2.0rc1 -------------- + (no codename, released on June 9th 2008) - first release of Jinja2 diff --git a/MANIFEST.in b/MANIFEST.in index 0d6db7c5e..27bf519c1 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,12 +1,8 @@ -include MANIFEST.in Makefile CHANGES LICENSE AUTHORS run-tests.py -recursive-include docs * -recursive-include custom_fixers * -recursive-include ext * -recursive-include artwork * -recursive-include examples * -recursive-include jinja2/testsuite/res * -recursive-exclude docs/_build * -recursive-exclude jinja2 *.pyc -recursive-exclude docs *.pyc -recursive-exclude jinja2 *.pyo -recursive-exclude docs *.pyo +include AUTHORS CHANGES.rst LICENSE +global-exclude *.py[co] +graft artwork +graft docs +prune docs/_build +graft examples +graft ext +graft tests diff --git a/docs/changelog.rst b/docs/changelog.rst index 9f1148426..b22e7beef 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,3 +1,3 @@ .. module:: jinja2 -.. include:: ../CHANGES +.. include:: ../CHANGES.rst diff --git a/scripts/make-release.py b/scripts/make-release.py index 6ea716296..51c370080 100644 --- a/scripts/make-release.py +++ b/scripts/make-release.py @@ -10,39 +10,42 @@ :copyright: (c) 2011 by Armin Ronacher. :license: BSD, see LICENSE for more details. """ -import sys +from __future__ import print_function + import os import re -from datetime import datetime, date -from subprocess import Popen, PIPE - -try: - import wheel -except ImportError: - wheel = None +import sys +from datetime import date, datetime +from subprocess import PIPE, Popen _date_strip_re = re.compile(r'(?<=\d)(st|nd|rd|th)') def parse_changelog(): - with open('CHANGES') as f: + with open('CHANGES.rst') as f: lineiter = iter(f) for line in lineiter: match = re.search('^Version\s+(.*)', line.strip()) + if match is None: continue - length = len(match.group(1)) + version = match.group(1).strip() - if lineiter.next().count('-') != len(match.group(0)): + + if next(lineiter).count('-') != len(match.group(0)): continue + while 1: - change_info = lineiter.next().strip() + change_info = next(lineiter).strip() + if change_info: break - match = re.search(r'(?:codename (.*),\s*)?' - r'released on (\w+\s+\d+\w+\s+\d+)(?i)', - change_info) + match = re.search( + r'(?:codename (.*),\s*)?released on (\w+\s+\d+\w+\s+\d+)(?i)', + change_info + ) + if match is None: continue @@ -52,9 +55,10 @@ def parse_changelog(): def bump_version(version): try: - parts = map(int, version.split('.')) + parts = [int(i) for i in version.split('.')] except ValueError: fail('Current version is not numeric') + parts[-1] += 1 return '.'.join(map(str, parts)) @@ -66,13 +70,17 @@ def parse_date(string): def set_filename_version(filename, version_number, pattern): changed = [] + def inject_version(match): before, old, after = match.groups() changed.append(True) return before + version_number + after + with open(filename) as f: - contents = re.sub(r"^(\s*%s\s*=\s*')(.+?)(')(?sm)" % pattern, - inject_version, f.read()) + contents = re.sub( + r"^(\s*%s\s*=\s*')(.+?)(')(?sm)" % pattern, + inject_version, f.read() + ) if not changed: fail('Could not find %s in %s', pattern, filename) @@ -92,23 +100,23 @@ def set_setup_version(version): def build_and_upload(): - cmd = [sys.executable, 'setup.py', 'sdist', 'bdist_wheel', 'upload'] - if wheel is not None: - cmd.insert(4, 'bdist_wheel') + cmd = [sys.executable, 'setup.py', 'sdist', 'bdist_wheel'] Popen(cmd).wait() def fail(message, *args): - print >> sys.stderr, 'Error:', message % args + print('Error:', message % args, file=sys.stderr) sys.exit(1) def info(message, *args): - print >> sys.stderr, message % args + print(message % args, file=sys.stderr) def get_git_tags(): - return set(Popen(['git', 'tag'], stdout=PIPE).communicate()[0].splitlines()) + return set( + Popen(['git', 'tag'], stdout=PIPE).communicate()[0].splitlines() + ) def git_is_clean(): @@ -129,27 +137,35 @@ def main(): os.chdir(os.path.join(os.path.dirname(__file__), '..')) rv = parse_changelog() + if rv is None: fail('Could not parse changelog') version, release_date, codename = rv dev_version = bump_version(version) + '.dev' - info('Releasing %s (codename %s, release date %s)', - version, codename, release_date.strftime('%d/%m/%Y')) + info( + 'Releasing %s (codename %s, release date %s)', + version, codename, release_date.strftime('%d/%m/%Y') + ) tags = get_git_tags() if version in tags: fail('Version "%s" is already tagged', version) + if release_date.date() != date.today(): - fail('Release date is not today (%s != %s)', release_date.date(), date.today()) + fail( + 'Release date is not today (%s != %s)', + release_date.date(), date.today() + ) if not git_is_clean(): fail('You have uncommitted changes in git') - if wheel is None: - print ('Warning: You need to install the wheel package ' - 'to upload a wheel distribution.') + try: + import wheel + except ImportError: + fail('You need to install the wheel package.') set_init_version(version) set_setup_version(version)