diff --git a/.github/workflows/release-to-pypi.yml b/.github/workflows/release-to-pypi.yml index 8e497c20b..7d94ed3e4 100644 --- a/.github/workflows/release-to-pypi.yml +++ b/.github/workflows/release-to-pypi.yml @@ -34,10 +34,6 @@ jobs: - name: Build wheels uses: pypa/cibuildwheel@v2.9.0 - env: - CIBW_SKIP: 'pp*' - CIBW_ARCHS_LINUX: "auto aarch64" - CIBW_ARCHS_MACOS: "auto universal2" - name: Check and upload wheels env: diff --git a/.github/workflows/run-core-traits-tests.yml b/.github/workflows/run-core-traits-tests.yml index 3688286d4..d8706cb72 100644 --- a/.github/workflows/run-core-traits-tests.yml +++ b/.github/workflows/run-core-traits-tests.yml @@ -16,14 +16,13 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Install local package run: | - python -m pip install --upgrade pip # Uninstall setuptools so that the tests will catch any accidental # dependence of the Traits source on setuptools. Note that in future # setuptools may not exist in a newly-created venv diff --git a/.github/workflows/run-style-checks.yml b/.github/workflows/run-style-checks.yml index 9f6435eff..dc8836b84 100644 --- a/.github/workflows/run-style-checks.yml +++ b/.github/workflows/run-style-checks.yml @@ -5,22 +5,16 @@ on: jobs: style: - strategy: - matrix: - os: [ubuntu-latest] - python-version: ['3.8'] - - runs-on: ${{ matrix.os }} + runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + - uses: actions/checkout@v3 + - name: Set up Python 3.10 + uses: actions/setup-python@v4 with: - python-version: ${{ matrix.python-version }} + python-version: '3.10' - name: Install dependencies and local packages run: | - python -m pip install --upgrade pip python -m pip install flake8 python -m pip install flake8-ets - name: Run style checks diff --git a/.github/workflows/run-traits-tests.yml b/.github/workflows/run-traits-tests.yml index afbc25bd7..74fd1a9cb 100644 --- a/.github/workflows/run-traits-tests.yml +++ b/.github/workflows/run-traits-tests.yml @@ -14,7 +14,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install Linux packages for Qt 5 support run: | sudo apt-get update @@ -28,12 +28,11 @@ jobs: sudo apt-get install libxcb-xinerama0 if: matrix.os == 'ubuntu-latest' - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Install dependencies and local packages run: | - python -m pip install --upgrade pip python -m pip install .[test] - name: Create clean test directory run: | diff --git a/.github/workflows/test-documentation-build.yml b/.github/workflows/test-documentation-build.yml index 9aa7dd386..aa7b55d00 100644 --- a/.github/workflows/test-documentation-build.yml +++ b/.github/workflows/test-documentation-build.yml @@ -5,24 +5,16 @@ on: jobs: docs: - strategy: - matrix: - os: [ubuntu-latest] - python-version: ['3.8'] - - runs-on: ${{ matrix.os }} + runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + - uses: actions/checkout@v3 + - name: Set up Python 3.10 + uses: actions/setup-python@v4 with: - python-version: ${{ matrix.python-version }} + python-version: '3.10' - name: Install dependencies and local packages - run: | - python -m pip install --upgrade pip - python -m pip install Sphinx enthought_sphinx_theme sphinx-copybutton - python -m pip install . + run: python -m pip install .[docs] - name: Build HTML documentation with Sphinx run: | cd docs diff --git a/.github/workflows/test-from-pypi.yml b/.github/workflows/test-from-pypi.yml index 4283b7637..10be0fcac 100644 --- a/.github/workflows/test-from-pypi.yml +++ b/.github/workflows/test-from-pypi.yml @@ -35,13 +35,10 @@ jobs: sudo apt-get install libxcb-xinerama0 if: runner.os == 'Linux' - name: Set up Python ${{ matrix.python-version }} (${{ matrix.python-architecture }}) - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} architecture: ${{ matrix.python-architecture }} - - name: Install prerequisites - run: | - python -m pip install --upgrade pip setuptools wheel - name: Install Traits and test dependencies from PyPI sdist run: | python -m pip install --no-binary traits traits[test] @@ -82,13 +79,10 @@ jobs: sudo apt-get install libxcb-xinerama0 if: runner.os == 'Linux' - name: Set up Python ${{ matrix.python-version }} (${{ matrix.python-architecture }}) - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} architecture: ${{ matrix.python-architecture }} - - name: Install prerequisites - run: | - python -m pip install --upgrade pip setuptools wheel - name: Install Traits and test dependencies from PyPI wheel run: | python -m pip install --only-binary traits traits[test] diff --git a/pyproject.toml b/pyproject.toml index 0edce86b2..880fadd25 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,3 +10,12 @@ target-version = ['py36'] profile = 'black' line_length = 79 order_by_type = 'False' + +[tool.cibuildwheel] +skip = 'pp*' + +[tool.cibuildwheel.macos] +archs = ['auto', 'universal2'] + +[tool.cibuildwheel.linux] +archs = ['auto', 'aarch64']