From 72c4cdfd20cec96cb59b9beccb2869db03314edd Mon Sep 17 00:00:00 2001 From: David Roe Date: Tue, 7 Feb 2023 10:01:51 +0100 Subject: [PATCH 1/5] Fix the linting problems --- src/sage/algebras/quantum_groups/quantum_group_gap.py | 1 - src/sage/combinat/vector_partition.py | 1 - src/sage/modular/modform/notes.py | 2 +- src/sage/rings/generic.py | 1 - src/sage/rings/ring_extension_morphism.pyx | 3 ++- src/sage/sat/solvers/dimacs.py | 3 +-- 6 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/sage/algebras/quantum_groups/quantum_group_gap.py b/src/sage/algebras/quantum_groups/quantum_group_gap.py index 3ac5569ce49..b901c3b8225 100644 --- a/src/sage/algebras/quantum_groups/quantum_group_gap.py +++ b/src/sage/algebras/quantum_groups/quantum_group_gap.py @@ -2689,4 +2689,3 @@ def _unpickle_generic_element(parent, data): ret.append(libgap(data[2 * i])) ret.append(one * libgap(data[2 * i + 1].subs(q=parent._libgap_q))) return parent.element_class(parent, F.ObjByExtRep(ret)) - diff --git a/src/sage/combinat/vector_partition.py b/src/sage/combinat/vector_partition.py index 0e135bd2e52..ba1a51c29d4 100644 --- a/src/sage/combinat/vector_partition.py +++ b/src/sage/combinat/vector_partition.py @@ -333,4 +333,3 @@ def __iter__(self): new_parts = self._parts[i+1:] for vecpar in VectorPartitions(new_vec, min=self._min, parts=new_parts, distinct=self._distinct, is_repeatable=self._is_repeatable): yield self.element_class(self, [list(part)] + list(vecpar)) - diff --git a/src/sage/modular/modform/notes.py b/src/sage/modular/modform/notes.py index 474147e22e3..833bb017bfd 100644 --- a/src/sage/modular/modform/notes.py +++ b/src/sage/modular/modform/notes.py @@ -1,4 +1,4 @@ -""" +r""" Design notes The implementation depends on the fact that we have dimension formulas diff --git a/src/sage/rings/generic.py b/src/sage/rings/generic.py index aa1b552106b..83f923cee5c 100644 --- a/src/sage/rings/generic.py +++ b/src/sage/rings/generic.py @@ -257,4 +257,3 @@ def __iter__(self): yield self.df return tuple(prod(_aux(*tup) for tup in pairs)) - diff --git a/src/sage/rings/ring_extension_morphism.pyx b/src/sage/rings/ring_extension_morphism.pyx index 2cde5d9502d..2b69f2ce8ea 100644 --- a/src/sage/rings/ring_extension_morphism.pyx +++ b/src/sage/rings/ring_extension_morphism.pyx @@ -466,7 +466,8 @@ cdef class RingExtensionHomomorphism(RingMap): s += "with map on base ring" ss = self.base_map()._repr_defn() ss = re.sub('\nwith map on base ring:?$', '', ss, 0, re.MULTILINE) - if ss != "": s += ":\n" + ss + if ss != "": + s += ":\n" + ss if s != "" and s[-1] == "\n": s = s[:-1] return s diff --git a/src/sage/sat/solvers/dimacs.py b/src/sage/sat/solvers/dimacs.py index 92d68658eac..c1ad5409f55 100644 --- a/src/sage/sat/solvers/dimacs.py +++ b/src/sage/sat/solvers/dimacs.py @@ -357,7 +357,7 @@ def render_dimacs(clauses, filename, nlits): fh.close() def _run(self): - """ + r""" Run 'command' and collect output. TESTS: @@ -752,4 +752,3 @@ class Kissat(DIMACS): """ command = "kissat -q {input}" - From 810354b3964a3859a59203e0a4dc37a25203a328 Mon Sep 17 00:00:00 2001 From: David Roe Date: Tue, 7 Feb 2023 14:28:57 +0100 Subject: [PATCH 2/5] Add missing uses line to cygwin workflow --- .github/workflows/ci-cygwin-standard.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci-cygwin-standard.yml b/.github/workflows/ci-cygwin-standard.yml index 32efd7f8a4a..146039c6921 100644 --- a/.github/workflows/ci-cygwin-standard.yml +++ b/.github/workflows/ci-cygwin-standard.yml @@ -59,6 +59,7 @@ jobs: needs: [cygwin-stage-i-a, cygwin-stage-i-b] cygwin-stage-ii-e: + uses: ./.github/workflows/cygwin.yml env: STAGE: ii-e PREVIOUS_STAGES: i-* From e71ecc88a10f48571745495993ed267f5c1f60ac Mon Sep 17 00:00:00 2001 From: David Roe Date: Tue, 7 Feb 2023 15:27:16 +0100 Subject: [PATCH 3/5] Update ci yml file --- .github/workflows/ci-cygwin-standard.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci-cygwin-standard.yml b/.github/workflows/ci-cygwin-standard.yml index 146039c6921..448b38ace85 100644 --- a/.github/workflows/ci-cygwin-standard.yml +++ b/.github/workflows/ci-cygwin-standard.yml @@ -60,12 +60,12 @@ jobs: cygwin-stage-ii-e: uses: ./.github/workflows/cygwin.yml - env: - STAGE: ii-e - PREVIOUS_STAGES: i-* - TARGETS: threejs tachyon pillow jmol m4rie sympy lrcalc lcalc symmetrica cliquer libbraiding planarity rw elliptic_curves combinatorial_designs sympow - LOCAL_ARTIFACT_NAME: sage-local-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }} - LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }} + with: + stage: ii-e + previous_stages: i-* + targets: threejs tachyon pillow jmol m4rie sympy lrcalc lcalc symmetrica cliquer libbraiding planarity rw elliptic_curves combinatorial_designs sympow + local_artifact_name: sage-local-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }} + logs_artifact_name: logs-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }} needs: [cygwin-stage-i-a, cygwin-stage-i-b] From e5b10d7a0f752dfdb89179336b468d8c462ceabc Mon Sep 17 00:00:00 2001 From: David Roe Date: Thu, 9 Feb 2023 16:28:30 +0100 Subject: [PATCH 4/5] Fix capitalization --- .github/workflows/ci-cygwin-standard.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-cygwin-standard.yml b/.github/workflows/ci-cygwin-standard.yml index 448b38ace85..b286b38520e 100644 --- a/.github/workflows/ci-cygwin-standard.yml +++ b/.github/workflows/ci-cygwin-standard.yml @@ -64,8 +64,8 @@ jobs: stage: ii-e previous_stages: i-* targets: threejs tachyon pillow jmol m4rie sympy lrcalc lcalc symmetrica cliquer libbraiding planarity rw elliptic_curves combinatorial_designs sympow - local_artifact_name: sage-local-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }} - logs_artifact_name: logs-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }} + LOCAL_ARTIFACT_NAME: sage-local-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }} + LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }} needs: [cygwin-stage-i-a, cygwin-stage-i-b] From 4fc52b382c918e02b52d38a724f1410f5df24ad8 Mon Sep 17 00:00:00 2001 From: David Roe Date: Thu, 9 Feb 2023 16:34:50 +0100 Subject: [PATCH 5/5] Try switching to env --- .github/workflows/ci-cygwin-standard.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci-cygwin-standard.yml b/.github/workflows/ci-cygwin-standard.yml index b286b38520e..c6bb8612402 100644 --- a/.github/workflows/ci-cygwin-standard.yml +++ b/.github/workflows/ci-cygwin-standard.yml @@ -64,6 +64,7 @@ jobs: stage: ii-e previous_stages: i-* targets: threejs tachyon pillow jmol m4rie sympy lrcalc lcalc symmetrica cliquer libbraiding planarity rw elliptic_curves combinatorial_designs sympow + env: LOCAL_ARTIFACT_NAME: sage-local-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }} LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}