Skip to content

Commit e2c9c62

Browse files
authored
Replace Formatting with Format (#947)
1 parent 035b811 commit e2c9c62

File tree

9 files changed

+17
-42
lines changed

9 files changed

+17
-42
lines changed

.buildkite/Manifest-v1.11.toml

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

33
julia_version = "1.11.2"
44
manifest_format = "2.0"
5-
project_hash = "bf1216ed2bc76713a01437d07332219f6bcd0c54"
5+
project_hash = "c37eb520716a42d13453d464e20722c2d9ad2f0e"
66

77
[[deps.ADTypes]]
88
git-tree-sha1 = "72af59f5b8f09faee36b4ec48e014a79210f2f4f"
@@ -995,12 +995,6 @@ git-tree-sha1 = "9c68794ef81b08086aeb32eeaf33531668d5f5fc"
995995
uuid = "1fa38f19-a742-5d3f-a2b9-30dd87b9d5f8"
996996
version = "1.3.7"
997997

998-
[[deps.Formatting]]
999-
deps = ["Logging", "Printf"]
1000-
git-tree-sha1 = "fb409abab2caf118986fc597ba84b50cbaf00b87"
1001-
uuid = "59287772-0a20-5a39-b81b-1366585eb4c0"
1002-
version = "0.4.3"
1003-
1004998
[[deps.ForwardDiff]]
1005999
deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "LinearAlgebra", "LogExpFunctions", "NaNMath", "Preferences", "Printf", "Random", "SpecialFunctions"]
10061000
git-tree-sha1 = "a2df1b776752e3f344e5116c06d75a10436ab853"

.buildkite/Manifest.toml

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

33
julia_version = "1.10.7"
44
manifest_format = "2.0"
5-
project_hash = "caf39978363ec9f96f38fb6498ca16e9535c8a91"
5+
project_hash = "e342c3afef8f338923763f75fb641220d04b23da"
66

77
[[deps.ADTypes]]
88
git-tree-sha1 = "72af59f5b8f09faee36b4ec48e014a79210f2f4f"
@@ -989,12 +989,6 @@ git-tree-sha1 = "9c68794ef81b08086aeb32eeaf33531668d5f5fc"
989989
uuid = "1fa38f19-a742-5d3f-a2b9-30dd87b9d5f8"
990990
version = "1.3.7"
991991

992-
[[deps.Formatting]]
993-
deps = ["Logging", "Printf"]
994-
git-tree-sha1 = "fb409abab2caf118986fc597ba84b50cbaf00b87"
995-
uuid = "59287772-0a20-5a39-b81b-1366585eb4c0"
996-
version = "0.4.3"
997-
998992
[[deps.ForwardDiff]]
999993
deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "LinearAlgebra", "LogExpFunctions", "NaNMath", "Preferences", "Printf", "Random", "SpecialFunctions"]
1000994
git-tree-sha1 = "a2df1b776752e3f344e5116c06d75a10436ab853"

.buildkite/Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
1717
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
1818
DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab"
1919
Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c"
20-
Formatting = "59287772-0a20-5a39-b81b-1366585eb4c0"
20+
Format = "1fa38f19-a742-5d3f-a2b9-30dd87b9d5f8"
2121
GeoMakie = "db073c08-6b98-4ee5-b6a4-5efafb3259c6"
2222
HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
2323
Insolation = "e98cc03f-d57e-4e3c-b70c-8d51efe9e0d8"

docs/Manifest-v1.11.toml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
julia_version = "1.11.2"
44
manifest_format = "2.0"
5-
project_hash = "375d00e829a5d8c49c86dce3a9f254044ec00898"
5+
project_hash = "355d659ef955f00d0dd0873a3a8938c4c8fe8215"
66

77
[[deps.ADTypes]]
88
git-tree-sha1 = "72af59f5b8f09faee36b4ec48e014a79210f2f4f"
@@ -438,7 +438,7 @@ weakdeps = ["CSV", "CUDA", "ClimaParams", "DataFrames", "Flux", "HTTP", "StatsBa
438438
NeuralSnowExt = ["CSV", "DataFrames", "HTTP", "Flux", "StatsBase", "cuDNN"]
439439

440440
[[deps.ClimaLandSimulations]]
441-
deps = ["ArtifactWrappers", "Bonito", "CairoMakie", "ClimaComms", "ClimaCore", "ClimaDiagnostics", "ClimaLand", "ClimaParams", "ClimaTimeSteppers", "ClimaUtilities", "DataFrames", "Dates", "DelimitedFiles", "Formatting", "HTTP", "Insolation", "Interpolations", "InverseFunctions", "JSON", "LaTeXStrings", "MutableArithmetics", "NLsolve", "PlotUtils", "RootSolvers", "SciMLBase", "StaticArrays", "Statistics", "StatsBase", "SurfaceFluxes", "Thermodynamics", "Unitful", "UnitfulMoles", "WGLMakie", "cuDNN"]
441+
deps = ["ArtifactWrappers", "Bonito", "CairoMakie", "ClimaComms", "ClimaCore", "ClimaDiagnostics", "ClimaLand", "ClimaParams", "ClimaTimeSteppers", "ClimaUtilities", "DataFrames", "Dates", "DelimitedFiles", "Format", "HTTP", "Insolation", "Interpolations", "InverseFunctions", "JSON", "LaTeXStrings", "MutableArithmetics", "NLsolve", "PlotUtils", "RootSolvers", "SciMLBase", "StaticArrays", "Statistics", "StatsBase", "SurfaceFluxes", "Thermodynamics", "Unitful", "UnitfulMoles", "WGLMakie", "cuDNN"]
442442
path = "../lib/ClimaLandSimulations"
443443
uuid = "348a0bd3-1299-4261-8002-d2cd97df6055"
444444
version = "0.1.0"
@@ -1043,12 +1043,6 @@ git-tree-sha1 = "9c68794ef81b08086aeb32eeaf33531668d5f5fc"
10431043
uuid = "1fa38f19-a742-5d3f-a2b9-30dd87b9d5f8"
10441044
version = "1.3.7"
10451045

1046-
[[deps.Formatting]]
1047-
deps = ["Logging", "Printf"]
1048-
git-tree-sha1 = "fb409abab2caf118986fc597ba84b50cbaf00b87"
1049-
uuid = "59287772-0a20-5a39-b81b-1366585eb4c0"
1050-
version = "0.4.3"
1051-
10521046
[[deps.ForwardDiff]]
10531047
deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "LinearAlgebra", "LogExpFunctions", "NaNMath", "Preferences", "Printf", "Random", "SpecialFunctions"]
10541048
git-tree-sha1 = "a2df1b776752e3f344e5116c06d75a10436ab853"

docs/Manifest.toml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
julia_version = "1.10.7"
44
manifest_format = "2.0"
5-
project_hash = "f72307bcd95e950ef8de1249d1ec62d211530a69"
5+
project_hash = "1cc11a5b33163e663d21d119426c3e05ec356bf1"
66

77
[[deps.ADTypes]]
88
git-tree-sha1 = "72af59f5b8f09faee36b4ec48e014a79210f2f4f"
@@ -435,7 +435,7 @@ weakdeps = ["CSV", "CUDA", "ClimaParams", "DataFrames", "Flux", "HTTP", "StatsBa
435435
NeuralSnowExt = ["CSV", "DataFrames", "HTTP", "Flux", "StatsBase", "cuDNN"]
436436

437437
[[deps.ClimaLandSimulations]]
438-
deps = ["ArtifactWrappers", "Bonito", "CairoMakie", "ClimaComms", "ClimaCore", "ClimaDiagnostics", "ClimaLand", "ClimaParams", "ClimaTimeSteppers", "ClimaUtilities", "DataFrames", "Dates", "DelimitedFiles", "Formatting", "HTTP", "Insolation", "Interpolations", "InverseFunctions", "JSON", "LaTeXStrings", "MutableArithmetics", "NLsolve", "PlotUtils", "RootSolvers", "SciMLBase", "StaticArrays", "Statistics", "StatsBase", "SurfaceFluxes", "Thermodynamics", "Unitful", "UnitfulMoles", "WGLMakie", "cuDNN"]
438+
deps = ["ArtifactWrappers", "Bonito", "CairoMakie", "ClimaComms", "ClimaCore", "ClimaDiagnostics", "ClimaLand", "ClimaParams", "ClimaTimeSteppers", "ClimaUtilities", "DataFrames", "Dates", "DelimitedFiles", "Format", "HTTP", "Insolation", "Interpolations", "InverseFunctions", "JSON", "LaTeXStrings", "MutableArithmetics", "NLsolve", "PlotUtils", "RootSolvers", "SciMLBase", "StaticArrays", "Statistics", "StatsBase", "SurfaceFluxes", "Thermodynamics", "Unitful", "UnitfulMoles", "WGLMakie", "cuDNN"]
439439
path = "../lib/ClimaLandSimulations"
440440
uuid = "348a0bd3-1299-4261-8002-d2cd97df6055"
441441
version = "0.1.0"
@@ -1037,12 +1037,6 @@ git-tree-sha1 = "9c68794ef81b08086aeb32eeaf33531668d5f5fc"
10371037
uuid = "1fa38f19-a742-5d3f-a2b9-30dd87b9d5f8"
10381038
version = "1.3.7"
10391039

1040-
[[deps.Formatting]]
1041-
deps = ["Logging", "Printf"]
1042-
git-tree-sha1 = "fb409abab2caf118986fc597ba84b50cbaf00b87"
1043-
uuid = "59287772-0a20-5a39-b81b-1366585eb4c0"
1044-
version = "0.4.3"
1045-
10461040
[[deps.ForwardDiff]]
10471041
deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "LinearAlgebra", "LogExpFunctions", "NaNMath", "Preferences", "Printf", "Random", "SpecialFunctions"]
10481042
git-tree-sha1 = "a2df1b776752e3f344e5116c06d75a10436ab853"

docs/Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
1515
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
1616
EnsembleKalmanProcesses = "aa8a2aa5-91d8-4396-bcef-d4f2ec43552d"
1717
Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c"
18-
Formatting = "59287772-0a20-5a39-b81b-1366585eb4c0"
18+
Format = "1fa38f19-a742-5d3f-a2b9-30dd87b9d5f8"
1919
HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
2020
Insolation = "e98cc03f-d57e-4e3c-b70c-8d51efe9e0d8"
2121
InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"

experiments/integrated/fluxnet/met_drivers_FLUXNET.jl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using DelimitedFiles
22
using Thermodynamics
33
using Dates
4-
using Formatting
4+
using Format
55
using HTTP
66
using JSON
77
using Insolation
@@ -44,7 +44,7 @@ labels = (
4444
:CO2,
4545
)
4646

47-
# For every data column to be collected, name of the column in the file,
47+
# For every data column to be collected, name of the column in the file,
4848
# transformation function to desired unit, and string of final unit
4949
collect_args = [
5050
("TA_F", (x) -> x .+ 273.15, "K")
@@ -65,8 +65,8 @@ collect_args = [
6565
("CO2_F_MDS", (x) -> x .* 1e-6, "mol")
6666
]
6767

68-
# Named tuple mapping every label to a DataColumn with the correct transformed
69-
# unit and data status. Automatically fills gaps in the data
68+
# Named tuple mapping every label to a DataColumn with the correct transformed
69+
# unit and data status. Automatically fills gaps in the data
7070
drivers = (;
7171
zip(
7272
labels,
@@ -118,9 +118,9 @@ Estimate the fraction of precipitation that is in snow form,
118118
given the air temperature at the surface in K and the relative humidity
119119
(between 0 and 1).
120120
121-
See Jennings, K.S., Winchell, T.S., Livneh, B. et al.
122-
Spatial variation of the rain–snow temperature threshold across the
123-
Northern Hemisphere. Nat Commun 9, 1148 (2018).
121+
See Jennings, K.S., Winchell, T.S., Livneh, B. et al.
122+
Spatial variation of the rain–snow temperature threshold across the
123+
Northern Hemisphere. Nat Commun 9, 1148 (2018).
124124
https://doi.org/10.1038/s41467-018-03629-7
125125
"""
126126
function snow_precip_fraction(air_temp, hum)

lib/ClimaLandSimulations/Project.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ClimaUtilities = "b3f4f4ca-9299-4f7f-bd9b-81e1242a7513"
1717
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
1818
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
1919
DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab"
20-
Formatting = "59287772-0a20-5a39-b81b-1366585eb4c0"
20+
Format = "1fa38f19-a742-5d3f-a2b9-30dd87b9d5f8"
2121
HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
2222
Insolation = "e98cc03f-d57e-4e3c-b70c-8d51efe9e0d8"
2323
Interpolations = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59"
@@ -50,7 +50,6 @@ ClimaUtilities = "0.1.2"
5050
DataFrames = "1"
5151
Dates = "1"
5252
DelimitedFiles = "1"
53-
Formatting = "0.4"
5453
HTTP = "1"
5554
Interpolations = "0.15"
5655
JSON = "0.21"

lib/ClimaLandSimulations/src/Fluxnet/Fluxnet.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ using Unitful, UnitfulMoles
2424
using ArtifactWrappers
2525
using DelimitedFiles
2626
using Thermodynamics
27-
using Formatting
27+
using Format
2828
using DataFrames
2929

3030
# Directory paths

0 commit comments

Comments
 (0)