Skip to content

Commit

Permalink
TEMPORARY: debug pip CI errors
Browse files Browse the repository at this point in the history
  • Loading branch information
speth committed Mar 29, 2022
1 parent 91d582f commit 085daf3
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
9 changes: 8 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ jobs:
architecture: x64
- name: Install Python dependencies
run: |
python -m pip install -U pip 'setuptools>=43.0.0' wheel
python -m pip install -U pip 'setuptools<61.0' wheel
python -m pip install scons pypiwin32 numpy ruamel.yaml cython h5py pandas pytest pytest-github-actions-annotate-failures
- name: Restore Boost cache
uses: actions/cache@v2
Expand All @@ -516,6 +516,13 @@ jobs:
python_package=full env_vars=PYTHONPATH,GITHUB_ACTIONS
msvc_version=${{ matrix.vs-toolset }} f90_interface=n --debug=time
shell: cmd
- name: Store pip debug log
if: always()
uses: actions/upload-artifact@v2
with:
path: pip-debug.log
name: pip-debug-vc${{ matrix.vs-toolset }}-py${{ matrix.python-version }}.log
retention-days: 2
- name: Test Cantera
run: scons test show_long_tests=yes verbose_tests=yes --debug=time

Expand Down
3 changes: 2 additions & 1 deletion interfaces/cython/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ if (
and module_ext == ".pyd"
):
module_ext = f".cp{py_version_nodot}-{info['plat'].replace('-', '_')}.pyd"
print(f"DEBUG: Python module_ext = '{module_ext!r}'")

# Don't print deprecation warnings for internal Python changes.
# Only applies to Python 3.8. The field that is deprecated in Python 3.8
Expand Down Expand Up @@ -102,7 +103,7 @@ ext = localenv.LoadableModule(f"cantera/_cantera{module_ext}",
obj, LIBPREFIX="", SHLIBSUFFIX=module_ext,
SHLIBPREFIX="", LIBSUFFIXES=[module_ext])

build_cmd = ("$python_cmd_esc -m pip wheel --no-build-isolation --no-deps "
build_cmd = ("$python_cmd_esc -m pip wheel -vvv --log pip-debug.log --no-build-isolation --no-deps "
"--wheel-dir=build/python/dist build/python")
plat = info['plat'].replace('-', '_').replace('.', '_')
wheel_name = (f"Cantera-{env['cantera_version']}-cp{py_version_nodot}"
Expand Down
2 changes: 1 addition & 1 deletion interfaces/cython/setup.cfg.in
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ cantera.examples = */*.*
# The module extension needs to be here since we don't want setuptools to
# compile the extension, so there are no `source` files in
# the setup.py extension.
cantera = *.pxd, *@module_ext@
cantera = _cantera.pxd, _cantera*@module_ext@

[options.extras_require]
hdf5 = h5py
Expand Down

0 comments on commit 085daf3

Please sign in to comment.