Merge pull request #12 from MichaelHatherly/mh/devendor

Remove vendored `FoldingTrees`.
MichaelHatherly · Jan 26, 2022 · 46cd9a3 · 46cd9a3
2 parents 5e2e90f + e2aa3b7
commit 46cd9a3
Show file tree

Hide file tree

Showing 18 changed files with 4 additions and 896 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,6 +11,7 @@ jobs:
       matrix:
         version:
           - '1.6'
+          - '1.7'
           - 'nightly'
         os:
           - ubuntu-latest

diff --git a/Project.toml b/Project.toml
@@ -5,13 +5,15 @@ version = "0.1.4"
 
 [deps]
 AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"
+FoldingTrees = "1eca21be-9b9b-4ed8-839a-6d8ae26b1781"
 InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 IterTools = "c8e1da08-722c-5040-9ed9-7db0dc04731e"
 REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
 Requires = "ae029012-a4dd-5104-9daa-d747884805df"
 
 [compat]
 AbstractTrees = "0.3"
+FoldingTrees = "1.1"
 IterTools = "1"
 Requires = "1"
 julia = "1.6"

diff --git a/src/InteractiveErrors.jl b/src/InteractiveErrors.jl
@@ -1,8 +1,6 @@
 module InteractiveErrors
 
-# TODO: de-vendor once changes are upstreamed.
-include("vendor/FoldingTrees/src/FoldingTrees.jl")
-using .FoldingTrees
+using FoldingTrees
 
 using REPL, REPL.TerminalMenus, InteractiveUtils, IterTools, Requires
 

diff --git a/src/vendor/FoldingTrees/.github/workflows/CI.yml b/src/vendor/FoldingTrees/.github/workflows/CI.yml
diff --git a/src/vendor/FoldingTrees/.github/workflows/Documenter.yml b/src/vendor/FoldingTrees/.github/workflows/Documenter.yml
diff --git a/src/vendor/FoldingTrees/.github/workflows/TagBot.yml b/src/vendor/FoldingTrees/.github/workflows/TagBot.yml
diff --git a/src/vendor/FoldingTrees/.gitignore b/src/vendor/FoldingTrees/.gitignore
diff --git a/src/vendor/FoldingTrees/LICENSE b/src/vendor/FoldingTrees/LICENSE
diff --git a/src/vendor/FoldingTrees/Project.toml b/src/vendor/FoldingTrees/Project.toml
diff --git a/src/vendor/FoldingTrees/README.md b/src/vendor/FoldingTrees/README.md
diff --git a/src/vendor/FoldingTrees/docs/Project.toml b/src/vendor/FoldingTrees/docs/Project.toml
diff --git a/src/vendor/FoldingTrees/docs/make.jl b/src/vendor/FoldingTrees/docs/make.jl
diff --git a/src/vendor/FoldingTrees/docs/src/index.md b/src/vendor/FoldingTrees/docs/src/index.md
diff --git a/src/vendor/FoldingTrees/src/FoldingTrees.jl b/src/vendor/FoldingTrees/src/FoldingTrees.jl
diff --git a/src/vendor/FoldingTrees/src/abstracttrees.jl b/src/vendor/FoldingTrees/src/abstracttrees.jl
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,6 +11,7 @@ jobs: @@
           matrix:
             version:
               - '1.6'
+              - '1.7'
               - 'nightly'
             os:
               - ubuntu-latest
@@ Expand Down @@