Skip to content

Commit 1cf6a92

Browse files
domdfcodingdomdfcoding
committed
Bump matplotlib version and drop Python 3.6 support.
1 parent 4e04fd4 commit 1cf6a92

File tree

8 files changed

+30
-35
lines changed

8 files changed

+30
-35
lines changed

‎.github/workflows/python_ci.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,12 @@ jobs:
2222
runs-on: "windows-2019"
2323
continue-on-error: ${{ matrix.config.experimental }}
2424
env:
25-
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10'
25+
USING_COVERAGE: '3.7,3.8,3.9,3.10'
2626

2727
strategy:
2828
fail-fast: False
2929
matrix:
3030
config:
31-
- {python-version: "3.6", testenvs: "py36,build", experimental: False}
3231
- {python-version: "3.7", testenvs: "py37,build", experimental: False}
3332
- {python-version: "3.8", testenvs: "py38,build", experimental: False}
3433
- {python-version: "3.9", testenvs: "py39,build", experimental: False}

‎.github/workflows/python_ci_linux.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,12 @@ jobs:
2323
runs-on: "ubuntu-20.04"
2424
continue-on-error: ${{ matrix.config.experimental }}
2525
env:
26-
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10'
26+
USING_COVERAGE: '3.7,3.8,3.9,3.10'
2727

2828
strategy:
2929
fail-fast: False
3030
matrix:
3131
config:
32-
- {python-version: "3.6", testenvs: "py36,build", experimental: False}
3332
- {python-version: "3.7", testenvs: "py37,build", experimental: False}
3433
- {python-version: "3.8", testenvs: "py38,build", experimental: False}
3534
- {python-version: "3.9", testenvs: "py39,build", experimental: False}

‎.github/workflows/python_ci_macos.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,12 @@ jobs:
2222
runs-on: "macos-latest"
2323
continue-on-error: ${{ matrix.config.experimental }}
2424
env:
25-
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10'
25+
USING_COVERAGE: '3.7,3.8,3.9,3.10'
2626

2727
strategy:
2828
fail-fast: False
2929
matrix:
3030
config:
31-
- {python-version: "3.6", testenvs: "py36,build", experimental: False}
3231
- {python-version: "3.7", testenvs: "py37,build", experimental: False}
3332
- {python-version: "3.8", testenvs: "py38,build", experimental: False}
3433
- {python-version: "3.9", testenvs: "py39,build", experimental: False}

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ base-classifiers = [
4444
"Topic :: Scientific/Engineering :: Visualization",
4545
"Topic :: Software Development :: Libraries :: Python Modules",
4646
]
47-
python-versions = [ "3.6", "3.7", "3.8", "3.9", "3.10",]
47+
python-versions = [ "3.7", "3.8", "3.9", "3.10",]
4848
python-implementations = [ "CPython",]
4949
platforms = [ "Windows", "macOS", "Linux",]
5050
license-key = "GPL-2.0-only"

‎repo_helper.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ conda_channels:
2424

2525
# Versions to run tests for
2626
python_versions:
27-
- 3.6
2827
- 3.7
2928
- 3.8
3029
- 3.9

‎requirements.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
matplotlib==3.2.2; platform_machine == "aarch64" and python_version == "3.6"
2-
matplotlib<3.4.0,>=3.2.2; platform_machine != "aarch64" or python_version > "3.6"
1+
matplotlib<3.6.0,>=3.2.2
32
pymassspec>=2.3.0

‎tests/image_hashes.json‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
{
2-
"tests.test_plot.test_plot_mass_spec_linestyle": "6d1be1cf023dd5799030d6a6361610545a662361636ec108aff545d2e3e65ba1",
3-
"tests.test_plot.test_plot_mass_spec_alpha": "f773f6563c99aab763eb680742445b86f6be49a4825a93c1b19fdb2b433cdad7",
4-
"tests.test_plot.test_plot_tic": "e3ef6b55ea0f8f683de7999dba17a11e9fbf9d90f4527864ad4c54a3d29b17b0",
5-
"tests.test_plot.test_plot_ic_linewidth": "535c884a0b33c2c30a7d01d0d4344e5ad723c7fa31fd00eb71b2c703b3c6c9c6",
6-
"tests.test_plot.test_plot_tic_label": "6353300b9b4ca60982d64970cb17b3deef77e64b04cc7b5f2d3fba718640190a",
7-
"tests.test_plot.test_plot_tic_linestyle": "ecd24d58973a05a7a15d45d16d85bd0aa8f066713fc4c331f2a4c20c6e61fd18",
8-
"tests.test_plot.test_plot_ic_multiple": "4af774dbda534b6e2e48794806762825f740dbc36df0a157a789c98f653d2c24",
9-
"tests.test_plot.test_plot_head2tail": "69f77aa4f980ef1bef8077024e88d29cb309432fc86dc7769506b4d4d6e96162",
10-
"tests.test_plot.test_plot_tic_title": "1df0bfbc6353fb634805d7cbb8fb047b6ebe9622e5c180e7edec6fac7667af33",
11-
"tests.test_plot.test_plot_ic_title": "62b1dfcfe480411ccb24a63c45ebec96612823e59612be23569a6f5da237210a",
12-
"tests.test_plot.test_plot_tic_linewidth": "a7a3c447959d182cb822822b996a8e708da02dc8023030d51a23c22d902edfed",
13-
"tests.test_plot.test_plot_mass_spec_width": "a8db18f19a74fc3c30e274e3546e001a715e050a55ffeb4ce1def2199cd35e08",
14-
"tests.test_plot.test_plot_peaks_errors": "ea3a4a1c72e2a4e38e3d44de736f8896fbf676d4a1dab97cb6fe54fa51d6bd8a",
15-
"tests.test_plot.test_plot_ic_linestyle": "0ba6fe34ec883b1e628e96c5267251d29cbb4f49c371f15dd026e758b9e9d5c4",
16-
"tests.test_plot.test_plot_ic_alpha": "d80f58dcb5aa33d0d22078fb7a416f7fbce52836dc63f5c029f57b835649b5f7",
17-
"tests.test_plot.test_plot_ic": "3e47688de4d65fb06f70a8f855f96a8a3c2f0ef2789268fa6aec43125fe7c7bd",
18-
"tests.test_plot.test_plot_peaks_with_tic": "51a7b71cf81fd5d7f2ff1cd8ee3326a8df36075c189ea2ed481ea83b3c7fa435",
19-
"tests.test_plot.test_plot_tic_alpha": "5552df0a3e254fd4215f345aa5fb55f88df538e23eb306c29d8347c4d0f88cae",
20-
"tests.test_plot.test_plot_ic_minutes": "0ed9cf46e37938f929016e5420098d90279b448b63dae64a0322da20175d33bc",
21-
"tests.test_plot.test_plot_mass_spec": "6d1be1cf023dd5799030d6a6361610545a662361636ec108aff545d2e3e65ba1",
22-
"tests.test_plot.test_plot_mass_spec_title": "e7225a3c4d1c85d83c1ee0f8a57c382df94f0a88f615817d7288a9a1e795fbd2",
23-
"tests.test_plot.test_plot_ic_label": "2422525c920563f71afe722f7d3712fbfef608b5a4e8b85517b9a507f482f1e9"
2+
"tests.test_plot.test_plot_mass_spec_linestyle": "812bcaea58879eba9a1a75d25225562616731c8a84c464dd1d7ebb0f25fd3f30",
3+
"tests.test_plot.test_plot_mass_spec_alpha": "001f23435ffbd3b36f2a6fbb82c21d7c21c7f7829201b349a8c44c2a85cd6c95",
4+
"tests.test_plot.test_plot_tic": "f096e12a028f45088ea28f33a2e439219785f1a1d6f2fa2a7a0d563933d6e292",
5+
"tests.test_plot.test_plot_ic_linewidth": "c4fdefaa7cd80e80ff2e4f308c347444d06c6f49bd9228625d74b6733e3a3ab7",
6+
"tests.test_plot.test_plot_tic_label": "3ef2bfbf0852edc0d6b93254d502c3643529a43509b33ae78765793a7b5a7b4c",
7+
"tests.test_plot.test_plot_tic_linestyle": "2a56d3093d5737170c9c8dccb3241de84f306c820fce72cd6d2143d5c73c8c57",
8+
"tests.test_plot.test_plot_ic_multiple": "298f914ab43d6186d08b82a83ce5a9275ac8d255c0a875f98d49c28b584e01b0",
9+
"tests.test_plot.test_plot_head2tail": "d57a90bc2a8abefafdde5a387828e522436126c4d27c560ca98736257c8c80b0",
10+
"tests.test_plot.test_plot_tic_title": "e3531610dcecccce22023ea8c918f2d3ea96d2c1187200d7b7d33f678428bd59",
11+
"tests.test_plot.test_plot_ic_title": "fbfe3deed257d4beade314f9ec3beaecb9631fa4abfb9594ad045945165028ae",
12+
"tests.test_plot.test_plot_tic_linewidth": "6ce05f3fc62b8ced6aff5782e01f0f2ea6ecc5288cee3eb315166d18fac0ed7c",
13+
"tests.test_plot.test_plot_mass_spec_width": "5c3916b3efd081ae995aed7b91c9208f3944c0052a0adb3328eb7751f08d2270",
14+
"tests.test_plot.test_plot_peaks_errors": "fa8564661892095b92ac9c30ff5c88dd1e244519f2f2cbb21a927d567e1e9898",
15+
"tests.test_plot.test_plot_ic_linestyle": "fa521221300e388a4f26a886df33e5758702fbb236fc1fb147a036e0f4968a91",
16+
"tests.test_plot.test_plot_ic_alpha": "237ea968ae8b7745f34319998e8b99651117437c5621552edf0c94ca6b98ee6a",
17+
"tests.test_plot.test_plot_ic": "e9db7c120f179403a117d8b67ed65c86ca54cff211b7e317549213cf364f557b",
18+
"tests.test_plot.test_plot_peaks_with_tic": "67f65e090830b498de489e7d25608f09a169c65e6df0bff176bef75cc9170037",
19+
"tests.test_plot.test_plot_tic_alpha": "91749309de25d93a9da9c2df093c3e9d4950c6b0c5a0ffbe38e113c87a5cd8f4",
20+
"tests.test_plot.test_plot_ic_minutes": "230387d0ea58f402deba80007deefd576e5e29d74b4bec0e98873564860e2d78",
21+
"tests.test_plot.test_plot_mass_spec": "812bcaea58879eba9a1a75d25225562616731c8a84c464dd1d7ebb0f25fd3f30",
22+
"tests.test_plot.test_plot_mass_spec_title": "3f729f9bc0ffd7b79031970cade3b9f85cb886eb8ea6d6c8be0edf3c7f3a7127",
23+
"tests.test_plot.test_plot_ic_label": "fdeb4fe47d56971312d7699a32bd593631ce2d4a17a0e60b3c8676bb21a0a32f"
2424
}

‎tox.ini‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# * check-wheel-contents
1717

1818
[tox]
19-
envlist = py36, py37, py38, py39, py310, mypy, build
19+
envlist = py37, py38, py39, py310, mypy, build
2020
skip_missing_interpreters = True
2121
isolated_build = True
2222
requires =
@@ -25,7 +25,7 @@ requires =
2525
virtualenv!=20.16.0
2626

2727
[envlists]
28-
test = py36, py37, py38, py39, py310
28+
test = py37, py38, py39, py310
2929
qa = mypy, lint
3030
cov = py37, coverage
3131

@@ -150,7 +150,7 @@ inline-quotes = "
150150
multiline-quotes = """
151151
docstring-quotes = """
152152
count = True
153-
min_python_version = 3.6.1
153+
min_python_version = 3.7
154154
unused-arguments-ignore-abstract-functions = True
155155
unused-arguments-ignore-overload-functions = True
156156
unused-arguments-ignore-magic-methods = True

0 commit comments

Comments
 (0)