diff options
| author | Aarni Koskela <akx@iki.fi> | 2020-11-11 13:58:54 +0200 |
|---|---|---|
| committer | Aarni Koskela <akx@iki.fi> | 2020-11-11 13:58:54 +0200 |
| commit | 0a3402594d66eb4c8f76c42563a91a8ec88c3b04 (patch) | |
| tree | dc2c5783d46cec7438aabb788332500ec4c928e2 | |
| parent | 6e29f11234a046fca4716b8804f8cd62c7b51166 (diff) | |
| parent | efa0d6d3d7f632ff398705d4f767d953226c16fd (diff) | |
| download | babel-0a3402594d66eb4c8f76c42563a91a8ec88c3b04.tar.gz | |
Merge branch '2.8-maintenance' into master
39 files changed, 50 insertions, 40 deletions
@@ -1,6 +1,16 @@ Babel Changelog =============== +Version 2.8.1 +------------- + +This is solely a patch release to make running tests on Py.test 6+ possible. + +Bugfixes +~~~~~~~~ + +* Support Py.test 6 - Aarni Koskela (#747, #750, #752) + Version 2.8.0 ------------- @@ -1,4 +1,4 @@ -Copyright (c) 2013-2019 by the Babel Team, see AUTHORS for more information. +Copyright (c) 2013-2020 by the Babel Team, see AUTHORS for more information. All rights reserved. diff --git a/babel/__init__.py b/babel/__init__.py index c10a8bd..cbcb4fb 100644 --- a/babel/__init__.py +++ b/babel/__init__.py @@ -13,7 +13,7 @@ access to various locale display names, localized number and date formatting, etc. - :copyright: (c) 2013-2019 by the Babel Team. + :copyright: (c) 2013-2020 by the Babel Team. :license: BSD, see LICENSE for more details. """ @@ -21,4 +21,4 @@ from babel.core import UnknownLocaleError, Locale, default_locale, \ negotiate_locale, parse_locale, get_locale_identifier -__version__ = '2.8.0' +__version__ = '2.8.1' diff --git a/babel/core.py b/babel/core.py index a80807a..a0c35b4 100644 --- a/babel/core.py +++ b/babel/core.py @@ -5,7 +5,7 @@ Core locale representation and locale data access. - :copyright: (c) 2013-2019 by the Babel Team. + :copyright: (c) 2013-2020 by the Babel Team. :license: BSD, see LICENSE for more details. """ diff --git a/babel/dates.py b/babel/dates.py index 1775029..d62d00b 100644 --- a/babel/dates.py +++ b/babel/dates.py @@ -12,7 +12,7 @@ * ``LC_ALL``, and * ``LANG`` - :copyright: (c) 2013-2019 by the Babel Team. + :copyright: (c) 2013-2020 by the Babel Team. :license: BSD, see LICENSE for more details. """ diff --git a/babel/lists.py b/babel/lists.py index ab5a24c..e0bd7ed 100644 --- a/babel/lists.py +++ b/babel/lists.py @@ -11,7 +11,7 @@ * ``LC_ALL``, and * ``LANG`` - :copyright: (c) 2015-2019 by the Babel Team. + :copyright: (c) 2015-2020 by the Babel Team. :license: BSD, see LICENSE for more details. """ diff --git a/babel/localedata.py b/babel/localedata.py index e012abb..f4771d1 100644 --- a/babel/localedata.py +++ b/babel/localedata.py @@ -8,7 +8,7 @@ :note: The `Locale` class, which uses this module under the hood, provides a more convenient interface for accessing the locale data. - :copyright: (c) 2013-2019 by the Babel Team. + :copyright: (c) 2013-2020 by the Babel Team. :license: BSD, see LICENSE for more details. """ diff --git a/babel/localtime/__init__.py b/babel/localtime/__init__.py index aefd8a3..8c9203a 100644 --- a/babel/localtime/__init__.py +++ b/babel/localtime/__init__.py @@ -6,7 +6,7 @@ Babel specific fork of tzlocal to determine the local timezone of the system. - :copyright: (c) 2013-2019 by the Babel Team. + :copyright: (c) 2013-2020 by the Babel Team. :license: BSD, see LICENSE for more details. """ diff --git a/babel/messages/__init__.py b/babel/messages/__init__.py index 5b69675..77c7962 100644 --- a/babel/messages/__init__.py +++ b/babel/messages/__init__.py @@ -5,7 +5,7 @@ Support for ``gettext`` message catalogs. - :copyright: (c) 2013-2019 by the Babel Team. + :copyright: (c) 2013-2020 by the Babel Team. :license: BSD, see LICENSE for more details. """ diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py index ed9e9a0..af1b657 100644 --- a/babel/messages/catalog.py +++ b/babel/messages/catalog.py @@ -5,7 +5,7 @@ Data structures for message catalogs. - :copyright: (c) 2013-2019 by the Babel Team. + :copyright: (c) 2013-2020 by the Babel Team. :license: BSD, see LICENSE for more details. """ diff --git a/babel/messages/checkers.py b/babel/messages/checkers.py index 8c1effa..29add9f 100644 --- a/babel/messages/checkers.py +++ b/babel/messages/checkers.py @@ -7,7 +7,7 @@ :since: version 0.9 - :copyright: (c) 2013-2019 by the Babel Team. + :copyright: (c) 2013-2020 by the Babel Team. :license: BSD, see LICENSE for more details. """ diff --git a/babel/messages/extract.py b/babel/messages/extract.py index e7d7ad7..8f53fa2 100644 --- a/babel/messages/extract.py +++ b/babel/messages/extract.py @@ -13,7 +13,7 @@ The main entry points into the extraction functionality are the functions `extract_from_dir` and `extract_from_file`. - :copyright: (c) 2013-2019 by the Babel Team. + :copyright: (c) 2013-2020 by the Babel Team. :license: BSD, see LICENSE for more details. """ diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py index 4756055..0b65a7c 100644 --- a/babel/messages/frontend.py +++ b/babel/messages/frontend.py @@ -5,7 +5,7 @@ Frontends for the message extraction functionality. - :copyright: (c) 2013-2019 by the Babel Team. + :copyright: (c) 2013-2020 by the Babel Team. :license: BSD, see LICENSE for more details. """ from __future__ import print_function diff --git a/babel/messages/jslexer.py b/babel/messages/jslexer.py index ace0b47..f56c80d 100644 --- a/babel/messages/jslexer.py +++ b/babel/messages/jslexer.py @@ -6,7 +6,7 @@ A simple JavaScript 1.5 lexer which is used for the JavaScript extractor. - :copyright: (c) 2013-2019 by the Babel Team. + :copyright: (c) 2013-2020 by the Babel Team. :license: BSD, see LICENSE for more details. """ from collections import namedtuple diff --git a/babel/messages/mofile.py b/babel/messages/mofile.py index dfd923d..1ab3e4e 100644 --- a/babel/messages/mofile.py +++ b/babel/messages/mofile.py @@ -5,7 +5,7 @@ Writing of files in the ``gettext`` MO (machine object) format. - :copyright: (c) 2013-2019 by the Babel Team. + :copyright: (c) 2013-2020 by the Babel Team. :license: BSD, see LICENSE for more details. """ diff --git a/babel/messages/plurals.py b/babel/messages/plurals.py index 8123458..4755cfc 100644 --- a/babel/messages/plurals.py +++ b/babel/messages/plurals.py @@ -5,7 +5,7 @@ Plural form definitions. - :copyright: (c) 2013-2019 by the Babel Team. + :copyright: (c) 2013-2020 by the Babel Team. :license: BSD, see LICENSE for more details. """ diff --git a/babel/messages/pofile.py b/babel/messages/pofile.py index b86dd40..b8cb469 100644 --- a/babel/messages/pofile.py +++ b/babel/messages/pofile.py @@ -6,7 +6,7 @@ Reading and writing of files in the ``gettext`` PO (portable object) format. - :copyright: (c) 2013-2019 by the Babel Team. + :copyright: (c) 2013-2020 by the Babel Team. :license: BSD, see LICENSE for more details. """ diff --git a/babel/numbers.py b/babel/numbers.py index bbc5e21..0303f05 100644 --- a/babel/numbers.py +++ b/babel/numbers.py @@ -12,7 +12,7 @@ * ``LC_ALL``, and * ``LANG`` - :copyright: (c) 2013-2019 by the Babel Team. + :copyright: (c) 2013-2020 by the Babel Team. :license: BSD, see LICENSE for more details. """ # TODO: diff --git a/babel/plural.py b/babel/plural.py index 1e2b273..3c9a3e6 100644 --- a/babel/plural.py +++ b/babel/plural.py @@ -5,7 +5,7 @@ CLDR Plural support. See UTS #35. - :copyright: (c) 2013-2019 by the Babel Team. + :copyright: (c) 2013-2020 by the Babel Team. :license: BSD, see LICENSE for more details. """ import re diff --git a/babel/support.py b/babel/support.py index 8d905ed..d6fc56c 100644 --- a/babel/support.py +++ b/babel/support.py @@ -8,7 +8,7 @@ .. note: the code in this module is not used by Babel itself - :copyright: (c) 2013-2019 by the Babel Team. + :copyright: (c) 2013-2020 by the Babel Team. :license: BSD, see LICENSE for more details. """ diff --git a/babel/util.py b/babel/util.py index c371bad..a5d40c5 100644 --- a/babel/util.py +++ b/babel/util.py @@ -5,7 +5,7 @@ Various utility classes and functions. - :copyright: (c) 2013-2019 by the Babel Team. + :copyright: (c) 2013-2020 by the Babel Team. :license: BSD, see LICENSE for more details. """ diff --git a/docs/conf.py b/docs/conf.py index 83c5bf2..7b5584a 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -44,7 +44,7 @@ master_doc = 'index' # General information about the project. project = u'Babel' -copyright = u'2019, The Babel Team' +copyright = u'2020, The Babel Team' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -53,7 +53,7 @@ copyright = u'2019, The Babel Team' # The short X.Y version. version = '2.8' # The full version, including alpha/beta/rc tags. -release = '2.8.0' +release = '2.8.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/scripts/dump_data.py b/scripts/dump_data.py index e452248..57439b9 100755 --- a/scripts/dump_data.py +++ b/scripts/dump_data.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team +# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team # All rights reserved. # # This software is licensed as described in the file LICENSE, which diff --git a/scripts/dump_global.py b/scripts/dump_global.py index 8db55f2..a27b316 100755 --- a/scripts/dump_global.py +++ b/scripts/dump_global.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team +# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team # All rights reserved. # # This software is licensed as described in the file LICENSE, which diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py index aab2888..2977c6e 100755 --- a/scripts/import_cldr.py +++ b/scripts/import_cldr.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team +# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team # All rights reserved. # # This software is licensed as described in the file LICENSE, which diff --git a/tests/messages/test_catalog.py b/tests/messages/test_catalog.py index f31dca3..2d9e31d 100644 --- a/tests/messages/test_catalog.py +++ b/tests/messages/test_catalog.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team +# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team # All rights reserved. # # This software is licensed as described in the file LICENSE, which diff --git a/tests/messages/test_checkers.py b/tests/messages/test_checkers.py index ec84500..bf813bc 100644 --- a/tests/messages/test_checkers.py +++ b/tests/messages/test_checkers.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team +# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team # All rights reserved. # # This software is licensed as described in the file LICENSE, which diff --git a/tests/messages/test_extract.py b/tests/messages/test_extract.py index 2f41ddc..38979cd 100644 --- a/tests/messages/test_extract.py +++ b/tests/messages/test_extract.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team +# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team # All rights reserved. # # This software is licensed as described in the file LICENSE, which diff --git a/tests/messages/test_frontend.py b/tests/messages/test_frontend.py index ad3ea0d..38165b3 100644 --- a/tests/messages/test_frontend.py +++ b/tests/messages/test_frontend.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team +# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team # All rights reserved. # # This software is licensed as described in the file LICENSE, which diff --git a/tests/messages/test_mofile.py b/tests/messages/test_mofile.py index b1851f2..395b9fb 100644 --- a/tests/messages/test_mofile.py +++ b/tests/messages/test_mofile.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team +# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team # All rights reserved. # # This software is licensed as described in the file LICENSE, which diff --git a/tests/messages/test_plurals.py b/tests/messages/test_plurals.py index bdca8f6..62c7708 100644 --- a/tests/messages/test_plurals.py +++ b/tests/messages/test_plurals.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team +# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team # All rights reserved. # # This software is licensed as described in the file LICENSE, which diff --git a/tests/messages/test_pofile.py b/tests/messages/test_pofile.py index 214ddf5..2db7f67 100644 --- a/tests/messages/test_pofile.py +++ b/tests/messages/test_pofile.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team +# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team # All rights reserved. # # This software is licensed as described in the file LICENSE, which diff --git a/tests/test_core.py b/tests/test_core.py index c146aae..53b9d18 100644 --- a/tests/test_core.py +++ b/tests/test_core.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team +# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team # All rights reserved. # # This software is licensed as described in the file LICENSE, which diff --git a/tests/test_dates.py b/tests/test_dates.py index 423f737..48ed05c 100644 --- a/tests/test_dates.py +++ b/tests/test_dates.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team +# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team # All rights reserved. # # This software is licensed as described in the file LICENSE, which diff --git a/tests/test_localedata.py b/tests/test_localedata.py index dbacba0..83cd669 100644 --- a/tests/test_localedata.py +++ b/tests/test_localedata.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team +# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team # All rights reserved. # # This software is licensed as described in the file LICENSE, which diff --git a/tests/test_numbers.py b/tests/test_numbers.py index 3db5f33..739fd1f 100644 --- a/tests/test_numbers.py +++ b/tests/test_numbers.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team +# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team # All rights reserved. # # This software is licensed as described in the file LICENSE, which diff --git a/tests/test_plural.py b/tests/test_plural.py index c54d07a..1a9fbe5 100644 --- a/tests/test_plural.py +++ b/tests/test_plural.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team +# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team # All rights reserved. # # This software is licensed as described in the file LICENSE, which diff --git a/tests/test_support.py b/tests/test_support.py index 966cb4e..456425e 100644 --- a/tests/test_support.py +++ b/tests/test_support.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team +# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team # All rights reserved. # # This software is licensed as described in the file LICENSE, which diff --git a/tests/test_util.py b/tests/test_util.py index b9343aa..dbd6378 100644 --- a/tests/test_util.py +++ b/tests/test_util.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team +# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team # All rights reserved. # # This software is licensed as described in the file LICENSE, which |