Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Section upstream #107

Merged
merged 8 commits into from
Sep 12, 2024
Merged

Section upstream #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
43c5a57
start upstreaming things
maxsnew Aug 23, 2024
ef6bb41
more upstreaming
maxsnew Aug 26, 2024
a0f7243
yet more upstreaming
maxsnew Aug 26, 2024
d812428
yet more upstreaming
maxsnew Aug 26, 2024
49413dc
more upstreaming
maxsnew Aug 28, 2024
933be54
sync with latest commit
maxsnew Sep 10, 2024
d2e8947
restore things that weren't actually upstreamed
maxsnew Sep 10, 2024
71a83d9
fix upstreamed imports
maxsnew Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ jobs:
cd ~
git clone https://github.com/agda/cubical --branch master
cd cubical
git checkout 2ae84643c74750b49865e44c05b508cb2117c740
git checkout f77e2305673c591695052a376e1d9cd8b07dd6f1
cd ..
echo "CUBICAL_DIR=$PWD/cubical" >> "$GITHUB_ENV"

Expand Down
2 changes: 1 addition & 1 deletion Cubical/Categories/Bifunctor/Base.agda
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ open import Cubical.Foundations.Prelude hiding (Path)
open import Cubical.Categories.Category
open import Cubical.Categories.Functor
open import Cubical.Categories.NaturalTransformation
open import Cubical.Categories.Constructions.BinProduct hiding (Fst; Snd)
open import Cubical.Categories.Constructions.BinProduct hiding (Fst; Snd; Sym)
open import Cubical.Categories.Instances.Sets
open import Cubical.Categories.Instances.Functors

Expand Down
2 changes: 1 addition & 1 deletion Cubical/Categories/Bifunctor/Redundant.agda
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ open import Cubical.Foundations.Prelude hiding (Path)
open import Cubical.Categories.Category
open import Cubical.Categories.Functor
open import Cubical.Categories.NaturalTransformation
open import Cubical.Categories.Constructions.BinProduct hiding (Fst; Snd)
open import Cubical.Categories.Constructions.BinProduct hiding (Fst; Snd; Sym)
open import Cubical.Categories.Instances.Sets
open import Cubical.Categories.Instances.Functors
import Cubical.Categories.Bifunctor as Separate
Expand Down
7 changes: 0 additions & 7 deletions Cubical/Categories/Constructions/BinProduct/More.agda
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,6 @@ private
open Category
open Functor

-- Some more functor combinators
Δ : ∀ (C : Category ℓC ℓC') → Functor C (C ×C C)
Δ C = Id ,F Id

Sym : {C : Category ℓC ℓC'}{D : Category ℓD ℓD'} → Functor (C ×C D) (D ×C C)
Sym {C = C}{D = D} = Snd C D ,F Fst C D

-- helpful decomposition of morphisms used in several proofs
-- about product category
module _ {C : Category ℓC ℓC'}{D : Category ℓD ℓD'}{E : Category ℓE ℓE'} where
Expand Down
2 changes: 1 addition & 1 deletion Cubical/Categories/Constructions/Coproduct.agda
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ open import Cubical.Categories.Functor.Base

open import Cubical.Categories.Displayed.Section.Base
open import Cubical.Categories.Displayed.Constructions.Weaken as Weaken
open import Cubical.Categories.Displayed.Constructions.Reindex as Reindex
open import Cubical.Categories.Displayed.Constructions.Reindex.Base as Reindex
open import Cubical.Categories.Displayed.Instances.Path as PathC

private
Expand Down
53 changes: 0 additions & 53 deletions Cubical/Categories/Constructions/Elements/More.agda
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion Cubical/Categories/Constructions/Fiber.agda
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,12 @@ open import Cubical.Categories.Profunctor.Hom
open import Cubical.Categories.Profunctor.Homomorphism.Unary
open import Cubical.Categories.Profunctor.Homomorphism.Bilinear
open import Cubical.Categories.Displayed.Base
open import Cubical.Categories.Displayed.Properties
open import Cubical.Categories.Displayed.Constructions.HomPropertyOver
open import Cubical.Categories.Constructions.TotalCategory as TotalCat
open import Cubical.Categories.Constructions.ChangeOfObjects

open import Cubical.Categories.Displayed.BinProduct
open import Cubical.Categories.Displayed.Constructions.Reindex.Base
open import Cubical.Categories.Displayed.Constructions.BinProduct.More
open import Cubical.Categories.Constructions.Endo as Endo
import Cubical.Categories.Displayed.Reasoning as HomᴰReasoning
Expand Down
3 changes: 1 addition & 2 deletions Cubical/Categories/Constructions/Free/CartesianCategory/Base.agda
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ open import Cubical.Categories.Displayed.Limits.Terminal
open import Cubical.Categories.Displayed.Limits.BinProduct
open import Cubical.Categories.Displayed.Section.Base
open import Cubical.Categories.Displayed.Presheaf
open import Cubical.Categories.Displayed.Properties
open import Cubical.Categories.Displayed.Constructions.Reindex
open import Cubical.Categories.Displayed.Constructions.Reindex.Base
open import Cubical.Categories.Displayed.Constructions.Reindex.Properties
open import Cubical.Categories.Displayed.Fibration.Base
open import Cubical.Categories.Displayed.Constructions.Weaken as Wk
Expand Down
147 changes: 0 additions & 147 deletions Cubical/Categories/Constructions/Free/Category/Quiver.agda
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions Cubical/Categories/Constructions/Free/CategoryWithTerminal.agda
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,13 @@ open import Cubical.Data.Sum.Base as Sum hiding (elim; rec)
open import Cubical.Data.Unit
open import Cubical.Categories.Displayed.Base
open import Cubical.Categories.Presheaf
open import Cubical.Categories.Displayed.Properties
open import Cubical.Categories.Displayed.Presheaf
open import Cubical.Categories.Displayed.Limits.Terminal
open import Cubical.Foundations.Equiv
open import Cubical.Data.Sigma.Properties
open import Cubical.Categories.Displayed.Section.Base
open import Cubical.Categories.Displayed.Constructions.Weaken as Wk
open import Cubical.Categories.Displayed.Constructions.Reindex
open import Cubical.Categories.Displayed.Constructions.Reindex.Base
open import Cubical.Categories.Displayed.Constructions.Reindex.Properties
open import Cubical.Categories.Displayed.Reasoning

Expand Down
10 changes: 2 additions & 8 deletions Cubical/Categories/Constructions/Free/Functor/AltPresented.agda
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,25 @@
-- This module defines the free category H equipped with a functor
-- from a given category 𝓒
{-# OPTIONS --safe --lossy-unification #-}
{-# OPTIONS --safe #-}
module Cubical.Categories.Constructions.Free.Functor.AltPresented where

open import Cubical.Foundations.Prelude
open import Cubical.Foundations.Path
open import Cubical.Foundations.Isomorphism
open import Cubical.Foundations.HLevels
open import Cubical.Foundations.Transport

open import Cubical.Data.Sigma
open import Cubical.Data.Sum as Sum hiding (rec; elim)

open import Cubical.Categories.Category.Base
open import Cubical.Categories.Displayed.Base
open import Cubical.Categories.Displayed.Functor
open import Cubical.Categories.Displayed.Properties as DCat
open import Cubical.Categories.Functor.Base
open import Cubical.Categories.NaturalTransformation

open import Cubical.Data.Quiver.Base

open import Cubical.Categories.Displayed.Section.Base
open import Cubical.Categories.Constructions.Presented as Presented
open import Cubical.Categories.Constructions.BinProduct as BinProduct
open import Cubical.Categories.Displayed.Constructions.Weaken as Weaken
open import Cubical.Categories.Displayed.Constructions.Reindex as Reindex
open import Cubical.Categories.Displayed.Constructions.Reindex.Base as Reindex
open import Cubical.Categories.Displayed.Instances.Path as PathC
open import Cubical.Categories.Constructions.Free.Category.Quiver as FreeCat
hiding (rec; elim; elimLocal)
Expand Down
Loading
Loading