From dfbe38ce4ab6261a892bbcfb4879b210ec9f7ac6 Mon Sep 17 00:00:00 2001 From: rly Date: Tue, 14 Jan 2025 14:44:39 -0800 Subject: [PATCH] Remove unnecessary testing on conda --- .github/ISSUE_TEMPLATE/bug_report.yml | 10 +---- .github/workflows/run_all_tests.yml | 64 --------------------------- .github/workflows/run_coverage.yml | 6 ++- .github/workflows/run_tests.yml | 62 +------------------------- 4 files changed, 6 insertions(+), 136 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index f1d04aa69..c583d418b 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -46,15 +46,6 @@ body: - Linux validations: required: true - - type: dropdown - id: executable - attributes: - label: Python Executable - options: - - Conda - - Python - validations: - required: true - type: dropdown id: python_version attributes: @@ -65,6 +56,7 @@ body: - "3.11" - "3.10" - "3.9" + - "other" validations: required: true - type: textarea diff --git a/.github/workflows/run_all_tests.yml b/.github/workflows/run_all_tests.yml index d96975c4b..b1d2ddc59 100644 --- a/.github/workflows/run_all_tests.yml +++ b/.github/workflows/run_all_tests.yml @@ -126,70 +126,6 @@ jobs: run: | tox -e ${{ matrix.test-tox-env }} - run-all-tests-on-conda: - name: ${{ matrix.name }} - runs-on: ubuntu-latest - defaults: - run: - shell: bash -l {0} # needed for conda environment to work - concurrency: - group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.name }} - cancel-in-progress: true - strategy: - fail-fast: false - matrix: - include: - - { name: conda-linux-python3.9-minimum , test-tox-env: pytest-py39-minimum , python-ver: "3.9" , os: ubuntu-latest } - - { name: conda-linux-python3.10-upgraded , test-tox-env: pytest-py310-upgraded , python-ver: "3.10", os: ubuntu-latest } - - { name: conda-linux-python3.11-upgraded , test-tox-env: pytest-py311-upgraded , python-ver: "3.11", os: ubuntu-latest } - - { name: conda-linux-python3.12-upgraded , test-tox-env: pytest-py312-upgraded , python-ver: "3.12", os: ubuntu-latest } - - { name: conda-linux-python3.13-upgraded , test-tox-env: pytest-py313-upgraded , python-ver: "3.13", os: ubuntu-latest } - - { name: conda-linux-python3.13-upgraded-optional , test-tox-env: pytest-py313-upgraded-optional , python-ver: "3.13", os: ubuntu-latest } - - { name: conda-linux-python3.13-prerelease-optional , test-tox-env: pytest-py313-prerelease-optional , python-ver: "3.13", os: ubuntu-latest } - steps: - - name: Checkout repo with submodules - uses: actions/checkout@v4 - with: - submodules: 'recursive' - fetch-depth: 0 # tags are required to determine the version - - - name: Set up Conda - uses: conda-incubator/setup-miniconda@v3 - with: - auto-update-conda: true - python-version: ${{ matrix.python-ver }} - channels: conda-forge - - - name: Install build dependencies - run: | - conda config --set always_yes yes --set changeps1 no - conda info - conda install -c conda-forge "tox>=4" - - - name: Conda reporting - run: | - conda info - conda config --show-sources - conda list --show-channel-urls - - # NOTE tox installs packages from PyPI not conda-forge... - - name: Run tox tests - run: | - tox -e ${{ matrix.test-tox-env }} - - - name: Build wheel and source distribution - run: | - tox -e build - ls -1 dist - - - name: Test installation from a wheel - run: | - tox -e wheelinstall --installpkg dist/*-none-any.whl - - - name: Test installation from a source distribution - run: | - tox -e wheelinstall --installpkg dist/*.tar.gz - run-ros3-tests: name: ${{ matrix.name }} runs-on: ${{ matrix.os }} diff --git a/.github/workflows/run_coverage.yml b/.github/workflows/run_coverage.yml index 1917e9fdf..b9c9568a1 100644 --- a/.github/workflows/run_coverage.yml +++ b/.github/workflows/run_coverage.yml @@ -50,11 +50,13 @@ jobs: - name: Install package if: ${{ ! matrix.opt_req }} - run: python -m pip install ".[test]" + run: | + python -m pip install ".[test]" - name: Install package with optional dependencies if: ${{ matrix.opt_req }} - run: python -m pip install ".[test,full]" + run: | + python -m pip install ".[test,full]" - name: Run tests and generate coverage report run: | diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index f46c54033..2ff759029 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -112,69 +112,9 @@ jobs: run: | tox -e ${{ matrix.test-tox-env }} - run-tests-on-conda: - name: ${{ matrix.name }} - runs-on: ubuntu-latest - defaults: - run: - shell: bash -l {0} - concurrency: - group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.name }} - cancel-in-progress: true - strategy: - fail-fast: false - matrix: - include: - - { name: conda-linux-python3.9-minimum , test-tox-env: pytest-py39-minimum , python-ver: "3.9" , os: ubuntu-latest } - - { name: conda-linux-python3.13-upgraded , test-tox-env: pytest-py313-upgraded , python-ver: "3.13", os: ubuntu-latest } - - { name: conda-linux-python3.13-upgraded-optional , test-tox-env: pytest-py313-upgraded-optional , python-ver: "3.13", os: ubuntu-latest } - steps: - - name: Checkout repo with submodules - uses: actions/checkout@v4 - with: - submodules: 'recursive' - fetch-depth: 0 # tags are required to determine the version - - - name: Set up Conda - uses: conda-incubator/setup-miniconda@v3 - with: - auto-update-conda: true - python-version: ${{ matrix.python-ver }} - channels: conda-forge - - - name: Install build dependencies - run: | - conda config --set always_yes yes --set changeps1 no - conda info - conda install -c conda-forge "tox>=4" - - - name: Conda reporting - run: | - conda info - conda config --show-sources - conda list --show-channel-urls - - # NOTE tox installs packages from PyPI not conda-forge... - - name: Run tox tests - run: | - tox -e ${{ matrix.test-tox-env }} - - - name: Build wheel and source distribution - run: | - tox -e build - ls -1 dist - - - name: Test installation from a wheel - run: | - tox -e wheelinstall --installpkg dist/*-none-any.whl - - - name: Test installation from a source distribution - run: | - tox -e wheelinstall --installpkg dist/*.tar.gz - deploy-dev: name: Deploy pre-release from dev - needs: [run-tests, run-gallery-tests, run-tests-on-conda] + needs: [run-tests, run-gallery-tests] if: ${{ github.event_name == 'push' }} runs-on: ubuntu-latest concurrency: