Skip to content

Commit d644d93

Browse files
committed
Merge branch 'develop' into p/36144
2 parents f80b252 + 80f6d77 commit d644d93

File tree

401 files changed

+6172
-3212
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

401 files changed

+6172
-3212
lines changed

.github/sync_labels.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class ReviewDecision(Enum):
5656
"""
5757
changes_requested = 'CHANGES_REQUESTED'
5858
approved = 'APPROVED'
59-
unclear = 'COMMENTED'
59+
unclear = 'UNCLEAR'
6060

6161
class Priority(Enum):
6262
r"""
@@ -319,12 +319,15 @@ def get_review_decision(self):
319319
return None
320320

321321
if self._review_decision is not None:
322+
if self._review_decision == ReviewDecision.unclear:
323+
return None
322324
return self._review_decision
323325

324326
data = self.view('reviewDecision')
325327
if data:
326328
self._review_decision = ReviewDecision(data)
327329
else:
330+
# To separate a not supplied value from not cached (see https://github.com/sagemath/sage/pull/36177#issuecomment-1704022893 ff)
328331
self._review_decision = ReviewDecision.unclear
329332
info('Review decision for %s: %s' % (self._issue, self._review_decision.value))
330333
return self._review_decision
@@ -349,9 +352,9 @@ def get_reviews(self, complete=False):
349352
self.get_commits()
350353

351354
date = self._commit_date
352-
no_rev = ReviewDecision.unclear.value
355+
unproper_rev = RevState.commented.value
353356
new_revs = [rev for rev in self._reviews if rev['submittedAt'] > date]
354-
proper_new_revs = [rev for rev in new_revs if rev['state'] != no_rev]
357+
proper_new_revs = [rev for rev in new_revs if rev['state'] != unproper_rev]
355358
info('Proper reviews after %s for %s: %s' % (date, self._issue, proper_new_revs))
356359
return proper_new_revs
357360

@@ -463,11 +466,6 @@ def approve_allowed(self):
463466
r"""
464467
Return if the actor has permission to approve this PR.
465468
"""
466-
revs = self.get_reviews(complete=True)
467-
if not any(rev['authorAssociation'] in ('MEMBER', 'OWNER') for rev in revs):
468-
info('PR %s can\'t be approved because of missing member review' % (self._issue))
469-
return False
470-
471469
revs = self.get_reviews()
472470
revs = [rev for rev in revs if rev['author']['login'] != self._actor]
473471
ch_req = ReviewDecision.changes_requested

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
steps:
3131
- name: Checkout
3232
id: checkout
33-
uses: actions/checkout@v3
33+
uses: actions/checkout@v4
3434

3535
- name: Update system packages
3636
id: prepare

.github/workflows/ci-conda.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
conda-env: [environment]
5050

5151
steps:
52-
- uses: actions/checkout@v3
52+
- uses: actions/checkout@v4
5353

5454
- name: Check for Miniconda
5555
id: check_conda

.github/workflows/ci-linux-incremental.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
uninstall_targets: ${{ steps.build-targets.outputs.uninstall_targets }}
4444
build_targets: ${{ steps.build-targets.outputs.build_targets }}
4545
steps:
46-
- uses: actions/checkout@v3
46+
- uses: actions/checkout@v4
4747
- name: Get all packages that have changed
4848
id: changed-packages
4949
uses: tj-actions/changed-files@v38
@@ -83,10 +83,9 @@ jobs:
8383
tox_system_factors: >-
8484
["ubuntu-focal",
8585
"ubuntu-jammy",
86-
"ubuntu-mantic,
86+
"ubuntu-mantic",
8787
"debian-bullseye",
8888
"debian-bookworm",
89-
"ubuntu-mantic,
9089
"fedora-30",
9190
"fedora-38",
9291
"gentoo-python3.11",

.github/workflows/ci-macos.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
LOCAL_ARTIFACT_NAME: sage-local-commit-${{ github.sha }}-tox-local-${{ matrix.tox_env }}-${{ matrix.os }}-xcode_${{ matrix.xcode_version_factor }}
4848
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.tox_env }}--${{ matrix.os }}-xcode_${{ matrix.xcode_version_factor }}
4949
steps:
50-
- uses: actions/checkout@v3
50+
- uses: actions/checkout@v4
5151
- name: Select Xcode version
5252
run: |
5353
if [ ${{ matrix.xcode_version_factor }} != default ]; then sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode_version_factor }}.app; fi
@@ -118,7 +118,7 @@ jobs:
118118

119119
runs-on: ubuntu-latest
120120
steps:
121-
- uses: actions/checkout@v3
121+
- uses: actions/checkout@v4
122122
with:
123123
fetch-depth: 500
124124
- name: fetch tags
@@ -160,7 +160,7 @@ jobs:
160160
TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
161161
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}-xcode_${{ matrix.xcode_version_factor }}
162162
steps:
163-
- uses: actions/checkout@v3
163+
- uses: actions/checkout@v4
164164
if: "!contains(matrix.tox_system_factor, 'nobootstrap')"
165165
- uses: actions/download-artifact@v3
166166
with:

.github/workflows/ci-wsl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
steps:
1818
- name: Configure git
1919
run: git config --global core.symlinks true
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2121
- name: Install Ubuntu 20.04 (in WSL)
2222
run: |
2323
(New-Object System.Net.WebClient).DownloadFile("https://aka.ms/wslubuntu2004", "Ubuntu.appx")

.github/workflows/cygwin.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,14 @@ jobs:
7373
choco install git python39 python39-pip --source cygwin
7474
7575
- name: Check out SageMath
76-
uses: actions/checkout@v3
76+
uses: actions/checkout@v4
7777
with:
7878
repository: ${{ inputs.sage_repo }}
7979
ref: ${{ inputs.sage_ref }}
8080
fetch-depth: 2000
8181

8282
- name: Check out git-trac-command
83-
uses: actions/checkout@v3
83+
uses: actions/checkout@v4
8484
with:
8585
repository: sagemath/git-trac-command
8686
path: git-trac-command

.github/workflows/dist.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232

3333
runs-on: ubuntu-latest
3434
steps:
35-
- uses: actions/checkout@v3
35+
- uses: actions/checkout@v4
3636
- name: Install bootstrap prerequisites
3737
run: |
3838
sudo DEBIAN_FRONTEND=noninteractive apt-get update
@@ -51,7 +51,7 @@ jobs:
5151
env:
5252
CAN_DEPLOY: ${{ secrets.SAGEMATH_PYPI_API_TOKEN != '' }}
5353
steps:
54-
- uses: actions/checkout@v3
54+
- uses: actions/checkout@v4
5555
- name: Install bootstrap prerequisites
5656
run: |
5757
sudo DEBIAN_FRONTEND=noninteractive apt-get update
@@ -106,7 +106,7 @@ jobs:
106106
# Use 'build', not 'pip wheel'
107107
CIBW_BUILD_FRONTEND: build
108108
steps:
109-
- uses: actions/checkout@v3
109+
- uses: actions/checkout@v4
110110

111111
- uses: actions/download-artifact@v3
112112
with:

.github/workflows/doc-build-pdf.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
container: ghcr.io/sagemath/sage/sage-docker-fedora-31-maximal-with-targets:dev
2020
steps:
2121
- name: Checkout
22-
uses: actions/checkout@v3
22+
uses: actions/checkout@v4
2323

2424
- name: Prepare
2525
run: |

.github/workflows/doc-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
container: ghcr.io/sagemath/sage/sage-ubuntu-focal-standard-with-targets:dev
1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
2121

2222
- name: Update system packages
2323
run: |

0 commit comments

Comments
 (0)