Merge pull request #856 from akx/prepare-2.10

Prepare for 2.10

4 files changed, 76 insertions, 15 deletions

diff --git a/AUTHORS b/AUTHORS
index 9cf8f4e..5750516 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -25,6 +25,7 @@ Babel is written and maintained by the Babel team and various contributors:
 - Sachin Paliwal
 - Alex Willmer
 - Daniel Neuhäuser
+- Hugo van Kemenade
 - Miro Hrončok
 - Cédric Krier
 - Luke Plant
@@ -46,6 +47,17 @@ Babel is written and maintained by the Babel team and various contributors:
 - Leonardo Pistone
 - Jun Omae
 - Hyunjun Kim
+- Mohamed Morsy
+- Krzysztof Jagiełło
+- Morgan Wahl
+- farhan5900
+- Sigurd Ljødal
+- Andrii Oriekhov
+- rachele-collin
+- Lukas Winkler
+- Juliette Monsel
+- Álvaro Mondéjar Rubio
+- ruro
 - Alessio Bogon
 - Nikiforov Konstantin
 - Abdullah Javed Nesar
diff --git a/CHANGES.rst b/CHANGES.rst
index 6e84fe9..34e5180 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,65 @@
 Babel Changelog
 ===============
 
+Version 2.10
+------------
+
+Upcoming deprecation
+~~~~~~~~~~~~~~~~~~~~
+
+* The ``get_next_timezone_transition()`` function is marked deprecated in this version and will be removed
+  likely as soon as Babel 2.11.  No replacement for this function is planned; based on discussion in
+  :gh:`716`, it's likely the function is not used in any real code. (:gh:`852`) - Aarni Koskela, Paul Ganssle
+
+Improvements
+~~~~~~~~~~~~
+
+* CLDR: Upgrade to CLDR 41.0. (:gh:`853`) - Aarni Koskela
+
+   * The ``c`` and ``e`` plural form operands introduced in CLDR 40 are parsed, but otherwise unsupported. (:gh:`826`)
+   * Non-nominative forms of units are currently ignored.
+
+* Messages: Implement `--init-missing` option for `pybabel update` (:gh:`785`) - ruro
+* Messages: For ``extract``, you can now replace the built-in ``.*`` / ``_*`` ignored directory patterns
+  with ones of your own. (:gh:`832`) - Aarni Koskela, Kinshuk Dua
+* Messages: Add ``--check`` to verify if catalogs are up-to-date (:gh:`831`) - Krzysztof Jagiełło
+* Messages: Add ``--header-comment`` to override default header comment (:gh:`720`) - Mohamed Hafez Morsy, Aarni Koskela
+* Dates: ``parse_time`` now supports 12-hour clock, and is better at parsing partial times.
+  (:gh:`834`) - Aarni Koskela, David Bauer, Arthur Jovart
+* Dates: ``parse_date`` and ``parse_time`` now raise ``ParseError``, a subclass of ``ValueError``, in certain cases.
+  (:gh:`834`) - Aarni Koskela
+* Dates: ``parse_date`` and ``parse_time`` now accept the ``format`` parameter.
+  (:gh:`834`) - Juliette Monsel, Aarni Koskela
+
+Infrastructure
+~~~~~~~~~~~~
+
+* The internal `babel/_compat.py` module is no more (:gh:`808`) - Hugo van Kemenade
+* Python 3.10 is officially supported (:gh:`809`) - Hugo van Kemenade
+* There's now a friendly GitHub issue template. (:gh:`800`) – Álvaro Mondéjar Rubio
+* Don't use the deprecated format_number function internally or in tests - Aarni Koskela
+* Add GitHub URL for PyPi (:gh:`846`) - Andrii Oriekhov
+* Python 3.12 compatibility: Prefer setuptools imports to distutils imports (:gh:`843`) - Aarni Koskela
+* Python 3.11 compatibility: Add deprecations to l*gettext variants (:gh:`835`) - Aarni Koskela
+* CI: Babel is now tested with PyPy 3.7. (:gh:`851`) - Aarni Koskela
+
+Bugfixes
+~~~~~~~~
+
+* Date formatting: Allow using `other` as fallback form (:gh:`827`) - Aarni Koskela
+* Locales: ``Locale.parse()`` normalizes variant tags to upper case (:gh:`829`) - Aarni Koskela
+* A typo in the plural format for Maltese is fixed. (:gh:`796`) - Lukas Winkler
+* Messages: Catalog date parsing is now timezone independent. (:gh:`701`) - rachele-collin
+* Messages: Fix duplicate locations when writing without lineno (:gh:`837`) - Sigurd Ljødal
+* Messages: Fix missing trailing semicolon in plural form headers (:gh:`848`) - farhan5900
+* CLI: Fix output of ``--list-locales`` to not be a bytes repr (:gh:`845`) - Morgan Wahl
+
+Documentation
+~~~~~~~~~~~~~
+
+* Documentation is now correctly built again, and up to date (:gh:`830`) - Aarni Koskela
+
+
 Version 2.9.1
 -------------
 
diff --git a/Makefile b/Makefile
index 8b7827c..8db9891 100644
--- a/Makefile
+++ b/Makefile
@@ -31,15 +31,7 @@ develop:
 tox-test: import-cldr
 	tox
 
-upload-docs:
-	$(MAKE) -C docs html dirhtml latex
-	$(MAKE) -C docs/_build/latex all-pdf
-	cd docs/_build/; mv html babel-docs; zip -r babel-docs.zip babel-docs; mv babel-docs html
-	rsync -a docs/_build/dirhtml/ pocoo.org:/var/www/babel.pocoo.org/docs/
-	rsync -a docs/_build/latex/Babel.pdf pocoo.org:/var/www/babel.pocoo.org/docs/babel-docs.pdf
-	rsync -a docs/_build/babel-docs.zip pocoo.org:/var/www/babel.pocoo.org/docs/babel-docs.zip
-
 release: import-cldr
 	python scripts/make-release.py
 
-.PHONY: test develop tox-test clean-pyc clean-cldr import-cldr clean release upload-docs clean-test-env standalone-test
+.PHONY: test develop tox-test clean-pyc clean-cldr import-cldr clean release clean-test-env standalone-test
diff --git a/setup.py b/setup.py
index e036bbd..e081219 100755
--- a/setup.py
+++ b/setup.py
@@ -30,15 +30,16 @@ setup(
     name='Babel',
     version=__version__,
     description='Internationalization utilities',
-    long_description="""A collection of tools for internationalizing Python applications.""",
+    long_description='A collection of tools for internationalizing Python applications.',
     author='Armin Ronacher',
     author_email='armin.ronacher@active-4.com',
+    maintainer='Aarni Koskela',
+    maintainer_email='akx@iki.fi',
     license='BSD',
-    url='http://babel.pocoo.org/',
+    url='https://babel.pocoo.org/',
     project_urls={
         'Source': 'https://github.com/python-babel/babel',
     },
-
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',
@@ -66,11 +67,8 @@ setup(
         # higher.
         'pytz>=2015.7',
     ],
-
     cmdclass={'import_cldr': import_cldr},
-
     zip_safe=False,
-
     # Note when adding extractors: builtin extractors we also want to
     # work if packages are not installed to simplify testing.  If you
     # add an extractor here also manually add it to the "extract"