From 851acde3d547caed738a0626a94d11588deede38 Mon Sep 17 00:00:00 2001 From: Piotr Rozyczko Date: Wed, 8 Dec 2021 09:17:53 +0100 Subject: [PATCH 1/7] Try version 2.2.3 of MPL on github actions --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 484d7964eb..858e7e6e3a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -65,7 +65,7 @@ jobs: python -m pip install --upgrade pip python -m pip install wheel setuptools - python -m pip install numpy scipy matplotlib==3.4.3 docutils "pytest<6" sphinx unittest-xml-reporting + python -m pip install numpy scipy matplotlib==2.2.3 docutils "pytest<6" sphinx unittest-xml-reporting python -m pip install tinycc h5py sphinx pyparsing html5lib reportlab pybind11 appdirs python -m pip install six numba mako ipython qtconsole xhtml2pdf unittest-xml-reporting pylint python -m pip install qt5reactor periodictable PyQt5 uncertainties debugpy From 788db2ea787afcd9d73d0dec42ad120c735d4555 Mon Sep 17 00:00:00 2001 From: Piotr Rozyczko Date: Wed, 8 Dec 2021 12:01:17 +0100 Subject: [PATCH 2/7] modify installers.yml as well --- .github/workflows/installers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index c2e24d073e..b8ff9a1b09 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -64,7 +64,7 @@ jobs: python -m pip install --upgrade pip python -m pip install wheel setuptools - python -m pip install numpy scipy matplotlib==3.4.3 docutils "pytest<6" sphinx unittest-xml-reporting + python -m pip install numpy scipy matplotlib==2.2.3 docutils "pytest<6" sphinx unittest-xml-reporting python -m pip install tinycc h5py sphinx pyparsing html5lib reportlab pybind11 appdirs python -m pip install six numba mako ipython qtconsole xhtml2pdf unittest-xml-reporting pylint python -m pip install qt5reactor periodictable PyQt5 uncertainties debugpy From 3612e90d2747e14a0ac0fbb2d64ac002abcd4cd1 Mon Sep 17 00:00:00 2001 From: Piotr Rozyczko Date: Wed, 8 Dec 2021 12:53:55 +0100 Subject: [PATCH 3/7] Try with 2.2.5 --- .github/workflows/installers.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index b8ff9a1b09..60d789d827 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -64,7 +64,7 @@ jobs: python -m pip install --upgrade pip python -m pip install wheel setuptools - python -m pip install numpy scipy matplotlib==2.2.3 docutils "pytest<6" sphinx unittest-xml-reporting + python -m pip install numpy scipy matplotlib==2.2.5 docutils "pytest<6" sphinx unittest-xml-reporting python -m pip install tinycc h5py sphinx pyparsing html5lib reportlab pybind11 appdirs python -m pip install six numba mako ipython qtconsole xhtml2pdf unittest-xml-reporting pylint python -m pip install qt5reactor periodictable PyQt5 uncertainties debugpy diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 858e7e6e3a..3f249c7afa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -65,7 +65,7 @@ jobs: python -m pip install --upgrade pip python -m pip install wheel setuptools - python -m pip install numpy scipy matplotlib==2.2.3 docutils "pytest<6" sphinx unittest-xml-reporting + python -m pip install numpy scipy matplotlib==2.2.5 docutils "pytest<6" sphinx unittest-xml-reporting python -m pip install tinycc h5py sphinx pyparsing html5lib reportlab pybind11 appdirs python -m pip install six numba mako ipython qtconsole xhtml2pdf unittest-xml-reporting pylint python -m pip install qt5reactor periodictable PyQt5 uncertainties debugpy From c5acfd03982c118d40cd7e8c2fbf3197033dbfff Mon Sep 17 00:00:00 2001 From: Piotr Rozyczko Date: Wed, 8 Dec 2021 13:50:03 +0100 Subject: [PATCH 4/7] 2.2.5 only for Windows --- .github/workflows/installers.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index 60d789d827..040d7566f5 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -58,25 +58,26 @@ jobs: ${{ runner.os }}-pip- ### Installation of build-dependencies + - name: Install lxml and MPL (Linux + Win) + if: ${{ matrix.os != 'macos-latest' }} + run: | + python -m pip install matplotlib==2.2.5 + python -m pip install lxml - name: Install Python dependencies run: | python -m pip install --upgrade pip python -m pip install wheel setuptools - python -m pip install numpy scipy matplotlib==2.2.5 docutils "pytest<6" sphinx unittest-xml-reporting + python -m pip install numpy scipy docutils "pytest<6" sphinx unittest-xml-reporting python -m pip install tinycc h5py sphinx pyparsing html5lib reportlab pybind11 appdirs python -m pip install six numba mako ipython qtconsole xhtml2pdf unittest-xml-reporting pylint python -m pip install qt5reactor periodictable PyQt5 uncertainties debugpy - - name: Install lxml (Linux + Win) - if: ${{ matrix.os != 'macos-latest' }} - run: | - python -m pip install lxml - - - name: Install lxml (OSX) + - name: Install lxml and MPL (OSX) if: ${{ matrix.os == 'macos-latest' }} run: | + python -m pip install matplotlib python -m pip install --no-binary lxml lxml - name: Install pyopencl (Windows) From 96c4df17d8647449d834fb671033d68e209c8f62 Mon Sep 17 00:00:00 2001 From: Piotr R Date: Thu, 9 Dec 2021 08:24:48 +0100 Subject: [PATCH 5/7] copy the MPL installation details to release.yml --- .github/workflows/release.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3f249c7afa..61a7b6d86f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -60,6 +60,12 @@ jobs: ### Installation of build-dependencies + - name: Install lxml and MPL (Linux + Win) + if: ${{ matrix.os != 'macos-latest' }} + run: | + python -m pip install matplotlib==2.2.5 + python -m pip install lxml + - name: Install Python dependencies run: | python -m pip install --upgrade pip @@ -70,14 +76,10 @@ jobs: python -m pip install six numba mako ipython qtconsole xhtml2pdf unittest-xml-reporting pylint python -m pip install qt5reactor periodictable PyQt5 uncertainties debugpy - - name: Install lxml (Linux + Win) - if: ${{ matrix.os != 'macos-latest' }} - run: | - python -m pip install lxml - - name: Install lxml (OSX) if: ${{ matrix.os == 'macos-latest' }} run: | + python -m pip install matplotlib python -m pip install --no-binary lxml lxml - name: Install pyopencl (Windows) From f3c30c7dcef2ea9417204153f0d80ca1464db33f Mon Sep 17 00:00:00 2001 From: Piotr R Date: Thu, 9 Dec 2021 08:32:22 +0100 Subject: [PATCH 6/7] ... and remove already unnecessary pip install --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 61a7b6d86f..1b6ecaba15 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -71,7 +71,7 @@ jobs: python -m pip install --upgrade pip python -m pip install wheel setuptools - python -m pip install numpy scipy matplotlib==2.2.5 docutils "pytest<6" sphinx unittest-xml-reporting + python -m pip install numpy scipy docutils "pytest<6" sphinx unittest-xml-reporting python -m pip install tinycc h5py sphinx pyparsing html5lib reportlab pybind11 appdirs python -m pip install six numba mako ipython qtconsole xhtml2pdf unittest-xml-reporting pylint python -m pip install qt5reactor periodictable PyQt5 uncertainties debugpy From a34649a26d11ab79704c4c38db5d1dac443c5c26 Mon Sep 17 00:00:00 2001 From: Piotr R Date: Thu, 9 Dec 2021 09:19:59 +0100 Subject: [PATCH 7/7] Freeze macos version as well. --- .github/workflows/installers.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index 040d7566f5..42bb71e1a7 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -77,7 +77,7 @@ jobs: - name: Install lxml and MPL (OSX) if: ${{ matrix.os == 'macos-latest' }} run: | - python -m pip install matplotlib + python -m pip install matplotlib==3.4.3 python -m pip install --no-binary lxml lxml - name: Install pyopencl (Windows) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1b6ecaba15..e99cc8ee36 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -79,7 +79,7 @@ jobs: - name: Install lxml (OSX) if: ${{ matrix.os == 'macos-latest' }} run: | - python -m pip install matplotlib + python -m pip install matplotlib==3.4.3 python -m pip install --no-binary lxml lxml - name: Install pyopencl (Windows)