Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: JuliaComputing/DataSets.jl
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9d2132f
Choose a base ref
...
head repository: JuliaComputing/DataSets.jl
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 09efe3d
Choose a head ref
  • 3 commits
  • 5 files changed
  • 2 contributors

Commits on Oct 31, 2022

  1. Fix nightly tests (#50) 

    * Use Pkg.develop instead of LOAD_PATH

* Expand CI test matrix to include 1.5, 1.7

1.5 is the lowest version we support here.

(cherry picked from commit ad3c9a9)
    @mortenpi
    mortenpi committed Oct 31, 2022
    Copy the full SHA
    a385242 View commit details

  2. 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.
    @mortenpi
    mortenpi committed Oct 31, 2022
    Copy the full SHA
    b711cb0 View commit details

Commits on Nov 1, 2022

  1. Merge pull request #49 from JuliaComputing/mp/0.2.7 

    Backport allowing `-` in dataset names to 0.2
    @mortenpi
    mortenpi authored Nov 1, 2022
    2

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    09efe3d View commit details
Showing with 10 additions and 6 deletions.
  1. +3 −0 .github/workflows/ci.yml
  2. +1 −1 Project.toml
  3. +3 −3 src/DataSets.jl
  4. +1 −1 test/driver_autoload.jl
  5. +2 −1 test/runtests.jl
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@ on:
push:
branches:
- master
- release-*
tags: '*'
pull_request:
jobs:
@@ -13,6 +14,8 @@ jobs:
strategy:
matrix:
version:
- '1.5'
- '1.7'
- '1'
- 'nightly'
os:
2 changes: 1 addition & 1 deletion Project.toml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "DataSets"
uuid = "c9661210-8a83-48f0-b833-72e62abce419"
authors = ["Chris Foster <chris42f@gmail.com> and contributors"]
version = "0.2.6"
version = "0.2.7"

[deps]
AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"
6 changes: 3 additions & 3 deletions src/DataSets.jl
View file
Original file line number Diff line number Diff line change
@@ -91,7 +91,7 @@ separated with forward slashes. Examples:
my_data
my_data_1
username/data
organization/project/data
organization-dataset_name/project/data
"""
function check_dataset_name(name::AbstractString)
# DataSet names disallow most punctuation for now, as it may be needed as
@@ -100,13 +100,13 @@ function check_dataset_name(name::AbstractString)
^
[[:alpha:]]
(?:
[[:alnum:]_] |
[-[:alnum:]_] |
/ (?=[[:alpha:]])
)*
$
"x
if !occursin(dataset_name_pattern, name)
error("DataSet name \"$name\" is invalid. DataSet names must start with a letter and can contain only letters, numbers, `_` or `/`.")
error("DataSet name \"$name\" is invalid. DataSet names must start with a letter and can contain only letters, numbers, `-`, `_` or `/`.")
end
end

2 changes: 1 addition & 1 deletion test/driver_autoload.jl
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@testset "Automatic code loading for drivers" begin
empty!(DataSets.PROJECT)
pushfirst!(LOAD_PATH, abspath("drivers"))
Pkg.develop(path=joinpath(@__DIR__, "drivers", "DummyStorageBackends"))
ENV["JULIA_DATASETS_PATH"] = joinpath(@__DIR__, "DriverAutoloadData.toml")
DataSets.__init__()
@test haskey(DataSets._storage_drivers, "DummyTomlStorage")
3 changes: 2 additions & 1 deletion test/runtests.jl
View file
Original file line number Diff line number Diff line change
@@ -98,8 +98,9 @@ end
@test DataSets.check_dataset_name("δεδομένα") === nothing
@test DataSets.check_dataset_name("a/b") === nothing
@test DataSets.check_dataset_name("a/b/c") === nothing
@test DataSets.check_dataset_name("a-b-c-") === nothing
# Invalid names
@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")
@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")
@test_throws ErrorException DataSets.check_dataset_name("1")
@test_throws ErrorException DataSets.check_dataset_name("a b")
@test_throws ErrorException DataSets.check_dataset_name("a.b")