Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit d5baa19

Browse files
chahak13chahak13
authored
Merge branch 'main' into 24743_contour_kwargs
2 parents 756eb1e + 84cc898 commit d5baa19

File tree

567 files changed

+10132
-4769
lines changed

Some content is hidden

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

567 files changed

+10132
-4769
lines changed

‎.appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ environment:
2222
--cov-report= --cov=lib --log-level=DEBUG
2323

2424
matrix:
25-
- PYTHON_VERSION: "3.8"
25+
- PYTHON_VERSION: "3.9"
2626
CONDA_INSTALL_LOCN: "C:\\Miniconda3-x64"
2727
TEST_ALL: "no"
28-
- PYTHON_VERSION: "3.9"
28+
- PYTHON_VERSION: "3.10"
2929
CONDA_INSTALL_LOCN: "C:\\Miniconda3-x64"
3030
TEST_ALL: "no"
3131

‎.circleci/config.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,9 +205,9 @@ commands:
205205
#
206206

207207
jobs:
208-
docs-python38:
208+
docs-python39:
209209
docker:
210-
- image: cimg/python:3.8
210+
- image: cimg/python:3.9
211211
resource_class: large
212212
steps:
213213
- checkout
@@ -234,7 +234,8 @@ jobs:
234234

235235
- add_ssh_keys:
236236
fingerprints:
237-
- "6b:83:76:a5:7d:bd:ce:19:a4:e3:81:e0:80:16:a4:fe"
237+
- "be:c3:c1:d8:fb:a1:0e:37:71:72:d7:a3:40:13:8f:14"
238+
238239
- deploy:
239240
name: "Deploy new docs"
240241
command: ./.circleci/deploy-docs.sh
@@ -249,4 +250,4 @@ workflows:
249250
jobs:
250251
# NOTE: If you rename this job, then you must update the `if` condition
251252
# and `circleci-jobs` option in `.github/workflows/circleci.yml`.
252-
- docs-python38
253+
- docs-python39

‎.flake8

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[flake8]
2-
max-line-length = 79
2+
max-line-length = 88
33
select =
44
# flake8 default
55
C90, E, F, W,
@@ -36,7 +36,6 @@ exclude =
3636
doc/tutorials
3737
# External files.
3838
tools/gh_api.py
39-
tools/github_stats.py
4039
.tox
4140
.eggs
4241

@@ -84,6 +83,7 @@ per-file-ignores =
8483
tutorials/introductory/quick_start.py: E703
8584
tutorials/introductory/animation_tutorial.py: E501
8685
tutorials/text/annotations.py: E402, E501
86+
tutorials/text/mathtext.py: E501
8787
tutorials/text/text_intro.py: E402
8888
tutorials/text/text_props.py: E501
8989
tutorials/text/usetex.py: E501

‎.git-blame-ignore-revs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,6 @@ c1a33a481b9c2df605bcb9bef9c19fe65c3dac21
99

1010
# chore: fix spelling errors
1111
686c9e5a413e31c46bb049407d5eca285bcab76d
12+
13+
# chore: pyupgrade --py39-plus
14+
4d306402bb66d6d4c694d8e3e14b91054417070e

‎.github/workflows/cibuildsdist.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
strategy:
3838
matrix:
3939
os: [ubuntu-20.04]
40-
python-version: ['3.8', '3.9', '3.10', '3.11']
40+
python-version: ['3.9', '3.10', '3.11']
4141

4242
steps:
4343
- uses: actions/checkout@v3

‎.github/workflows/cibuildwheel.yml

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
fetch-depth: 0
6363

6464
- name: Build wheels for CPython 3.11
65-
uses: pypa/cibuildwheel@v2.11.3
65+
uses: pypa/cibuildwheel@v2.12.0
6666
env:
6767
CIBW_BUILD: "cp311-*"
6868
CIBW_SKIP: "*-musllinux*"
@@ -75,7 +75,7 @@ jobs:
7575
CIBW_ARCHS: ${{ matrix.cibw_archs }}
7676

7777
- name: Build wheels for CPython 3.10
78-
uses: pypa/cibuildwheel@v2.11.3
78+
uses: pypa/cibuildwheel@v2.12.0
7979
env:
8080
CIBW_BUILD: "cp310-*"
8181
CIBW_SKIP: "*-musllinux*"
@@ -88,7 +88,7 @@ jobs:
8888
CIBW_ARCHS: ${{ matrix.cibw_archs }}
8989

9090
- name: Build wheels for CPython 3.9
91-
uses: pypa/cibuildwheel@v2.11.3
91+
uses: pypa/cibuildwheel@v2.12.0
9292
env:
9393
CIBW_BUILD: "cp39-*"
9494
CIBW_SKIP: "*-musllinux*"
@@ -100,23 +100,10 @@ jobs:
100100
MPL_DISABLE_FH4: "yes"
101101
CIBW_ARCHS: ${{ matrix.cibw_archs }}
102102

103-
- name: Build wheels for CPython 3.8
104-
uses: pypa/[email protected]
105-
env:
106-
CIBW_BUILD: "cp38-*"
107-
CIBW_SKIP: "*-musllinux*"
108-
CIBW_MANYLINUX_X86_64_IMAGE: manylinux2010
109-
CIBW_MANYLINUX_I686_IMAGE: manylinux2010
110-
CIBW_BEFORE_BUILD: >-
111-
pip install certifi numpy==1.19.2 &&
112-
git clean -fxd build
113-
MPL_DISABLE_FH4: "yes"
114-
CIBW_ARCHS: ${{ matrix.cibw_archs }}
115-
116103
- name: Build wheels for PyPy
117-
uses: pypa/cibuildwheel@v2.11.3
104+
uses: pypa/cibuildwheel@v2.12.0
118105
env:
119-
CIBW_BUILD: "pp38-* pp39-*"
106+
CIBW_BUILD: "pp39-*"
120107
CIBW_SKIP: "*-musllinux*"
121108
CIBW_BEFORE_BUILD: >-
122109
pip install certifi oldest-supported-numpy &&

‎.github/workflows/circleci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: "CircleCI artifact handling"
33
on: [status]
44
jobs:
55
circleci_artifacts_redirector_job:
6-
if: "${{ github.event.context == 'ci/circleci: docs-python38' }}"
6+
if: "${{ github.event.context == 'ci/circleci: docs-python39' }}"
77
permissions:
88
statuses: write
99
runs-on: ubuntu-latest
@@ -14,11 +14,11 @@ jobs:
1414
with:
1515
repo-token: ${{ secrets.GITHUB_TOKEN }}
1616
artifact-path: 0/doc/build/html/index.html
17-
circleci-jobs: docs-python38
17+
circleci-jobs: docs-python39
1818
job-title: View the built docs
1919

2020
post_warnings_as_review:
21-
if: "${{ github.event.context == 'ci/circleci: docs-python38' }}"
21+
if: "${{ github.event.context == 'ci/circleci: docs-python39' }}"
2222
permissions:
2323
contents: read
2424
checks: write

0 commit comments

Comments
 (0)