Skip to content

Commit

Permalink
Merge branch 'main' into mirt-redux
Browse files Browse the repository at this point in the history
  • Loading branch information
frankier committed Oct 30, 2024
2 parents 038ce18 + 3e80481 commit 464ffe0
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 33 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ jobs:
matrix:
version:
- '1.10'
- '1.11'
os:
- ubuntu-latest
arch:
Expand All @@ -29,6 +30,8 @@ jobs:
with:
version: ${{ matrix.version }}
arch: ${{ matrix.arch }}
- uses: julia-actions/julia-downgrade-compat@v1
if: ${{ matrix.version == '1.10' }}
- uses: julia-actions/cache@v1
- name: Set CAT packages to develop & resolve env
run: |
Expand Down
44 changes: 15 additions & 29 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,13 @@ version = "0.3.0"
Accessors = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697"
AutoHashEquals = "15f4f7f2-30c1-5605-9d31-71845cf9641f"
ConstructionBase = "187b0558-2788-49d3-abe0-74a17ed4e7c9"
Cuba = "8a292aeb-7a57-582c-b821-06e4c11590b1"
Cubature = "667455a9-e2ce-5579-9412-b964f529a492"
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
EffectSizes = "e248de7e-9197-5860-972e-353a2af44d75"
FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"
FittedItemBanks = "3f797b09-34e4-41d7-acf6-3302ae3248a5"
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
HCubature = "19dc6840-f33b-545b-b366-655c7e3ffd49"
HypothesisTests = "09f84164-cd44-5f33-b23f-e6b0d136a0d5"
Interpolations = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59"
KernelAbstractions = "63c18a36-062a-441e-b654-da1e3ab1ce7c"
Expand All @@ -26,15 +23,11 @@ LogarithmicNumbers = "aa2f6b4e-9042-5d33-9679-40d3a6b85899"
MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
Measurements = "eff96d63-e80a-5855-80a2-b1b0885c5ab7"
Mmap = "a63ad114-7e13-5084-954f-fe012c677804"
NLSolversBase = "d41bc354-129a-5804-8e4c-c37616107c6c"
Optim = "429524aa-4258-5aef-a3af-852621145aeb"
OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
PsychometricsBazaarBase = "b0d9cada-d963-45e9-a4c6-4746243987f1"
QuadGK = "1fd47b50-473d-5c70-9696-f719f8f3bcdc"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
Requires = "ae029012-a4dd-5104-9daa-d747884805df"
Setfield = "efcf1570-3423-57d1-acb7-fd33fddbac46"
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
Expand All @@ -43,36 +36,29 @@ StatsFuns = "4c63d2b9-4356-54db-8cca-17b64c39e42c"
UnPack = "3a884ed6-31ef-47d7-9d2a-63182c4928ed"

[compat]
Accessors = "0.1"
Accessors = "^0.1.12"
AutoHashEquals = "2"
ConstructionBase = "1"
Cuba = "2"
Cubature = "1"
ConstructionBase = "^1.2"
DataFrames = "1.6.1"
Distributions = "0.25"
DocStringExtensions = "^0.8, ^0.9"
Distributions = "^0.25.88"
DocStringExtensions = " ^0.9"
EffectSizes = "^1.0.1"
FillArrays = "0.13, 1.5.0"
FittedItemBanks = "^0.6.0"
ForwardDiff = "0.10"
HCubature = "1"
HypothesisTests = "^0.11.0"
Interpolations = "0.13, 0.14"
FittedItemBanks = "^0.6.3"
ForwardDiff = "0.10.24"
HypothesisTests = "^0.10.12, ^0.11.0"
Interpolations = "^0.14, ^0.15"
KernelAbstractions = "^0.9.22"
Lazy = "0.15"
LogarithmicNumbers = "1"
MacroTools = "0.5"
Measurements = "2"
NLSolversBase = "7"
Optim = "1"
OrderedCollections = "1"
PsychometricsBazaarBase = "^0.7.0"
QuadGK = "2.5.0"
MacroTools = "^0.5.6"
Measurements = "^2.10.0"
OrderedCollections = "^1.6"
PsychometricsBazaarBase = "^0.8.0"
Reexport = "1"
Requires = "1"
Setfield = "0.8, 1"
Setfield = "^1"
StaticArrays = "1"
StatsBase = "0.33, 0.34.0"
StatsFuns = "1"
StatsBase = "^0.34"
StatsFuns = "^0.9.15, ^1"
UnPack = "1"
julia = "^1.10"
1 change: 0 additions & 1 deletion src/aggregators/Aggregators.jl
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ module Aggregators
using PsychometricsBazaarBase.Parameters
using StaticArrays: SVector
using Distributions: Distribution, Normal, Distributions
using HCubature
using Base.Threads
using ForwardDiff: ForwardDiff

Expand Down
2 changes: 1 addition & 1 deletion src/next_item_rules/NextItemRules.jl
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ using FittedItemBanks: item_params
using ..Aggregators
using ..Aggregators: covariance_matrix

using QuadGK, Distributions, Optim, Base.Threads, Base.Order, StaticArrays
using Distributions, Base.Threads, Base.Order, StaticArrays
using ConstructionBase: constructorof
import ForwardDiff

Expand Down
4 changes: 2 additions & 2 deletions test/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ XUnit = "3e3c03f2-1a94-11e9-2981-050a4ca824ab"

[compat]
Aqua = "0.5.5, 0.6.5"
Distributions = "0.25.76"
Distributions = "0.25.88"
FittedItemBanks = "^0.6"
Optim = "1.7.3"
PsychometricsBazaarBase = "^0.5, ^0.6, ^0.7"
PsychometricsBazaarBase = "^0.8"
julia = "^1.10"

0 comments on commit 464ffe0

Please sign in to comment.