Merge branch 'master' into v0.12

setup.py

@@ -1,23 +1,29 @@
 #! /usr/bin/env python
 #
-# Copyright (C) 2012-2020 Michael Waskom
+# Copyright (C) 2012-2022 Michael Waskom
 
 DESCRIPTION = "seaborn: statistical data visualization"
 LONG_DESCRIPTION = """\
-Seaborn is a library for making statistical graphics in Python. It is built on top of `matplotlib <https://matplotlib.org/>`_ and closely integrated with `pandas <https://pandas.pydata.org/>`_ data structures.
+
+Seaborn is a library for making statistical graphics in Python. It is built on
+top of `matplotlib <https://matplotlib.org/>`_ and closely integrated with
+`pandas <https://pandas.pydata.org/>`_ data structures.
 
 Here is some of the functionality that seaborn offers:
 
 - A dataset-oriented API for examining relationships between multiple variables
-- Specialized support for using categorical variables to show observations or aggregate statistics
-- Options for visualizing univariate or bivariate distributions and for comparing them between subsets of data
-- Automatic estimation and plotting of linear regression models for different kinds dependent variables
-- Convenient views onto the overall structure of complex datasets
-- High-level abstractions for structuring multi-plot grids that let you easily build complex visualizations
+- Flexible data aggregation with automatic estimation and plotting of error bars
+- Multiple options for visualizing univariate or bivariate distributions
+- Estimation and plotting of linear regression models to reveal trends
+- Tools for building figures with multidimensional views onto complex dataset structure
 - Concise control over matplotlib figure styling with several built-in themes
 - Tools for choosing color palettes that faithfully reveal patterns in your data
 
-Seaborn aims to make visualization a central part of exploring and understanding data. Its dataset-oriented plotting functions operate on dataframes and arrays containing whole datasets and internally perform the necessary semantic mapping and statistical aggregation to produce informative plots.
+Seaborn aims to make visualization a central part of exploring and understanding
+data. Its dataset-oriented plotting functions operate on dataframes and arrays
+containing whole datasets and internally perform the necessary semantic mapping
+and statistical aggregation to produce informative plots.
+
 """
 
 DISTNAME = 'seaborn'
@@ -51,16 +57,14 @@
     'seaborn._stats',
     'seaborn.colors',
     'seaborn.external',
-    'seaborn._core',
-    'seaborn._marks',
-    'seaborn._stats',
 ]
 
 CLASSIFIERS = [
     'Intended Audience :: Science/Research',
     'Programming Language :: Python :: 3.7',
     'Programming Language :: Python :: 3.8',
     'Programming Language :: Python :: 3.9',
+    'Programming Language :: Python :: 3.10',
     'License :: OSI Approved :: BSD License',
     'Topic :: Scientific/Engineering :: Visualization',
     'Topic :: Multimedia :: Graphics',