Merge pull request #828 from python-babel/fix-ci-2022

akx · web-flow · commit 9a7034018cc2 · 2022-01-25T14:35:17.000+02:00
Fix CI, bump year to 2022
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -12,14 +12,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-18.04, windows-2019, macos-10.15]
-        python-version: [3.6, 3.7, 3.8, 3.9, 3.10-dev, pypy3]
-        exclude:
-          - os: windows-2019
-            python-version: pypy3
-            # TODO: Remove this; see:
-            #       https://github.com/actions/setup-python/issues/151
-            #       https://github.com/tox-dev/tox/issues/1704
-            #       https://foss.heptapod.net/pypy/pypy/-/issues/3331
+        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "pypy3"]
     env:
       BABEL_CLDR_NO_DOWNLOAD_PROGRESS: "1"
       BABEL_CLDR_QUIET: "1"
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2021 by the Babel Team, see AUTHORS for more information.
+Copyright (c) 2013-2022 by the Babel Team, see AUTHORS for more information.
 
 All rights reserved.
 
diff --git 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-2021 by the Babel Team.
+    :copyright: (c) 2013-2022 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/core.py b/babel/core.py
@@ -5,7 +5,7 @@
 
     Core locale representation and locale data access.
 
-    :copyright: (c) 2013-2021 by the Babel Team.
+    :copyright: (c) 2013-2022 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/dates.py b/babel/dates.py
@@ -12,7 +12,7 @@
      * ``LC_ALL``, and
      * ``LANG``
 
-    :copyright: (c) 2013-2021 by the Babel Team.
+    :copyright: (c) 2013-2022 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/lists.py b/babel/lists.py
@@ -11,7 +11,7 @@
      * ``LC_ALL``, and
      * ``LANG``
 
-    :copyright: (c) 2015-2021 by the Babel Team.
+    :copyright: (c) 2015-2022 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git 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-2021 by the Babel Team.
+    :copyright: (c) 2013-2022 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git 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-2021 by the Babel Team.
+    :copyright: (c) 2013-2022 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/messages/__init__.py b/babel/messages/__init__.py
@@ -5,7 +5,7 @@
 
     Support for ``gettext`` message catalogs.
 
-    :copyright: (c) 2013-2021 by the Babel Team.
+    :copyright: (c) 2013-2022 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py
@@ -5,7 +5,7 @@
 
     Data structures for message catalogs.
 
-    :copyright: (c) 2013-2021 by the Babel Team.
+    :copyright: (c) 2013-2022 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/messages/checkers.py b/babel/messages/checkers.py
@@ -7,7 +7,7 @@
 
     :since: version 0.9
 
-    :copyright: (c) 2013-2021 by the Babel Team.
+    :copyright: (c) 2013-2022 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git 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-2021 by the Babel Team.
+    :copyright: (c) 2013-2022 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
@@ -5,7 +5,7 @@
 
     Frontends for the message extraction functionality.
 
-    :copyright: (c) 2013-2021 by the Babel Team.
+    :copyright: (c) 2013-2022 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
@@ -6,7 +6,7 @@
     A simple JavaScript 1.5 lexer which is used for the JavaScript
     extractor.
 
-    :copyright: (c) 2013-2021 by the Babel Team.
+    :copyright: (c) 2013-2022 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
@@ -5,7 +5,7 @@
 
     Writing of files in the ``gettext`` MO (machine object) format.
 
-    :copyright: (c) 2013-2021 by the Babel Team.
+    :copyright: (c) 2013-2022 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/messages/plurals.py b/babel/messages/plurals.py
@@ -5,7 +5,7 @@
 
     Plural form definitions.
 
-    :copyright: (c) 2013-2021 by the Babel Team.
+    :copyright: (c) 2013-2022 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git 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-2021 by the Babel Team.
+    :copyright: (c) 2013-2022 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/numbers.py b/babel/numbers.py
@@ -12,7 +12,7 @@
      * ``LC_ALL``, and
      * ``LANG``
 
-    :copyright: (c) 2013-2021 by the Babel Team.
+    :copyright: (c) 2013-2022 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 # TODO:
diff --git a/babel/plural.py b/babel/plural.py
@@ -5,7 +5,7 @@
 
     CLDR Plural support.  See UTS #35.
 
-    :copyright: (c) 2013-2021 by the Babel Team.
+    :copyright: (c) 2013-2022 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 import decimal
diff --git 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-2021 by the Babel Team.
+    :copyright: (c) 2013-2022 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/util.py b/babel/util.py
@@ -5,7 +5,7 @@
 
     Various utility classes and functions.
 
-    :copyright: (c) 2013-2021 by the Babel Team.
+    :copyright: (c) 2013-2022 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/docs/conf.py b/docs/conf.py
@@ -44,7 +44,7 @@
 
 # General information about the project.
 project = u'Babel'
-copyright = u'2021, The Babel Team'
+copyright = u'2022, 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
diff --git 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-2021 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2022 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
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2021 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2022 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
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2021 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2022 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
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2021 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2022 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
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2021 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2022 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
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2021 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2022 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
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2021 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2022 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
@@ -1428,5 +1428,6 @@ def test_extract_error_code(monkeypatch, capsys):
     cmdinst = configure_cli_command("compile --domain=messages --directory i18n --locale fi_BUGGY")
     assert cmdinst.run() == 1
     out, err = capsys.readouterr()
-    # replace hack below for py2/py3 compatibility
-    assert "unknown named placeholder 'merkki'" in err.replace("u'", "'")
+    if err:
+        # replace hack below for py2/py3 compatibility
+        assert "unknown named placeholder 'merkki'" in err.replace("u'", "'")
diff --git 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-2021 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2022 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
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2021 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2022 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
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2021 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2022 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
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2021 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2022 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
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2021 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2022 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
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2021 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2022 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
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2021 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2022 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
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2021 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2022 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
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2021 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2022 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
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2021 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2022 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tox.ini b/tox.ini
@@ -23,4 +23,4 @@ python =
     3.7: py37
     3.8: py38
     3.9: py39
-    3.10-dev: py310
+    3.10: py310

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright (c) 2013-2021 by the Babel Team, see AUTHORS for more information.`
	`1`	`+Copyright (c) 2013-2022 by the Babel Team, see AUTHORS for more information.`
`2`	`2`
`3`	`3`	`All rights reserved.`
`4`	`4`