diff --git a/.github/workflows/tests-cygwin.yml b/.github/workflows/tests-cygwin.yml index 011dd11e9..043b68e1f 100644 --- a/.github/workflows/tests-cygwin.yml +++ b/.github/workflows/tests-cygwin.yml @@ -14,34 +14,50 @@ jobs: strategy: fail-fast: false matrix: - python: - - '3.10' + python-minor: + - '9' steps: + - name: Tell git to use proper newlines + run: git config --global core.autocrlf input + - name: Checkout uses: actions/checkout@v2 - - name: Set up target Python - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python }} - - name: Setup Cygwin uses: cygwin/cygwin-install-action@v2 + with: + packages: >- + python3${{ matrix.python-minor }} + python3${{ matrix.python-minor }}-pip + cmake make ninja gcc-core gcc-g++ git - name: Install nox + shell: bash.exe -eo pipefail -o igncr "{0}" + env: + PATH: "/bin:/usr/bin:/usr/local/bin:/usr/lib/lapack" + TMP: "/tmp" + TEMP: "/tmp" run: | - python -m pip install nox + /usr/bin/python -m pip install nox nox --version - name: Run tests - run: nox -s test-${{ matrix.python }} + shell: bash.exe -eo pipefail -o igncr "{0}" + env: + PATH: "/bin:/usr/bin:/usr/local/bin:/usr/lib/lapack" + CHERE_INVOKING: 1 + TMP: "/tmp" + TEMP: "/tmp" + run: | + cd "${GITHUB_WORKSPACE}" + nox -s test-3.${{ matrix.python-minor }} - name: Send coverage report uses: codecov/codecov-action@v1 env: - PYTHON: cygwin-${{ matrix.python }} + PYTHON: cygwin-3.${{ matrix.python-minor }} with: flags: tests env_vars: PYTHON - name: cygwin-${{ matrix.python }} + name: cygwin-3.${{ matrix.python-minor }} diff --git a/tests/test_wheel.py b/tests/test_wheel.py index 178ce1582..1dab5d35a 100644 --- a/tests/test_wheel.py +++ b/tests/test_wheel.py @@ -39,6 +39,12 @@ elif platform.system() == 'Darwin': SHARED_LIB_EXT = 'dylib' elif platform.system() == 'Windows': + # I'm using import library (link-time) rather than dynamic library (run-time) + # because that's what was already here for Cygwin + SHARED_LIB_EXT = 'lib' +elif platform.system().startswith("CYGWIN"): + # I'm using import library (link-time) rather than dynamic library (run-time) + # because that's what was already here for Cygwin SHARED_LIB_EXT = 'dll.a' else: raise NotImplementedError(f'Unknown system: {platform.system()}')