Skip to content

Commit 4e7ebbd

Browse files
committed
remove debug cruft, enable windows tests in CI
1 parent 56e960a commit 4e7ebbd

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

Diff for: .github/workflows/ci.yaml

+4-6
Original file line numberDiff line numberDiff line change
@@ -299,12 +299,12 @@ jobs:
299299
CIBW_PRERELEASE_PYTHONS: 'True'
300300
CIBW_FREE_THREADED_SUPPORT: 'True'
301301
CIBW_TEST_REQUIRES: pytest setuptools # 3.12+ no longer includes distutils, just always ensure setuptools is present
302-
CIBW_TEST_COMMAND: PYTHONUNBUFFERED=1 python -m pytest -s ${{ matrix.test_args || '{project}' }} # default to test all
302+
CIBW_TEST_COMMAND: PYTHONUNBUFFERED=1 python -m pytest ${{ matrix.test_args || '{project}' }} # default to test all
303303
run: |
304304
set -eux
305-
305+
306306
mkdir cffi
307-
307+
308308
tar zxf ${{ steps.fetch_sdist.outputs.download-path }}/cffi*.tar.gz --strip-components=1 -C cffi
309309
python -m pip install --upgrade "${{ matrix.cibw_version || 'cibuildwheel' }}"
310310
@@ -509,9 +509,7 @@ jobs:
509509
CIBW_BUILD: ${{ matrix.spec }}
510510
CIBW_PRERELEASE_PYTHONS: 'True'
511511
CIBW_TEST_REQUIRES: pytest setuptools
512-
CIBW_TEST_COMMAND: 'python -m pytest {package}/src/c'
513-
# FIXME: /testing takes ~45min on Windows and has some failures...
514-
# CIBW_TEST_COMMAND='python -m pytest {package}/src/c {project}/testing'
512+
CIBW_TEST_COMMAND: 'python -m pytest {package}'
515513
run: |
516514
set -eux
517515

Diff for: src/cffi/verifier.py

+3-5
Original file line numberDiff line numberDiff line change
@@ -284,12 +284,12 @@ def cleanup_tmpdir(tmpdir=None, keep_so=False):
284284
suffix = _get_so_suffixes()[0].lower()
285285
for fn in filelist:
286286
if fn.lower().startswith('_cffi_') and (
287-
fn.lower().endswith(suffix) or
288-
fn.lower().endswith('.c') or
287+
fn.lower().endswith(suffix) or
288+
fn.lower().endswith('.c') or
289289
fn.lower().endswith('.o')):
290290
try:
291291
os.unlink(os.path.join(tmpdir, fn))
292-
except OSError as e:
292+
except OSError:
293293
pass
294294
clean_dir = [os.path.join(tmpdir, 'build')]
295295
for dir in clean_dir:
@@ -302,8 +302,6 @@ def cleanup_tmpdir(tmpdir=None, keep_so=False):
302302
os.unlink(fn)
303303
except OSError:
304304
pass
305-
print("after cleanup_tmp in",tmpdir)
306-
print("files left:\n", "\n".join(os.listdir(tmpdir)))
307305

308306
def _get_so_suffixes():
309307
suffixes = _extension_suffixes()

0 commit comments

Comments
 (0)