Require Julia v1.9

JuliaDiffinDiffs · Apr 10, 2024 · bf61587 · bf61587
1 parent 4bb22f5
commit bf61587
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 30 deletions.
diff --git a/.github/workflows/CI-stable.yml b/.github/workflows/CI-stable.yml
@@ -39,11 +39,11 @@ jobs:
             os: ubuntu-latest
             arch: x64
           - package: DiffinDiffsBase
-            version: '1.6'
+            version: '1.9'
             os: ubuntu-latest
             arch: x64
           - package: InteractionWeightedDIDs
-            version: '1.6'
+            version: '1.9'
             os: ubuntu-latest
             arch: x64
     steps:

diff --git a/Project.toml b/Project.toml
@@ -13,7 +13,7 @@ DiffinDiffsBase = "0.4"
 Documenter = "0.27"
 InteractionWeightedDIDs = "0.3"
 Reexport = "0.2, 1"
-julia = "1.6"
+julia = "1.9"
 
 [extras]
 Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"

diff --git a/lib/DiffinDiffsBase/src/DiffinDiffsBase.jl b/lib/DiffinDiffsBase/src/DiffinDiffsBase.jl
@@ -81,7 +81,6 @@ export RotatingTimeValue,
 
        TermSet,
        termset,
-       eachterm,
        TreatmentTerm,
        treat,
 

diff --git a/lib/DiffinDiffsBase/src/terms.jl b/lib/DiffinDiffsBase/src/terms.jl
@@ -57,14 +57,6 @@ Base.emptymutable(::TermSet, ::Type{<:AbstractTerm}) = termset()
 
 const Terms{N} = NTuple{N, AbstractTerm} where N
 
-"""
-    eachterm(t)
-
-Return an iterable collection of terms in `t`.
-"""
-eachterm(@nospecialize(t::AbstractTerm)) = (t,)
-eachterm(@nospecialize(t::Terms)) = t
-
 ==(@nospecialize(a::Terms), @nospecialize(b::Terms)) =
     length(a)==length(b) && all(t->t in b, a)
 ==(@nospecialize(a::InteractionTerm), @nospecialize(b::InteractionTerm)) =

diff --git a/lib/InteractionWeightedDIDs/Project.toml b/lib/InteractionWeightedDIDs/Project.toml
@@ -28,7 +28,7 @@ StatsFuns = "0.9, 1"
 StatsModels = "0.6, 0.7"
 Tables = "1"
 Vcov = "0.8"
-julia = "1.6"
+julia = "1.9"
 
 [extras]
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"

diff --git a/lib/InteractionWeightedDIDs/src/InteractionWeightedDIDs.jl b/lib/InteractionWeightedDIDs/src/InteractionWeightedDIDs.jl
@@ -5,7 +5,6 @@ using DataAPI: refarray
 using FixedEffectModels: FixedEffectTerm, fe, fesymbol, _multiply,
     basis!, invsym!, isnested, nunique
 using FixedEffects
-using FixedEffects: MiniProgressBar
 using LinearAlgebra: Symmetric, diag, mul!
 using Reexport
 using StatsBase: AbstractWeights, CovarianceEstimator, UnitWeights, PValue, TestStat, NoQuote

diff --git a/lib/InteractionWeightedDIDs/src/utils.jl b/lib/InteractionWeightedDIDs/src/utils.jl
@@ -42,28 +42,14 @@ end
 
 # A work around for the type restrictions in FixedEffects.jl
 function _solve_residuals!(xs::Base.ValueIterator, feM::AbstractFixedEffectSolver;
-        progress_bar = true, kwargs...)
+        progress_bar=false, kwargs...)
     iterations = Int[]
     convergeds = Bool[]
-    bar = MiniProgressBar(header = "Demean Variables:", color = Base.info_color(), percentage = false, max = length(xs))
-    for (j, x) in enumerate(xs)
-    	v0 = time()
+    for x in xs
         _, iteration, converged = solve_residuals!(x, feM; kwargs...)
-        v1 = time()
-        # remove progress_bar if estimated time lower than 2sec
-	    if progress_bar && (j == 1) && ((v1 - v0) * length(xs) <= 2)
-	    	progress_bar = false
-	    end
-    	if progress_bar
-    		bar.current = j
-    	    showprogress(stdout, bar)
-    	end
         push!(iterations, iteration)
         push!(convergeds, converged)
     end
-    if progress_bar
-    	end_progress(stdout, bar)
-    end
     return xs, iterations, convergeds
 end