diff --git a/.github/workflows/pytest-integration.yml b/.github/workflows/pytest-integration.yml index 8b5e5dd..0622f7b 100644 --- a/.github/workflows/pytest-integration.yml +++ b/.github/workflows/pytest-integration.yml @@ -6,9 +6,25 @@ on: - main jobs: - call-pytest-workflow: - # Docs: https://github.com/ASFHyP3/actions - uses: forrestfwilliams/burst2safe/.github/workflows/reusable-pytest.yml - with: - local_package_name: burst2safe - additional_args: -m integration + pytest: + runs-on: ubuntu-latest + + strategy: + matrix: + python_version: >- + ["3.10", "3.11", "3.12"] + + steps: + - uses: actions/checkout@v4 + + - uses: mamba-org/setup-micromamba@v1 + with: + environment-file: environment.yml + create-args: >- + python=${{ matrix.python_version }} + + - name: Pytest in conda environment + shell: bash -l {0} + run: | + python -m pip install --no-deps . + pytest --cov=burst2safe -m integration diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index e0be6ea..2849e3b 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -7,8 +7,25 @@ on: - develop jobs: - call-pytest-workflow: - # Docs: https://github.com/ASFHyP3/actions - uses: forrestfwilliams/burst2safe/.github/workflows/reusable-pytest.yml - with: - local_package_name: burst2safe + pytest: + runs-on: ubuntu-latest + + strategy: + matrix: + python_version: >- + ["3.10", "3.11", "3.12"] + + steps: + - uses: actions/checkout@v4 + + - uses: mamba-org/setup-micromamba@v1 + with: + environment-file: environment.yml + create-args: >- + python=${{ matrix.python_version }} + + - name: Pytest in conda environment + shell: bash -l {0} + run: | + python -m pip install --no-deps . + pytest --cov=burst2safe diff --git a/.github/workflows/reusable-pytest.yml b/.github/workflows/reusable-pytest.yml deleted file mode 100644 index 4de13cd..0000000 --- a/.github/workflows/reusable-pytest.yml +++ /dev/null @@ -1,40 +0,0 @@ -on: - workflow_call: - inputs: - local_package_name: - required: true - type: string - python_versions: - required: false - default: >- - ["3.10", "3.11", "3.12"] - description: JSON string containing the list of python versions to test - type: string - additional_args: - required: false - type: string - description: Additional arguments to pass to pytest as string - default: "" - -jobs: - pytest: - runs-on: ubuntu-latest - - strategy: - matrix: - python_version: ${{ fromJson(inputs.python_versions) }} - - steps: - - uses: actions/checkout@v4 - - - uses: mamba-org/setup-micromamba@v1 - with: - environment-file: environment.yml - create-args: >- - python=${{ matrix.python_version }} - - - name: Pytest in conda environment - shell: bash -l {0} - run: | - python -m pip install --no-deps . - pytest --cov=${{ inputs.local_package_name }} ${{ inputs.pytest_args }}