Skip to content

Commit 114acda

Browse files
authored
sorting out package installation failures on macOS (and enabling macOS 10 builds)
1 parent d312218 commit 114acda

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

.github/workflows/tests+artifacts+pypi.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,15 @@ jobs:
3030
needs: [todos_annotated]
3131
strategy:
3232
matrix:
33-
platform: [ubuntu-latest, macos-11, macos-12, windows-latest]
33+
platform: [ubuntu-latest, macos-10.15, macos-12, windows-latest]
3434
python-version: ["3.7", "3.8", "3.9", "3.10"]
35+
exclude:
36+
- platform: macos-12
37+
python-version: "3.7"
38+
- platform: macos-12
39+
python-version: "3.8"
40+
- platform: macos-12
41+
python-version: "3.9"
3542
runs-on: ${{ matrix.platform }}
3643
steps:
3744
- if: startsWith(matrix.platform, 'macos-')
@@ -66,7 +73,7 @@ jobs:
6673
with:
6774
python-version: ${{ matrix.python-version }}
6875

69-
- run: pip install build wheel
76+
- run: pip install --upgrade pip build wheel
7077
- run: pip install -r test-time-requirements.txt
7178

7279
- run: |
@@ -94,16 +101,11 @@ jobs:
94101
name: dist
95102
path: dist
96103

97-
# TODO #114: should be doable on any OS
98-
- if: matrix.platform == 'windows-latest' || matrix.platform == 'ubuntu-latest'
99-
run: |
104+
- run: |
105+
pip debug --verbose
100106
pip install dist/*.whl
101107
pip show --verbose PyPartMC
102108
103-
- if: startsWith(matrix.platform, 'macos-')
104-
run: |
105-
DEBUG=0 VERBOSE=1 pip install --verbose -e .
106-
107109
### make sure PyPartMC is not picked up from a local folder
108110
- run: |
109111
cd tests

src/gas_data.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ struct GasData {
2424
json(tpl)
2525
{
2626
auto json_array = nlohmann::json::array();
27-
for (const auto &item : tpl)
27+
for (const auto item : tpl)
2828
json_array.push_back(nlohmann::json::object({{
2929
item.cast<std::string>(),
3030
nlohmann::json::array()

0 commit comments

Comments
 (0)