Skip to content

Commit

Permalink
sagemathgh-36467: Combine ci linter jobs
Browse files Browse the repository at this point in the history
<!-- ^^^^^
Please provide a concise, informative and self-explanatory title.
Don't put issue numbers in there, do this in the PR body below.
For example, instead of "Fixes sagemath#1234" use "Introduce new method to
calculate 1+1"
-->
<!-- Describe your changes here in detail -->

<!-- Why is this change required? What problem does it solve? -->
<!-- If this PR resolves an open issue, please link to it here. For
example "Fixes sagemath#12345". -->
<!-- If your change requires a documentation PR, please link it
appropriately. -->

to de-clutter the "checks" a bit.

### 📝 Checklist

<!-- Put an `x` in all the boxes that apply. -->
<!-- If your change requires a documentation PR, please link it
appropriately -->
<!-- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->
<!-- Feel free to remove irrelevant items. -->

- [x] The title is concise, informative, and self-explanatory.
- [x] The description explains in detail what this PR is about.
- [ ] I have linked a relevant issue or discussion.
- [ ] I have created tests covering the changes.
- [ ] I have updated the documentation accordingly.

### ⌛ Dependencies

<!-- List all open PRs that this PR logically depends on
- sagemath#12345: short description why this is a dependency
- sagemath#34567: ...
-->

<!-- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->

URL: sagemath#36467
Reported by: Tobias Diez
Reviewer(s): Kwankyu Lee
  • Loading branch information
Release Manager committed Oct 17, 2023
2 parents 5379e8f + 5924072 commit b98f55b
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 45 deletions.
54 changes: 13 additions & 41 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,60 +14,32 @@ concurrency:
cancel-in-progress: true

jobs:
lint-pycodestyle:
name: Code style check with pycodestyle
lint:
name: Lint
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Merge CI fixes from sagemath/sage
run: |
.ci/merge-fixes.sh
env:
GH_TOKEN: ${{ github.token }}

- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.9
- name: Install pycodestyle
run: pip install tox pycodestyle
- name: Lint using pycodestyle

- name: Install dependencies
run: pip install tox pycodestyle relint

- name: Code style check with pycodestyle
run: tox -e pycodestyle-minimal
lint-relint:
name: Code style check with relint
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Merge CI fixes from sagemath/sage
run: |
.ci/merge-fixes.sh
env:
GH_TOKEN: ${{ github.token }}
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.9
- name: Install relint
run: pip install tox relint
- name: Lint using relint

- name: Code style check with relint
run: tox -e relint -- src/sage/
lint-rst:
name: Validate docstring markup as RST
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Merge CI fixes from sagemath/sage
run: |
.ci/merge-fixes.sh
env:
GH_TOKEN: ${{ github.token }}
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.9
- name: Install tox
run: pip install tox
- name: Lint using tox -e rst

- name: Validate docstring markup as RST
run: tox -e rst
6 changes: 3 additions & 3 deletions build/pkgs/configure/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=configure-VERSION.tar.gz
sha1=d00890d9ecb95b96d06007dd383ce32d7eb2d814
md5=54f3dfffc2ce304135d3db1c0aad5905
cksum=649734943
sha1=30d18df6a493b582f390d7c59e751a14ea9ada25
md5=f1e1496643e2b227e89624ecb709e781
cksum=438585823
2 changes: 1 addition & 1 deletion build/pkgs/configure/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
a84c11dd8244bf18bcc4bfe5fe4e6adde20ff9ff
f3edff6b6c7d34726bd2ea1337cac0261eec3fce

0 comments on commit b98f55b

Please sign in to comment.