Merge branch 'main' into dependabot/github_actions/codecov/codecov-action-5

Author: mortenpi

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+### Fixed
+
+* The `JuliaHub.update_dataset` function now correctly accepts the `license=(:fulltext, ...)` argument. ([#74])
+
 ## Version [v0.1.11] - 2024-06-27
 
 ### Added
@@ -134,3 +140,4 @@ Initial package release.
 [#52]: https://github.com/JuliaComputing/JuliaHub.jl/issues/52
 [#53]: https://github.com/JuliaComputing/JuliaHub.jl/issues/53
 [#58]: https://github.com/JuliaComputing/JuliaHub.jl/issues/58
+[#74]: https://github.com/JuliaComputing/JuliaHub.jl/issues/74

Project.toml

@@ -1,7 +1,7 @@
 name = "JuliaHub"
 uuid = "bc7fa6ce-b75e-4d60-89ad-56c957190b6e"
 authors = ["JuliaHub Inc."]
-version = "0.1.11"
+version = "0.1.12-DEV"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

src/authentication.jl

@@ -173,7 +173,8 @@ The zero- and one-argument methods will attempt to read the token from the curre
 If a valid authentication token does not exist in the Julia depot, a new token is acquired via an
 interactive browser based prompt. By default, it attemps to connect to the currently configured Julia
 package server URL (configured e.g. via the `JULIA_PKG_SERVER` environment variable), but this
-can be overridden by passing the `server` argument.
+can be overridden by passing the `server` argument.  `server` is just the URL of your JuliaHub instance,
+so if you've logged on to the public JuliaHub server, this is `"juliahub.com"`.
 
 The two-argument method can be used when you do not want to read the token from the `auth.toml`
 file (e.g. when using a long-term token via an environment variable). In this case, you also have

src/datasets.jl

@@ -465,9 +465,15 @@ const _DOCS_datasets_metadata_fields = """
 * `description`: description of the dataset (a string)
 * `tags`: an iterable of strings of all the tags of the dataset
 * `visibility`: a string with possible values `public` or `private`
-* `license`: a valid SPDX license identifier, or a tuple `(:fulltext, license_text)`, where
-  `license_text` is the full text string of a custom license
+* `license`: a valid SPDX license identifier (as a string or in a
+  `(:spdx, licence_identifier)` tuple), or a tuple `(:fulltext, license_text)`,
+  where `license_text` is the full text string of a custom license
 * `groups`: an iterable of valid group names
+
+!!! compat "JuliaHub.jl v0.1.12"
+
+    The `license = (:fulltext, ...)` form requires v0.1.12, and `license = (:text, ...)`
+    is deprecated since that version.
 """
 
 """
@@ -983,7 +989,14 @@ function update_dataset end
         cmd, license_value = license
         params["license"] = if cmd == :spdx
             Dict("spdx_id" => license_value)
-        elseif cmd == :text
+        elseif cmd in (:fulltext, :text)
+            if cmd == :text
+                Base.depwarn(
+                    "Passing license=(:text, ...) is deprecated, use license=(:fulltext, ...) instead.",
+                    :update_dataset;
+                    force=true,
+                )
+            end
             Dict("text" => license_value)
         else
             throw(ArgumentError("Invalid license argument: $(cmd) ∉ [:spdx, :text]"))

src/jobs/logging.jl

@@ -214,7 +214,7 @@ function haslast end
 """
     JuliaHub.job_logs_buffered(
         [f::Base.Callable], job::Union{Job,AbstractString};
-        streaming::Bool=true, [offset::Integer],
+        stream::Bool=true, [offset::Integer],
         [auth::Authentication]
     ) -> AbstractJobLogsBuffer
 
@@ -228,15 +228,15 @@ The function accepts the following arguments:
   The first argument is the buffer object itself, and the second argument will be passed a _read-only
   view_ of all the logs that have been loaded into the buffer, including the new ones.
 * `job :: Union{Job,AbstractString}`: either the job name or a [`Job`](@ref) object.
-* `streaming :: Bool`: if set to `true`, the buffer object The streaming can be stopped with
-  [`interrupt!`](@ref).
+* `stream :: Bool`: if set to `true`, the buffer object will automatically pull new logs in a
+  an asynchronous background task. The streaming can be stopped with [`interrupt!`](@ref).
 * `offset :: Integer`: optional non-negative value to specify the starting point of the buffer
 
 # Interface of the returned object
 
 Returns an instance of the abstract [`AbstractJobLogsBuffer`](@ref) type.
 These objects contain log messages (of type [`JobLogMessage`](@ref)), but not all the log messages
-are immediately available. Instead, at any given time the buffer represents a continous section of
+are immediately available. Instead, at any given time the buffer represents a continuous section of
 logs that can be extended in either direction.
 
 The following functions can be used to interact with log buffers: [`job_logs_newer!`](@ref),

src/jobsubmission.jl

@@ -1246,7 +1246,12 @@ function submit_job(
     else
         c.env
     end
-    args = merge(get(app, :args, Dict()), args)
+    args = merge(
+        # Note: we need to ::Dict type assertion here to avoid JET complaining with:
+        # no matching method found `convert(::Type{Dict}, ::NamedTuple)`: convert(JuliaHub.Dict, _26::NamedTuple)
+        get(app, :args, Dict())::Dict,
+        args,
+    )
 
     projectid = isnothing(c.project) ? nothing : string(c.project)
 

test/datasets.jl

@@ -237,6 +237,24 @@ end
         @test_throws TypeError JuliaHub.update_dataset(
             "example-dataset"; description=42
         )
+        # Different options for `license` keyword
+        @test JuliaHub.update_dataset("example-dataset"; license="MIT") isa JuliaHub.Dataset
+        @test JuliaHub.update_dataset("example-dataset"; license=(:spdx, "MIT")) isa
+            JuliaHub.Dataset
+        @test JuliaHub.update_dataset("example-dataset"; license=(:fulltext, "...")) isa
+            JuliaHub.Dataset
+        # This should log a deprecation warning
+        @test @test_logs (
+            :warn,
+            "Passing license=(:text, ...) is deprecated, use license=(:fulltext, ...) instead.",
+        ) JuliaHub.update_dataset(
+            "example-dataset"; license=(:text, "...")
+        ) isa JuliaHub.Dataset
+        @test_throws TypeError JuliaHub.update_dataset("example-dataset"; license=1234)
+        @test_throws ArgumentError JuliaHub.update_dataset("example-dataset"; license=(:foo, ""))
+        @test_throws TypeError JuliaHub.update_dataset(
+            "example-dataset"; license=(:fulltext, 1234)
+        )
     end
 end
 
@@ -293,6 +311,33 @@ end
 
         # @test JuliaHub.upload_dataset(
         #     "existing-dataset", @__FILE__; update=true) isa JuliaHub.Dataset
+
+        # Different options for `license` keyword
+        @test JuliaHub.upload_dataset(
+            "example-dataset-license", @__FILE__; create=true, license="MIT"
+        ) isa JuliaHub.Dataset
+        @test JuliaHub.upload_dataset(
+            "example-dataset-license", @__FILE__; replace=true, license=(:spdx, "MIT")
+        ) isa JuliaHub.Dataset
+        @test JuliaHub.upload_dataset(
+            "example-dataset-license", @__FILE__; replace=true, license=(:fulltext, "...")
+        ) isa JuliaHub.Dataset
+        # This should log a deprecation warning
+        @test @test_logs (
+            :warn,
+            "Passing license=(:text, ...) is deprecated, use license=(:fulltext, ...) instead.",
+        ) JuliaHub.upload_dataset(
+            "example-dataset-license", @__FILE__; replace=true, license=(:text, "...")
+        ) isa JuliaHub.Dataset
+        @test_throws TypeError JuliaHub.upload_dataset(
+            "example-dataset-license", @__FILE__; replace=true, license=1234
+        )
+        @test_throws ArgumentError JuliaHub.upload_dataset(
+            "example-dataset-license", @__FILE__; replace=true, license=(:foo, "")
+        )
+        @test_throws TypeError JuliaHub.upload_dataset(
+            "example-dataset-license", @__FILE__; replace=true, license=(:fulltext, 1234)
+        )
     end
     empty!(MOCK_JULIAHUB_STATE)
 end