diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dfa106aa..8352293d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,7 +29,7 @@ concurrency: defaults: run: - shell: bash -l {0} + shell: bash -el {0} jobs: tests: name: ${{ matrix.os }}, Python ${{ matrix.python-version }}, ${{ matrix.conda-standalone }} @@ -39,23 +39,23 @@ jobs: matrix: include: # UBUNTU - #- os: ubuntu-latest - # python-version: "3.8" - # conda-standalone: conda-standalone - # check-docs: true - #- os: ubuntu-latest - # python-version: "3.9" - # conda-standalone: conda-standalone - # check-docs: true - #- os: ubuntu-latest - # python-version: "3.10" - # conda-standalone: conda-standalone-nightly - #- os: ubuntu-latest - # python-version: "3.11" - # conda-standalone: micromamba - #- os: ubuntu-latest - # python-version: "3.12" - # conda-standalone: conda-standalone + - os: ubuntu-latest + python-version: "3.8" + conda-standalone: conda-standalone + check-docs: true + - os: ubuntu-latest + python-version: "3.9" + conda-standalone: conda-standalone + check-docs: true + - os: ubuntu-latest + python-version: "3.10" + conda-standalone: conda-standalone-nightly + - os: ubuntu-latest + python-version: "3.11" + conda-standalone: micromamba + - os: ubuntu-latest + python-version: "3.12" + conda-standalone: conda-standalone # MACOS - os: macos-13 python-version: "3.8" @@ -67,30 +67,30 @@ jobs: # - os: macos-13 # python-version: "3.10" # conda-standalone: micromamba - #- os: macos-latest - # python-version: "3.11" - # conda-standalone: conda-standalone - #- os: macos-latest - # python-version: "3.12" - # conda-standalone: micromamba - ## WINDOWS - #- os: windows-latest - # python-version: "3.8" - # conda-standalone: conda-standalone - #- os: windows-latest - # python-version: "3.9" - # conda-standalone: conda-standalone-nightly - #- os: windows-latest - # python-version: "3.10" - # conda-standalone: conda-standalone - #- os: windows-latest - # python-version: "3.11" - # # conda-standalone: micromamba - # conda-standalone: conda-standalone-nightly - #- os: windows-latest - # python-version: "3.12" - # # conda-standalone: micromamba - # conda-standalone: conda-standalone + - os: macos-latest + python-version: "3.11" + conda-standalone: conda-standalone + - os: macos-latest + python-version: "3.12" + conda-standalone: micromamba + # WINDOWS + - os: windows-latest + python-version: "3.8" + conda-standalone: conda-standalone + - os: windows-latest + python-version: "3.9" + conda-standalone: conda-standalone-nightly + - os: windows-latest + python-version: "3.10" + conda-standalone: conda-standalone + - os: windows-latest + python-version: "3.11" + # conda-standalone: micromamba + conda-standalone: conda-standalone-nightly + - os: windows-latest + python-version: "3.12" + # conda-standalone: micromamba + conda-standalone: conda-standalone env: PYTHONUNBUFFERED: "1" @@ -132,8 +132,6 @@ jobs: conda activate constructor-dev echo "CONSTRUCTOR_CONDA_EXE=$CONDA_PREFIX/standalone_conda/conda.exe" >> $GITHUB_ENV fi - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 - name: Run unit tests run: | pytest -vv --cov=constructor --cov-branch tests/ -m "not examples" diff --git a/tests/conftest.py b/tests/conftest.py index e3cece0c..169c21a6 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,3 +1,4 @@ +import os import subprocess from pathlib import Path @@ -19,12 +20,13 @@ def self_signed_application_certificate_macos(tmp_path): notarization_identity = "testapplication" notarization_identity_password = "5678" keychain_password = "abcd" - env = { + env = os.environ.copy() + env.update({ "APPLICATION_SIGNING_ID": notarization_identity, "APPLICATION_SIGNING_PASSWORD": notarization_identity_password, "KEYCHAIN_PASSWORD": keychain_password, "ROOT_DIR": str(cert_root), - } + }) p = subprocess.run( ["bash", REPO_DIR / "scripts" / "create_self_signed_certificates_macos.sh"], env=env,