From 9bc431b7dd0de3ee99a46f502919ca5d2fdafca3 Mon Sep 17 00:00:00 2001 From: Wyatt Stanke Date: Tue, 20 Feb 2024 20:05:17 -0500 Subject: [PATCH] Fix up tests --- .github/workflows/test.yml | 96 ++------------------------------------ 1 file changed, 4 insertions(+), 92 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a5ec6322..786d1900 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,9 +20,6 @@ jobs: - "3.9" - "3.10" - "3.11" - test_type: - - "core" - - "extended" steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} @@ -30,93 +27,8 @@ jobs: with: python-version: ${{ matrix.python-version }} poetry-version: "1.4.2" - cache-key: ${{ matrix.test_type }} - install-command: if [ "${{ matrix.test_type }}" == "core" ]; then - echo "Running core tests, installing dependencies with poetry..." - poetry install - else - echo "Running extended tests, installing dependencies with poetry..." - poetry install -E extended_testing - fi - - name: Run ${{matrix.test_type}} tests + install-command: poetry install + - name: Run tests run: | - if [ "${{ matrix.test_type }}" == "core" ]; then - make test - else - make extended_tests - fi - shell: bash - - name: Python ${{ matrix.python-version }} ${{ matrix.test_type }} - uses: actions/checkout@v4 - # - name: Set up Python ${{ matrix.python-version }} - # uses: "./.github/actions/poetry_setup" - # with: - # python-version: ${{ matrix.python-version }} - # poetry-version: "1.4.2" - # cache-key: ${{ matrix.test_type }} - # install-command: | - # if [ "${{ matrix.test_type }}" == "core" ]; then - # echo "Running core tests, installing dependencies with poetry..." - # poetry install - # else - # echo "Running extended tests, installing dependencies with poetry..." - # poetry install -E extended_testing - # fi - - name: Run ${{matrix.test_type}} tests - run: | - if [ "${{ matrix.test_type }}" == "core" ]; then - make test - else - make extended_tests - fi - shell: bash - build: - runs-on: ubuntu-latest - strategy: - matrix: - python-version: - - "3.8" - - "3.9" - - "3.10" - - "3.11" - test_type: - - "core" - - "extended" - name: Python ${{ matrix.python-version }} ${{ matrix.test_type }} - steps: - - uses: actions/checkout@v4 - # - name: Set up Python ${{ matrix.python-version }} - # uses: "./.github/actions/poetry_setup" - # with: - # python-version: ${{ matrix.python-version }} - # poetry-version: "1.4.2" - # cache-key: ${{ matrix.test_type }} - # install-command: | - # if [ "${{ matrix.test_type }}" == "core" ]; then - # echo "Running core tests, installing dependencies with poetry..." - # poetry install - # else - # echo "Running extended tests, installing dependencies with poetry..." - # poetry install -E extended_testing - # fi - - name: Set up Python ${{ matrix.python-version }} - uses: "snok/install-poetry@v1" - with: - python-version: ${{ matrix.python-version }} - poetry-version: "1.4.2" - cache-key: ${{ matrix.test_type }} - install-command: if [ "${{ matrix.test_type }}" == "core" ]; then - echo "Running core tests, installing dependencies with poetry..." - poetry install - else - echo "Running extended tests, installing dependencies with poetry..." - poetry install -E extended_testing - fi - - name: Run ${{matrix.test_type}} tests - run: | - if [ "${{ matrix.test_type }}" == "core" ]; then - make test - else - make extended_tests - fi - shell: bash + pytest + shell: bash \ No newline at end of file