Skip to content

Commit 79b1423

Browse files
authored
matplotlib 3.4 hotfix (#89)
1 parent fc69959 commit 79b1423

28 files changed

+130
-98
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
steps:
1818
- name: Checkout repository
19-
uses: actions/checkout@v2
19+
uses: actions/checkout@v3
2020
with:
2121
# We must fetch at least the immediate parents so that if this is
2222
# a pull request then we can checkout the head.

.github/workflows/documentation.yaml

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ jobs:
1212

1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v2
15+
- name: Checkout
16+
uses: actions/checkout@v3
1617
- name: Set up Python
17-
uses: actions/setup-python@v2
18+
uses: actions/setup-python@v4
1819
with:
1920
python-version: '3.10'
2021
- name: Setup Linux Environment
@@ -36,17 +37,26 @@ jobs:
3637
if [ "${{ matrix.doc-type }}" = html ]; then echo "art_path=docs/build-html" >> $GITHUB_ENV; fi
3738
if [ "${{ matrix.doc-type }}" = latex ]; then echo "art_path=docs/build-latex/MicroStructPy.pdf" >> $GITHUB_ENV; fi
3839
if [ "${{ matrix.doc-type }}" = epub ]; then echo "art_path=docs/build-epub/MicroStructPy.epub" >> $GITHUB_ENV; fi
40+
41+
- name: Build PDF (latex only)
42+
if: matrix.doc-type == 'latex'
43+
run: |
44+
# Update apt
45+
sudo apt-get update
3946
40-
# Build PDF
41-
if [ "${{ matrix.doc-type }}" = latex ]; then sudo apt install texlive-fonts-recommended; fi
42-
if [ "${{ matrix.doc-type }}" = latex ]; then sudo apt install texlive-latex-recommended; fi
43-
if [ "${{ matrix.doc-type }}" = latex ]; then sudo apt install texlive-lang-english; fi
44-
if [ "${{ matrix.doc-type }}" = latex ]; then sudo apt install texlive-xetex; fi
45-
if [ "${{ matrix.doc-type }}" = latex ]; then sudo apt install latexmk; fi
46-
if [ "${{ matrix.doc-type }}" = latex ]; then cd docs/build-latex; fi
47-
if [ "${{ matrix.doc-type }}" = latex ]; then make; fi
48-
if [ "${{ matrix.doc-type }}" = latex ]; then cd -; fi
49-
47+
# Install LaTeX packages
48+
# Recommended by Sphinx on their docs page:
49+
# https://www.sphinx-doc.org/en/master/usage/builders/index.html#sphinx.builders.latex.LaTeXBuilder
50+
sudo apt install texlive-latex-recommended
51+
sudo apt install texlive-fonts-recommended
52+
sudo apt install tex-gyre # (if latex_engine left to default)
53+
sudo apt install texlive-latex-extra
54+
sudo apt install latexmk
55+
56+
# Make
57+
cd docs/build-latex
58+
make
59+
cd -
5060
5161
- name: Upload artifact
5262
uses: actions/upload-artifact@v3

.github/workflows/ossar-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
steps:
1717
# Checkout your code repository to scan
1818
- name: Checkout repository
19-
uses: actions/checkout@v2
19+
uses: actions/checkout@v3
2020
with:
2121
# We must fetch at least the immediate parents so that if this is
2222
# a pull request then we can checkout the head.

.github/workflows/python_package.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
1414

1515
steps:
16-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v3
1717
- name: Set up Python ${{ matrix.python-version }}
18-
uses: actions/setup-python@v2
18+
uses: actions/setup-python@v4
1919
with:
2020
python-version: ${{ matrix.python-version }}
2121

@@ -56,9 +56,9 @@ jobs:
5656

5757
runs-on: ubuntu-latest
5858
steps:
59-
- uses: actions/checkout@v2
59+
- uses: actions/checkout@v3
6060
- name: Set up Python
61-
uses: actions/setup-python@v2
61+
uses: actions/setup-python@v4
6262
with:
6363
python-version: '3.x'
6464
- name: Cache pip

.github/workflows/python_publish.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
steps:
1818
- uses: actions/checkout@v3
1919
- name: Set up Python
20-
uses: actions/setup-python@v3
20+
uses: actions/setup-python@v4
2121
with:
2222
python-version: '3.x'
2323
- name: Install dependencies

.readthedocs.yaml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# Read the Docs configuration file for Sphinx projects
2+
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
3+
4+
# Required
5+
version: 2
6+
7+
formats: all
8+
9+
# Set the OS, Python version and other tools you might need
10+
build:
11+
os: ubuntu-22.04
12+
tools:
13+
python: "3.8"
14+
apt_packages:
15+
- freeglut3-dev
16+
17+
# Build documentation in the "docs/" directory with Sphinx
18+
sphinx:
19+
configuration: docs/source/conf.py
20+
21+
# Optional but recommended, declare the Python requirements required
22+
# to build your documentation
23+
# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
24+
python:
25+
install:
26+
- requirements: docs/requirements.txt
27+
- method: pip
28+
path: .

.readthedocs.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

CHANGELOG.rst

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@ All notable changes to this project will be documented in this file.
66
The format is based on `Keep a Changelog`_,
77
and this project adheres to `Semantic Versioning`_.
88

9+
`1.5.7`_ - 2023-08-06
10+
--------------------------
11+
Fixed
12+
'''''''
13+
- Errors associated with using keyword arguments in ``plt.gca()`` deprecated in matplotlib 3.4.
14+
- 3D plots now use matplotlib standard for setting equal aspect ratios.
15+
16+
917
`1.5.6`_ - 2022-09-01
1018
--------------------------
1119
Fixed
@@ -292,7 +300,8 @@ Added
292300

293301
.. LINKS
294302
295-
.. _`Unreleased`: https://github.com/kip-hart/MicroStructPy/compare/v1.5.6...HEAD
303+
.. _`Unreleased`: https://github.com/kip-hart/MicroStructPy/compare/v1.5.7...HEAD
304+
.. _`1.5.7`: https://github.com/kip-hart/MicroStructPy/compare/v1.5.6...v1.5.7
296305
.. _`1.5.6`: https://github.com/kip-hart/MicroStructPy/compare/v1.5.5...v1.5.6
297306
.. _`1.5.5`: https://github.com/kip-hart/MicroStructPy/compare/v1.5.4...v1.5.5
298307
.. _`1.5.4`: https://github.com/kip-hart/MicroStructPy/compare/v1.5.3...v1.5.4

MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ include .bumpversion.cfg
77
include .coveragerc
88
include .editorconfig
99
include .pyup.yml
10-
include .readthedocs.yml
10+
include .readthedocs.yaml
1111

1212
include CHANGELOG.rst
1313
include LICENSE.rst

docs/requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
gmsh==4.10.5
2-
matplotlib==3.5.1
3-
numpy==1.22.0
1+
gmsh==4.11.1
2+
matplotlib==3.7.2
3+
numpy==1.24.4
44
pybind11==2.4.3
55
sphinx==4.2.0
66
sphinx-gallery==0.8.1

0 commit comments

Comments
 (0)