Skip to content

Commit 2852728

Browse files
authored
Merge branch 'master' into characteristicgroup
2 parents b9c46fa + c7b39cb commit 2852728

442 files changed

Lines changed: 4820 additions & 2278 deletions

File tree

Some content is hidden

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

.github/workflows/auto_assign_reviewers.yaml

Lines changed: 0 additions & 29 deletions
This file was deleted.

.github/workflows/build_template.yml

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,6 @@ jobs:
5050
shell: bash # there is no script body, so this is safe to "run" outside landrun.
5151
run: |
5252
# We just populate the env vars for this step to make them viewable in the logs
53-
- name: Generate lean-pr-testing app token
54-
id: lean-pr-testing-token
55-
uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
56-
with:
57-
app-id: ${{ secrets.MATHLIB_LEAN_PR_TESTING_APP_ID }}
58-
private-key: ${{ secrets.MATHLIB_LEAN_PR_TESTING_PRIVATE_KEY }}
59-
owner: leanprover
60-
repositories: lean4
6153
- name: cleanup
6254
shell: bash # This *just* deletes old files, so is safe to run outside landrun.
6355
run: |
@@ -367,17 +359,6 @@ jobs:
367359
cd pr-branch
368360
du .lake/build/lib/lean/Mathlib || echo "This code should be unreachable"
369361
370-
- name: upload artifact containing contents of pr-branch
371-
# temporary measure for debugging no-build failures
372-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
373-
with:
374-
name: mathlib4_artifact
375-
include-hidden-files: true
376-
# we exclude .git since there may be secrets in there
377-
path: |
378-
pr-branch/
379-
!pr-branch/.git/
380-
381362
# The cache secrets are available here, so we must not run any untrusted code.
382363
- name: Upload cache to Azure
383364
# We only upload the cache if the build started (whether succeeding, failing, or cancelled)
@@ -576,6 +557,17 @@ jobs:
576557
exit 1
577558
fi
578559
560+
# Generate a fresh token just before posting comments.
561+
# GitHub App tokens expire after 1 hour, and the build can take longer than that.
562+
- name: Generate lean-pr-testing app token
563+
if: always()
564+
id: lean-pr-testing-token
565+
uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
566+
with:
567+
app-id: ${{ secrets.MATHLIB_LEAN_PR_TESTING_APP_ID }}
568+
private-key: ${{ secrets.MATHLIB_LEAN_PR_TESTING_PRIVATE_KEY }}
569+
owner: leanprover
570+
repositories: lean4
579571
# The create-github-app-token README states that this token is masked and will not be logged accidentally.
580572
- name: Post comments for lean-pr-testing-NNNN and batteries-pr-testing-NNNN branches
581573
if: always()

.github/workflows/export_telemetry.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,6 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: Export workflow telemetry
22-
uses: corentinmusard/otel-cicd-action@7e307f7baefcf4929d94d2844bc72d87566a75c3 # v3.0.0
23-
with:
24-
otlpEndpoint: ${{ secrets.OTLP_ENDPOINT }}
25-
otlpHeaders: ${{ secrets.OTLP_HEADERS }}
26-
githubToken: ${{ secrets.GITHUB_TOKEN }}
27-
runId: ${{ github.event.workflow_run.id }}
28-
29-
- name: Export workflow telemetry (alt endpoint)
3022
uses: corentinmusard/otel-cicd-action@7e307f7baefcf4929d94d2844bc72d87566a75c3 # v3.0.0
3123
with:
3224
otlpEndpoint: ${{ secrets.OTLP_ENDPOINT_ALT }}

Mathlib.lean

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ public import Mathlib.Algebra.Category.ModuleCat.Subobject
206206
public import Mathlib.Algebra.Category.ModuleCat.Tannaka
207207
public import Mathlib.Algebra.Category.ModuleCat.Topology.Basic
208208
public import Mathlib.Algebra.Category.ModuleCat.Topology.Homology
209+
public import Mathlib.Algebra.Category.ModuleCat.Ulift
209210
public import Mathlib.Algebra.Category.MonCat.Adjunctions
210211
public import Mathlib.Algebra.Category.MonCat.Basic
211212
public import Mathlib.Algebra.Category.MonCat.Colimits
@@ -586,6 +587,7 @@ public import Mathlib.Algebra.Homology.Embedding.TruncGE
586587
public import Mathlib.Algebra.Homology.Embedding.TruncGEHomology
587588
public import Mathlib.Algebra.Homology.Embedding.TruncLE
588589
public import Mathlib.Algebra.Homology.Embedding.TruncLEHomology
590+
public import Mathlib.Algebra.Homology.EulerCharacteristic
589591
public import Mathlib.Algebra.Homology.ExactSequence
590592
public import Mathlib.Algebra.Homology.ExactSequenceFour
591593
public import Mathlib.Algebra.Homology.Factorizations.Basic
@@ -1396,6 +1398,7 @@ public import Mathlib.AlgebraicTopology.FundamentalGroupoid.Product
13961398
public import Mathlib.AlgebraicTopology.FundamentalGroupoid.SimplyConnected
13971399
public import Mathlib.AlgebraicTopology.ModelCategory.Basic
13981400
public import Mathlib.AlgebraicTopology.ModelCategory.Bifibrant
1401+
public import Mathlib.AlgebraicTopology.ModelCategory.BifibrantObjectHomotopy
13991402
public import Mathlib.AlgebraicTopology.ModelCategory.BrownLemma
14001403
public import Mathlib.AlgebraicTopology.ModelCategory.CategoryWithCofibrations
14011404
public import Mathlib.AlgebraicTopology.ModelCategory.CofibrantObjectHomotopy
@@ -2431,6 +2434,7 @@ public import Mathlib.CategoryTheory.ConcreteCategory.Bundled
24312434
public import Mathlib.CategoryTheory.ConcreteCategory.BundledHom
24322435
public import Mathlib.CategoryTheory.ConcreteCategory.Elementwise
24332436
public import Mathlib.CategoryTheory.ConcreteCategory.EpiMono
2437+
public import Mathlib.CategoryTheory.ConcreteCategory.Forget
24342438
public import Mathlib.CategoryTheory.ConcreteCategory.ReflectsIso
24352439
public import Mathlib.CategoryTheory.ConcreteCategory.UnbundledHom
24362440
public import Mathlib.CategoryTheory.Conj
@@ -3411,6 +3415,7 @@ public import Mathlib.Computability.PostTuringMachine
34113415
public import Mathlib.Computability.Primrec
34123416
public import Mathlib.Computability.Primrec.Basic
34133417
public import Mathlib.Computability.Primrec.List
3418+
public import Mathlib.Computability.RecursiveIn
34143419
public import Mathlib.Computability.Reduce
34153420
public import Mathlib.Computability.RegularExpressions
34163421
public import Mathlib.Computability.TMComputable
@@ -4199,6 +4204,7 @@ public import Mathlib.FieldTheory.IsAlgClosed.Basic
41994204
public import Mathlib.FieldTheory.IsAlgClosed.Classification
42004205
public import Mathlib.FieldTheory.IsAlgClosed.Spectrum
42014206
public import Mathlib.FieldTheory.IsPerfectClosure
4207+
public import Mathlib.FieldTheory.IsRealClosed.Basic
42024208
public import Mathlib.FieldTheory.IsSepClosed
42034209
public import Mathlib.FieldTheory.Isaacs
42044210
public import Mathlib.FieldTheory.JacobsonNoether
@@ -4872,6 +4878,7 @@ public import Mathlib.LinearAlgebra.TensorProduct.Basic
48724878
public import Mathlib.LinearAlgebra.TensorProduct.Basis
48734879
public import Mathlib.LinearAlgebra.TensorProduct.DirectLimit
48744880
public import Mathlib.LinearAlgebra.TensorProduct.Finiteness
4881+
public import Mathlib.LinearAlgebra.TensorProduct.Free
48754882
public import Mathlib.LinearAlgebra.TensorProduct.Graded.External
48764883
public import Mathlib.LinearAlgebra.TensorProduct.Graded.Internal
48774884
public import Mathlib.LinearAlgebra.TensorProduct.Matrix
@@ -5321,7 +5328,7 @@ public import Mathlib.NumberTheory.Harmonic.GammaDeriv
53215328
public import Mathlib.NumberTheory.Harmonic.Int
53225329
public import Mathlib.NumberTheory.Harmonic.ZetaAsymp
53235330
public import Mathlib.NumberTheory.Height.Basic
5324-
public import Mathlib.NumberTheory.Height.Instances
5331+
public import Mathlib.NumberTheory.Height.NumberField
53255332
public import Mathlib.NumberTheory.JacobiSum.Basic
53265333
public import Mathlib.NumberTheory.KummerDedekind
53275334
public import Mathlib.NumberTheory.LSeries.AbstractFuncEq
@@ -5753,6 +5760,7 @@ public import Mathlib.Order.Synonym
57535760
public import Mathlib.Order.TeichmullerTukey
57545761
public import Mathlib.Order.TransfiniteIteration
57555762
public import Mathlib.Order.TypeTags
5763+
public import Mathlib.Order.Types.Arithmetic
57565764
public import Mathlib.Order.Types.Defs
57575765
public import Mathlib.Order.ULift
57585766
public import Mathlib.Order.UpperLower.Basic
@@ -6502,6 +6510,7 @@ public import Mathlib.RingTheory.Unramified.Basic
65026510
public import Mathlib.RingTheory.Unramified.Field
65036511
public import Mathlib.RingTheory.Unramified.Finite
65046512
public import Mathlib.RingTheory.Unramified.LocalRing
6513+
public import Mathlib.RingTheory.Unramified.LocalStructure
65056514
public import Mathlib.RingTheory.Unramified.Locus
65066515
public import Mathlib.RingTheory.Unramified.Pi
65076516
public import Mathlib.RingTheory.Valuation.AlgebraInstances

Mathlib/Algebra/ArithmeticGeometric.lean

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module
1+
module -- shake: keep-all
22

33
public import Mathlib.Algebra.Order.Module.Field
44
public import Mathlib.Data.EReal.Inv

Mathlib/Algebra/Category/AlgCat/Basic.lean

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ instance : Inhabited (AlgCat R) :=
151151
lemma forget_obj {A : AlgCat.{v} R} : (forget (AlgCat.{v} R)).obj A = A := rfl
152152

153153
lemma forget_map {A B : AlgCat.{v} R} (f : A ⟶ B) :
154-
(forget (AlgCat.{v} R)).map f = f :=
154+
(forget (AlgCat.{v} R)).map f = (f : _ → _) :=
155155
rfl
156156

157157
instance {S : AlgCat.{v} R} : Ring ((forget (AlgCat R)).obj S) :=

Mathlib/Algebra/Category/BialgCat/Basic.lean

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,6 @@ lemma hom_ext {X Y : BialgCat.{v} R} (f g : X ⟶ Y) (h : f.toBialgHom = g.toBia
104104
Hom.toBialgHom (𝟙 M) = BialgHom.id _ _ :=
105105
rfl
106106

107-
instance hasForget : HasForget.{v} (BialgCat.{v} R) where
108-
forget :=
109-
{ obj := fun M => M
110-
map := fun f => f.toBialgHom }
111-
forget_faithful :=
112-
{ map_injective := fun {_ _} => DFunLike.coe_injective.comp <| Hom.toBialgHom_injective _ _ }
113-
114107
instance hasForgetToAlgebra : HasForget₂ (BialgCat R) (AlgCat R) where
115108
forget₂ :=
116109
{ obj := fun X => AlgCat.of R X

Mathlib/Algebra/Category/CommAlgCat/Basic.lean

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ instance : Inhabited (CommAlgCat R) := ⟨of R R⟩
122122

123123
lemma forget_obj (A : CommAlgCat.{v} R) : (forget (CommAlgCat.{v} R)).obj A = A := rfl
124124

125-
lemma forget_map (f : A ⟶ B) : (forget (CommAlgCat.{v} R)).map f = f := rfl
125+
lemma forget_map (f : A ⟶ B) : (forget (CommAlgCat.{v} R)).map f = (f : _ → _) := rfl
126126

127127
instance : CommRing ((forget (CommAlgCat R)).obj A) := inferInstanceAs <| CommRing A
128128

Mathlib/Algebra/Category/CommBialgCat.lean

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ instance : Inhabited (CommBialgCat R) := ⟨of R R⟩
122122

123123
lemma forget_obj (A : CommBialgCat.{v} R) : (forget (CommBialgCat.{v} R)).obj A = A := rfl
124124

125-
lemma forget_map (f : A ⟶ B) : (forget (CommBialgCat.{v} R)).map f = f := rfl
125+
lemma forget_map (f : A ⟶ B) : (forget (CommBialgCat.{v} R)).map f = (f : _ → _) := rfl
126126

127127
instance : CommRing ((forget (CommBialgCat R)).obj A) := inferInstanceAs <| CommRing A
128128

Mathlib/Algebra/Category/GrpWithZero.lean

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ lemma coe_id {X : GrpWithZero} : (𝟙 X : X → X) = id := rfl
6666

6767
lemma coe_comp {X Y Z : GrpWithZero} {f : X ⟶ Y} {g : Y ⟶ Z} : (f ≫ g : X → Z) = g ∘ f := rfl
6868

69-
@[simp] lemma forget_map {X Y : GrpWithZero} (f : X ⟶ Y) : (forget GrpWithZero).map f = f := rfl
69+
@[simp] lemma forget_map {X Y : GrpWithZero} (f : X ⟶ Y) :
70+
(forget GrpWithZero).map f = (f : _ → _) :=
71+
rfl
7072

7173
instance hasForgetToBipointed : HasForget₂ GrpWithZero Bipointed where
7274
forget₂ :=

0 commit comments

Comments
 (0)