Skip to content

Commit d00a27d

Browse files
committed
Merge master and update version for release
2 parents f2abeb0 + 6890b31 commit d00a27d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+560
-342
lines changed

.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ If you think you've encountered a bug in seaborn, please report it on the [Githu
1616
- A clear explanation of why you think something is wrong
1717
- The specific versions of seaborn and matplotlib that you are working with
1818

19-
Bug reports are easiest to address if they can be demonstrated using one of the example datasets from the seaborn docs (i.e. with `seaborn.load_dataset`). Otherwise, it is preferable that your example generate synthetic data to reproduce the problem. If you can only demonstrate the issue with your actual dataset, you will need to share it, ideally as a csv. Note that you can upload a csv directly to a github issue thread, but it must have a `.txt` suffix.
19+
Bug reports are easiest to address if they can be demonstrated using one of the example datasets from the seaborn docs (i.e. with `seaborn.load_dataset`). Otherwise, it is preferable that your example generate synthetic data to reproduce the problem. If you can only demonstrate the issue with your actual dataset, you will need to share it, ideally as a csv (do not share data as a pickle file).
2020

2121
If you've encountered an error, searching the specific text of the message before opening a new issue can often help you solve the problem quickly and avoid making a duplicate report.
2222

.github/workflows/ci.yaml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,16 @@ env:
1616
NB_KERNEL: python
1717
MPLBACKEND: Agg
1818
SEABORN_DATA: ${{ github.workspace }}/seaborn-data
19+
PYDEVD_DISABLE_FILE_VALIDATION: 1
1920

2021
jobs:
2122
build-docs:
2223
runs-on: ubuntu-latest
2324
steps:
24-
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
25+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2526

2627
- name: Setup Python 3.11
27-
uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4.7.0
28+
uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
2829
with:
2930
python-version: "3.11"
3031

@@ -35,7 +36,8 @@ jobs:
3536
3637
- name: Install pandoc
3738
run: |
38-
sudo apt-get install pandoc
39+
wget https://github.com/jgm/pandoc/releases/download/3.1.11/pandoc-3.1.11-1-amd64.deb
40+
sudo dpkg -i pandoc-3.1.11-1-amd64.deb
3941
4042
- name: Cache datasets
4143
run: |
@@ -56,7 +58,7 @@ jobs:
5658

5759
strategy:
5860
matrix:
59-
python: ["3.8", "3.9", "3.10", "3.11"]
61+
python: ["3.8", "3.9", "3.10", "3.11", "3.12"]
6062
install: [full]
6163
deps: [latest]
6264

@@ -69,12 +71,13 @@ jobs:
6971
deps: latest
7072

7173
steps:
72-
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
74+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
7375

7476
- name: Setup Python ${{ matrix.python }}
75-
uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4.7.0
77+
uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
7678
with:
7779
python-version: ${{ matrix.python }}
80+
allow-prereleases: true
7881

7982
- name: Install seaborn
8083
run: |
@@ -97,10 +100,10 @@ jobs:
97100
steps:
98101

99102
- name: Checkout
100-
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
103+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
101104

102105
- name: Setup Python
103-
uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4.7.0
106+
uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
104107

105108
- name: Install tools
106109
run: pip install mypy flake8

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2012-2021, Michael L. Waskom
1+
Copyright (c) 2012-2023, Michael L. Waskom
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ seaborn: statistical data visualization
66
=======================================
77

88
[![PyPI Version](https://img.shields.io/pypi/v/seaborn.svg)](https://pypi.org/project/seaborn/)
9-
[![License](https://img.shields.io/pypi/l/seaborn.svg)](https://github.com/mwaskom/seaborn/blob/master/LICENSE)
9+
[![License](https://img.shields.io/pypi/l/seaborn.svg)](https://github.com/mwaskom/seaborn/blob/master/LICENSE.md)
1010
[![DOI](https://joss.theoj.org/papers/10.21105/joss.03021/status.svg)](https://doi.org/10.21105/joss.03021)
1111
[![Tests](https://github.com/mwaskom/seaborn/workflows/CI/badge.svg)](https://github.com/mwaskom/seaborn/actions)
1212
[![Code Coverage](https://codecov.io/gh/mwaskom/seaborn/branch/master/graph/badge.svg)](https://codecov.io/gh/mwaskom/seaborn)

doc/_docstrings/barplot.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"id": "b53b65b8-5670-4905-aa39-36db04f4b813",
2323
"metadata": {},
2424
"source": [
25-
"With long data, assign `x` and `y` to group by a categorical varaible and plot aggregated values, with confidence intervals:"
25+
"With long data, assign `x` and `y` to group by a categorical variable and plot aggregated values, with confidence intervals:"
2626
]
2727
},
2828
{

doc/_docstrings/histplot.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@
312312
"cell_type": "markdown",
313313
"metadata": {},
314314
"source": [
315-
"Step functions, esepcially when unfilled, make it easy to compare cumulative histograms:"
315+
"Step functions, especially when unfilled, make it easy to compare cumulative histograms:"
316316
]
317317
},
318318
{

doc/_docstrings/objects.Est.ipynb

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,30 @@
109109
"p.add(so.Range(), so.Est(seed=0))"
110110
]
111111
},
112+
{
113+
"cell_type": "markdown",
114+
"id": "df807ef8-b5fb-4eac-b539-1bd4e797ddc2",
115+
"metadata": {},
116+
"source": [
117+
"To compute a weighted estimate (and confidence interval), assign a `weight` variable in the layer where you use the stat:"
118+
]
119+
},
112120
{
113121
"cell_type": "code",
114122
"execution_count": null,
115123
"id": "5e4a0594-e1ee-4f72-971e-3763dd626e8b",
116124
"metadata": {},
117125
"outputs": [],
126+
"source": [
127+
"p.add(so.Range(), so.Est(), weight=\"price\")"
128+
]
129+
},
130+
{
131+
"cell_type": "code",
132+
"execution_count": null,
133+
"id": "0d0c34d7-fb76-44cf-9079-3ec7f45741d0",
134+
"metadata": {},
135+
"outputs": [],
118136
"source": []
119137
}
120138
],

doc/_docstrings/objects.Plot.layout.ipynb

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,28 @@
6969
"p.facet([\"A\", \"B\"], [\"X\", \"Y\"]).layout(engine=\"constrained\")"
7070
]
7171
},
72+
{
73+
"cell_type": "markdown",
74+
"id": "d61054d1-dcef-4e11-9802-394bcc633f9f",
75+
"metadata": {},
76+
"source": [
77+
"With `extent`, you can control the size of the plot relative to the underlying figure. Because the notebook display adapts the figure background to the plot, this appears only to change the plot size in a notebook context. But it can be useful when saving or displaying through a `pyplot` GUI window:"
78+
]
79+
},
80+
{
81+
"cell_type": "code",
82+
"execution_count": null,
83+
"id": "1b5d5969-2925-474f-8e3c-99e4f90a7a2b",
84+
"metadata": {},
85+
"outputs": [],
86+
"source": [
87+
"p.layout(extent=[0, 0, .8, 1]).show()"
88+
]
89+
},
7290
{
7391
"cell_type": "code",
7492
"execution_count": null,
75-
"id": "781ff58c-b805-4e93-8cae-be0442e273ea",
93+
"id": "e5c41b7d-a064-4406-8571-a544b194f3dc",
7694
"metadata": {},
7795
"outputs": [],
7896
"source": []

doc/_docstrings/pointplot.ipynb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"id": "f25d3647-9fad-47b2-b49d-db6f5b5c3795",
2323
"metadata": {},
2424
"source": [
25-
"Group by a categorical varaible and plot aggregated values, with confidence intervals:"
25+
"Group by a categorical variable and plot aggregated values, with confidence intervals:"
2626
]
2727
},
2828
{
@@ -138,7 +138,7 @@
138138
"id": "00273ada-cd12-410a-a268-38243d6514ae",
139139
"metadata": {},
140140
"source": [
141-
"Dodge by a specific amount, relative to the width alloted for each level:"
141+
"Dodge by a specific amount, relative to the width allotted for each level:"
142142
]
143143
},
144144
{
@@ -164,7 +164,7 @@
164164
"id": "e205e7c8-6b11-44e6-b43f-7416c427215d",
165165
"metadata": {},
166166
"source": [
167-
"When variables are not explicity assigned and the dataset is two-dimensional, the plot will aggregate over each column:"
167+
"When variables are not explicitly assigned and the dataset is two-dimensional, the plot will aggregate over each column:"
168168
]
169169
},
170170
{

doc/_docstrings/scatterplot.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
"cell_type": "raw",
168168
"metadata": {},
169169
"source": [
170-
"Control the range of marker areas with ``sizes``, and set ``lengend=\"full\"`` to force every unique value to appear in the legend:"
170+
"Control the range of marker areas with ``sizes``, and set ``legend=\"full\"`` to force every unique value to appear in the legend:"
171171
]
172172
},
173173
{

0 commit comments

Comments
 (0)