Skip to content

Commit 8375e39

Browse files
authored
Merge pull request #54 from devmotion/dw/lightweight
Clean up unnecessary dependencies
2 parents 87e1eb3 + 964323f commit 8375e39

File tree

4 files changed

+6
-33
lines changed

4 files changed

+6
-33
lines changed

Project.toml

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,25 @@ version = "0.7.1"
77
Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
88
PackageExtensionCompat = "65ce6f38-6b18-4e1d-a461-8949797d7930"
99
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
10-
TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
1110
Tricks = "410a4b4d-49e4-4fbc-ab6d-cb71b17b3775"
1211

1312
[weakdeps]
1413
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
1514
Measurements = "eff96d63-e80a-5855-80a2-b1b0885c5ab7"
1615
ScientificTypes = "321657f4-b219-11e9-178b-2701a2544e81"
17-
ScientificTypesBase = "30f210dd-8aff-4c5f-94ba-8e64358c1161"
1816
Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
1917

2018
[extensions]
2119
DynamicQuantitiesLinearAlgebraExt = "LinearAlgebra"
2220
DynamicQuantitiesMeasurementsExt = "Measurements"
23-
DynamicQuantitiesScientificTypesExt = ["ScientificTypes", "ScientificTypesBase"]
21+
DynamicQuantitiesScientificTypesExt = "ScientificTypes"
2422
DynamicQuantitiesUnitfulExt = "Unitful"
2523

2624
[compat]
27-
Compat = "^3.42, 4"
25+
Compat = "3.42, 4"
2826
Measurements = "2"
29-
PackageExtensionCompat = "1"
27+
PackageExtensionCompat = "1.0.2"
3028
ScientificTypes = "3"
31-
ScientificTypesBase = "3"
3229
Tricks = "0.1"
3330
Unitful = "1"
3431
julia = "1.6"
@@ -41,22 +38,9 @@ Ratios = "c84ed2f1-dad5-54f0-aa8e-dbefe2724439"
4138
SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
4239
SaferIntegers = "88634af6-177f-5301-88b8-7819386cfa38"
4340
ScientificTypes = "321657f4-b219-11e9-178b-2701a2544e81"
44-
ScientificTypesBase = "30f210dd-8aff-4c5f-94ba-8e64358c1161"
4541
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
4642
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
4743
Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
4844

4945
[targets]
50-
test = [
51-
"Aqua",
52-
"LinearAlgebra",
53-
"Measurements",
54-
"Ratios",
55-
"SaferIntegers",
56-
"SafeTestsets",
57-
"ScientificTypes",
58-
"ScientificTypesBase",
59-
"StaticArrays",
60-
"Test",
61-
"Unitful"
62-
]
46+
test = ["Aqua", "LinearAlgebra", "Measurements", "Ratios", "SaferIntegers", "SafeTestsets", "ScientificTypes", "StaticArrays", "Test", "Unitful"]

ext/DynamicQuantitiesScientificTypesExt.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module DynamicQuantitiesScientificTypesExt
22

33
import DynamicQuantities: AbstractQuantity, ustrip
44
import ScientificTypes as ST
5-
import ScientificTypesBase as STB
5+
import ScientificTypes.ScientificTypesBase as STB
66

77
STB.scitype(x::AbstractQuantity, C::ST.DefaultConvention) = STB.scitype(ustrip(x), C)
88
STB.Scitype(::Type{<:AbstractQuantity{T}}, C::ST.DefaultConvention) where {T} = STB.Scitype(T, C)

src/DynamicQuantities.jl

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
11
module DynamicQuantities
22

3-
import TOML: parsefile
4-
5-
const PACKAGE_VERSION = try
6-
let project = parsefile(joinpath(pkgdir(@__MODULE__), "Project.toml"))
7-
VersionNumber(project["version"])
8-
end
9-
catch
10-
VersionNumber(0, 0, 0)
11-
end
12-
133
export Units, Constants
144
export AbstractQuantity, AbstractDimensions
155
export Quantity, Dimensions, SymbolicDimensions, QuantityArray, DimensionError

test/test_scitypes.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
using DynamicQuantities
22
using ScientificTypes
33
import ScientificTypes as ST
4-
import ScientificTypesBase as STB
54

65
x = 1.0u"m/s"
76

87
@test scitype(x) <: Continuous
98
@test scitype([x]) <: AbstractVector{<:Continuous}
109
@test scitype(Quantity{Int}(x)) <: Count
1110
@test scitype(randn(32) .* u"m/s") <: AbstractVector{<:Continuous}
12-
@test STB.Scitype(typeof(x), ST.DefaultConvention()) <: Continuous
11+
@test ST.ScientificTypesBase.Scitype(typeof(x), ST.DefaultConvention()) <: Continuous
1312

1413
X = (; x=randn(32) .* u"m/s")
1514

0 commit comments

Comments
 (0)