Skip to content

Commit

Permalink
Merge pull request python-babel#650 from python-babel/become-270
Browse files Browse the repository at this point in the history
Become 2.7.0
  • Loading branch information
akx authored May 27, 2019
2 parents 4b6cd34 + 6aa3032 commit 8b684d5
Show file tree
Hide file tree
Showing 40 changed files with 103 additions and 49 deletions.
16 changes: 15 additions & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,21 @@ Babel is written and maintained by the Babel team and various contributors:
- Michael Birtwell
- Jonas Borgström
- Kevin Deldycke
- Jon Dufresne
- Ville Skyttä
- Hugo
- Heungsub Lee
- Jakob Schnitzer
- Sachin Paliwal
- Alex Willmer
- Daniel Neuhäuser
- Cédric Krier
- Luke Plant
- Jennifer Wang
- Lukas Balaga
- sudheesh001
- Jon Dufresne
- Miro Hrončok
- Changaco
- Xavier Fernandez
- KO. Mattsson
- Sébastien Diemer
Expand All @@ -41,6 +45,16 @@ Babel is written and maintained by the Babel team and various contributors:
- Leonardo Pistone
- Jun Omae
- Hyunjun Kim
- BT-sschmid
- Alberto Mardegan
- mondeja
- NotAFile
- Julien Palard
- Brian Cappello
- Serban Constantin
- Bryn Truscott
- Chris
- Charly C
- PTrottier
- xmo-odoo
- StevenJ
Expand Down
44 changes: 42 additions & 2 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Babel Changelog
===============

UNRELEASED
----------
Version 2.7.0
-------------

Possibly incompatible changes
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand All @@ -14,6 +14,46 @@ strange and we'll try to help!
* General: Internal uses of ``babel.util.odict`` have been replaced with
``collections.OrderedDict`` from The Python standard library.

Improvements
~~~~~~~~~~~~

* CLDR: Upgrade to CLDR 35.1 - Alberto Mardegan, Aarni Koskela (#626, #643)
* General: allow anchoring path patterns to the start of a string - Brian Cappello (#600)
* General: Bumped version requirement on pytz - @chrisbrake (#592)
* Messages: `pybabel compile`: exit with code 1 if errors were encountered - Aarni Koskela (#647)
* Messages: Add omit-header to update_catalog - Cédric Krier (#633)
* Messages: Catalog update: keep user comments from destination by default - Aarni Koskela (#648)
* Messages: Skip empty message when writing mo file - Cédric Krier (#564)
* Messages: Small fixes to avoid crashes on badly formatted .po files - Bryn Truscott (#597)
* Numbers: `parse_decimal()` `strict` argument and `suggestions` - Charly C (#590)
* Numbers: don't repeat suggestions in parse_decimal strict - Serban Constantin (#599)
* Numbers: implement currency formatting with long display names - Luke Plant (#585)
* Numbers: parse_decimal(): assume spaces are equivalent to non-breaking spaces when not in strict mode - Aarni Koskela (#649)
* Performance: Cache locale_identifiers() - Aarni Koskela (#644)

Bugfixes
~~~~~~~~

* CLDR: Skip alt=... for week data (minDays, firstDay, weekendStart, weekendEnd) - Aarni Koskela (#634)
* Dates: Fix wrong weeknumber for 31.12.2018 - BT-sschmid (#621)
* Locale: Avoid KeyError trying to get data on WindowsXP - mondeja (#604)
* Locale: get_display_name(): Don't attempt to concatenate variant information to None - Aarni Koskela (#645)
* Messages: pofile: Add comparison operators to _NormalizedString - Aarni Koskela (#646)
* Messages: pofile: don't crash when message.locations can't be sorted - Aarni Koskela (#646)

Tooling & docs
~~~~~~~~~~~~~~

* Docs: Remove all references to deprecated easy_install - Jon Dufresne (#610)
* Docs: Switch print statement in docs to print function - NotAFile
* Docs: Update all pypi.python.org URLs to pypi.org - Jon Dufresne (#587)
* Docs: Use https URLs throughout project where available - Jon Dufresne (#588)
* Support: Add testing and document support for Python 3.7 - Jon Dufresne (#611)
* Support: Test on Python 3.8-dev - Aarni Koskela (#642)
* Support: Using ABCs from collections instead of collections.abc is deprecated. - Julien Palard (#609)
* Tests: Fix conftest.py compatibility with pytest 4.3 - Miro Hrončok (#635)
* Tests: Update pytest and pytest-cov - Miro Hrončok (#635)

Version 2.6.0
-------------

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2013-2018 by the Babel Team, see AUTHORS for more information.
Copyright (c) 2013-2019 by the Babel Team, see AUTHORS for more information.

All rights reserved.

Expand Down
4 changes: 2 additions & 2 deletions babel/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
access to various locale display names, localized number and date
formatting, etc.
:copyright: (c) 2013-2018 by the Babel Team.
:copyright: (c) 2013-2019 by the Babel Team.
:license: BSD, see LICENSE for more details.
"""

from babel.core import UnknownLocaleError, Locale, default_locale, \
negotiate_locale, parse_locale, get_locale_identifier


__version__ = '2.6.0'
__version__ = '2.7.0'
2 changes: 1 addition & 1 deletion babel/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Core locale representation and locale data access.
:copyright: (c) 2013-2018 by the Babel Team.
:copyright: (c) 2013-2019 by the Babel Team.
:license: BSD, see LICENSE for more details.
"""

Expand Down
10 changes: 5 additions & 5 deletions babel/dates.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* ``LC_ALL``, and
* ``LANG``
:copyright: (c) 2013-2018 by the Babel Team.
:copyright: (c) 2013-2019 by the Babel Team.
:license: BSD, see LICENSE for more details.
"""

Expand Down Expand Up @@ -1506,12 +1506,12 @@ def get_week_number(self, day_of_period, day_of_week=None):

if 7 - first_day >= self.locale.min_week_days:
week_number += 1

if self.locale.first_week_day == 0:
# Correct the weeknumber in case of iso-calendar usage (first_week_day=0).
# Correct the weeknumber in case of iso-calendar usage (first_week_day=0).
# If the weeknumber exceeds the maximum number of weeks for the given year
# we must count from zero.For example the above calculation gives week 53
# for 2018-12-31. By iso-calender definition 2018 has a max of 52
# we must count from zero.For example the above calculation gives week 53
# for 2018-12-31. By iso-calender definition 2018 has a max of 52
# weeks, thus the weeknumber must be 53-52=1.
max_weeks = date(year=self.value.year, day=28, month=12).isocalendar()[1]
if week_number > max_weeks:
Expand Down
2 changes: 1 addition & 1 deletion babel/lists.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* ``LC_ALL``, and
* ``LANG``
:copyright: (c) 2015, 2018 by the Babel Team.
:copyright: (c) 2015-2019 by the Babel Team.
:license: BSD, see LICENSE for more details.
"""

Expand Down
2 changes: 1 addition & 1 deletion babel/localedata.py
Original file line number Diff line number Diff line change
Expand Up @@ -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-2018 by the Babel Team.
:copyright: (c) 2013-2019 by the Babel Team.
:license: BSD, see LICENSE for more details.
"""

Expand Down
2 changes: 1 addition & 1 deletion babel/localtime/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
Babel specific fork of tzlocal to determine the local timezone
of the system.
:copyright: (c) 2013-2018 by the Babel Team.
:copyright: (c) 2013-2019 by the Babel Team.
:license: BSD, see LICENSE for more details.
"""

Expand Down
2 changes: 1 addition & 1 deletion babel/messages/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Support for ``gettext`` message catalogs.
:copyright: (c) 2013-2018 by the Babel Team.
:copyright: (c) 2013-2019 by the Babel Team.
:license: BSD, see LICENSE for more details.
"""

Expand Down
2 changes: 1 addition & 1 deletion babel/messages/catalog.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Data structures for message catalogs.
:copyright: (c) 2013-2018 by the Babel Team.
:copyright: (c) 2013-2019 by the Babel Team.
:license: BSD, see LICENSE for more details.
"""

Expand Down
2 changes: 1 addition & 1 deletion babel/messages/checkers.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
:since: version 0.9
:copyright: (c) 2013-2018 by the Babel Team.
:copyright: (c) 2013-2019 by the Babel Team.
:license: BSD, see LICENSE for more details.
"""

Expand Down
2 changes: 1 addition & 1 deletion babel/messages/extract.py
Original file line number Diff line number Diff line change
Expand Up @@ -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-2018 by the Babel Team.
:copyright: (c) 2013-2019 by the Babel Team.
:license: BSD, see LICENSE for more details.
"""

Expand Down
2 changes: 1 addition & 1 deletion babel/messages/frontend.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Frontends for the message extraction functionality.
:copyright: (c) 2013-2018 by the Babel Team.
:copyright: (c) 2013-2019 by the Babel Team.
:license: BSD, see LICENSE for more details.
"""
from __future__ import print_function
Expand Down
2 changes: 1 addition & 1 deletion babel/messages/jslexer.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
A simple JavaScript 1.5 lexer which is used for the JavaScript
extractor.
:copyright: (c) 2013-2018 by the Babel Team.
:copyright: (c) 2013-2019 by the Babel Team.
:license: BSD, see LICENSE for more details.
"""
from collections import namedtuple
Expand Down
2 changes: 1 addition & 1 deletion babel/messages/mofile.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Writing of files in the ``gettext`` MO (machine object) format.
:copyright: (c) 2013-2018 by the Babel Team.
:copyright: (c) 2013-2019 by the Babel Team.
:license: BSD, see LICENSE for more details.
"""

Expand Down
2 changes: 1 addition & 1 deletion babel/messages/plurals.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Plural form definitions.
:copyright: (c) 2013-2018 by the Babel Team.
:copyright: (c) 2013-2019 by the Babel Team.
:license: BSD, see LICENSE for more details.
"""

Expand Down
2 changes: 1 addition & 1 deletion babel/messages/pofile.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
Reading and writing of files in the ``gettext`` PO (portable object)
format.
:copyright: (c) 2013-2018 by the Babel Team.
:copyright: (c) 2013-2019 by the Babel Team.
:license: BSD, see LICENSE for more details.
"""

Expand Down
2 changes: 1 addition & 1 deletion babel/numbers.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* ``LC_ALL``, and
* ``LANG``
:copyright: (c) 2013-2018 by the Babel Team.
:copyright: (c) 2013-2019 by the Babel Team.
:license: BSD, see LICENSE for more details.
"""
# TODO:
Expand Down
2 changes: 1 addition & 1 deletion babel/plural.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
CLDR Plural support. See UTS #35.
:copyright: (c) 2013-2018 by the Babel Team.
:copyright: (c) 2013-2019 by the Babel Team.
:license: BSD, see LICENSE for more details.
"""
import re
Expand Down
2 changes: 1 addition & 1 deletion babel/support.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
.. note: the code in this module is not used by Babel itself
:copyright: (c) 2013-2018 by the Babel Team.
:copyright: (c) 2013-2019 by the Babel Team.
:license: BSD, see LICENSE for more details.
"""

Expand Down
2 changes: 1 addition & 1 deletion babel/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Various utility classes and functions.
:copyright: (c) 2013-2018 by the Babel Team.
:copyright: (c) 2013-2019 by the Babel Team.
:license: BSD, see LICENSE for more details.
"""

Expand Down
6 changes: 3 additions & 3 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,16 @@

# General information about the project.
project = u'Babel'
copyright = u'2018, The Babel Team'
copyright = u'2019, 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
# built documents.
#
# The short X.Y version.
version = '2.6'
version = '2.7'
# The full version, including alpha/beta/rc tags.
release = '2.6.0'
release = '2.7.0'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion scripts/dump_data.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
# All rights reserved.
#
# This software is licensed as described in the file LICENSE, which
Expand Down
2 changes: 1 addition & 1 deletion scripts/dump_global.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
# All rights reserved.
#
# This software is licensed as described in the file LICENSE, which
Expand Down
2 changes: 1 addition & 1 deletion scripts/import_cldr.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
# All rights reserved.
#
# This software is licensed as described in the file LICENSE, which
Expand Down
2 changes: 1 addition & 1 deletion tests/messages/test_catalog.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
# All rights reserved.
#
# This software is licensed as described in the file LICENSE, which
Expand Down
2 changes: 1 addition & 1 deletion tests/messages/test_checkers.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
# All rights reserved.
#
# This software is licensed as described in the file LICENSE, which
Expand Down
2 changes: 1 addition & 1 deletion tests/messages/test_extract.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
# All rights reserved.
#
# This software is licensed as described in the file LICENSE, which
Expand Down
2 changes: 1 addition & 1 deletion tests/messages/test_frontend.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
# All rights reserved.
#
# This software is licensed as described in the file LICENSE, which
Expand Down
2 changes: 1 addition & 1 deletion tests/messages/test_mofile.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
# All rights reserved.
#
# This software is licensed as described in the file LICENSE, which
Expand Down
2 changes: 1 addition & 1 deletion tests/messages/test_plurals.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
# All rights reserved.
#
# This software is licensed as described in the file LICENSE, which
Expand Down
Loading

0 comments on commit 8b684d5

Please sign in to comment.