Skip to content

Commit

Permalink
Merge pull request #2447 from cta-observatory/bump-setuptools-version
Browse files Browse the repository at this point in the history
Bump setuptools and setuptools scm versions
  • Loading branch information
maxnoe authored Nov 2, 2023
2 parents 263c197 + 40d3f05 commit 3c4f140
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
17 changes: 9 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ jobs:
- uses: actions/setup-python@v4
with:
python-version: "3.9"
- name: Check README syntax
run: |
pip install restructuredtext-lint
restructuredtext-lint README.rst
- uses: pre-commit/[email protected]
with:
extra_args: --files $(git diff origin/main --name-only)
Expand Down Expand Up @@ -96,7 +100,7 @@ jobs:
python-version: ${{ matrix.python-version }}
check-latest: true

- if: ${{ matrix.install-method == 'pip' && runner.os == 'macOS' }} && contains(github.event.pull_request.labels.*.name, 'documentation-only') == false
- if: matrix.install-method == 'pip' && runner.os == 'macOS' && contains(github.event.pull_request.labels.*.name, 'documentation-only') == false
name: Fix Python PATH on macOS
# See https://github.com/actions/setup-python/issues/132 and
# https://github.com/actions/setup-python/issues/132#issuecomment-779406058
Expand All @@ -108,18 +112,15 @@ jobs:
- name: Install dependencies
if: contains(github.event.pull_request.labels.*.name, 'documentation-only') == false
env:
PYTHON_VERSION: ${{ matrix.python-version }}
run: |
python --version
pip install pytest-cov restructuredtext-lint pytest-xdist 'coverage!=6.3.0'
python --version | grep "Python ${PYTHON_VERSION}"
pip install pytest-cov pytest-xdist 'coverage!=6.3.0'
pip install .[all]
pip install ./test_plugin
pip freeze
- name: Static codechecks
if: contains(github.event.pull_request.labels.*.name, 'documentation-only') == false
run: |
restructuredtext-lint README.rst
- name: ctapipe-info
if: contains(github.event.pull_request.labels.*.name, 'documentation-only') == false
run: |
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["setuptools >= 40.6.0", "setuptools_scm[toml]>=3.4"]
requires = ["setuptools>=64", "setuptools_scm[toml]>=8"]
build-backend = "setuptools.build_meta"

[tool.setuptools_scm]
Expand Down

0 comments on commit 3c4f140

Please sign in to comment.