Skip to content

Commit b711cb0

Browse files
committed
Backport allowing - in dataset names to 0.2
This backports a part of #40 that enables hyphens in dataset names to the 0.2 branch, for tagging as 0.2.7.
1 parent a385242 commit b711cb0

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on:
33
push:
44
branches:
55
- master
6+
- release-*
67
tags: '*'
78
pull_request:
89
jobs:

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "DataSets"
22
uuid = "c9661210-8a83-48f0-b833-72e62abce419"
33
authors = ["Chris Foster <[email protected]> and contributors"]
4-
version = "0.2.6"
4+
version = "0.2.7"
55

66
[deps]
77
AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"

src/DataSets.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ separated with forward slashes. Examples:
9191
my_data
9292
my_data_1
9393
username/data
94-
organization/project/data
94+
organization-dataset_name/project/data
9595
"""
9696
function check_dataset_name(name::AbstractString)
9797
# DataSet names disallow most punctuation for now, as it may be needed as
@@ -100,13 +100,13 @@ function check_dataset_name(name::AbstractString)
100100
^
101101
[[:alpha:]]
102102
(?:
103-
[[:alnum:]_] |
103+
[-[:alnum:]_] |
104104
/ (?=[[:alpha:]])
105105
)*
106106
$
107107
"x
108108
if !occursin(dataset_name_pattern, name)
109-
error("DataSet name \"$name\" is invalid. DataSet names must start with a letter and can contain only letters, numbers, `_` or `/`.")
109+
error("DataSet name \"$name\" is invalid. DataSet names must start with a letter and can contain only letters, numbers, `-`, `_` or `/`.")
110110
end
111111
end
112112

test/runtests.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,9 @@ end
9898
@test DataSets.check_dataset_name("δεδομένα") === nothing
9999
@test DataSets.check_dataset_name("a/b") === nothing
100100
@test DataSets.check_dataset_name("a/b/c") === nothing
101+
@test DataSets.check_dataset_name("a-b-c-") === nothing
101102
# Invalid names
102-
@test_throws ErrorException("DataSet name \"a?b\" is invalid. DataSet names must start with a letter and can contain only letters, numbers, `_` or `/`.") DataSets.check_dataset_name("a?b")
103+
@test_throws ErrorException("DataSet name \"a?b\" is invalid. DataSet names must start with a letter and can contain only letters, numbers, `-`, `_` or `/`.") DataSets.check_dataset_name("a?b")
103104
@test_throws ErrorException DataSets.check_dataset_name("1")
104105
@test_throws ErrorException DataSets.check_dataset_name("a b")
105106
@test_throws ErrorException DataSets.check_dataset_name("a.b")

0 commit comments

Comments
 (0)