Skip to content

Commit 215061a

Browse files
authored
Merge pull request #52 from queryverse/julia-1.3
Migrate to Julia 1.3
2 parents 60c5c87 + 949a367 commit 215061a

8 files changed

Lines changed: 11 additions & 77 deletions

File tree

.travis.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@ language: julia
22
os:
33
- linux
44
- osx
5+
- windows
56
julia:
6-
- 1.0
7-
- 1.1
8-
- 1.2
7+
- 1.3
98
- nightly
109
notifications:
1110
email: false
@@ -23,7 +22,7 @@ after_success:
2322
jobs:
2423
include:
2524
- stage: "Documentation"
26-
julia: 1.1
25+
julia: 1.3
2726
os: linux
2827
script:
2928
- julia --project=docs/ -e 'using Pkg; Pkg.instantiate(); Pkg.develop(PackageSpec(path=pwd())); Pkg.build("ReadStat")'

NEWS.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# ReadStat.jl v1.0.0 Release Notes
2-
* Drop julia 0.7 support
2+
* Drop support for all Julia pre 1.3 versions
33
* Migrate to Project.toml
4+
* Migrate to artifacts
45

56
# ReadStat.jl v0.4.1 Release Notes
67
* Fix remaining julia 0.7/1.0 issues

Project.toml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@ uuid = "d71aba96-b539-5138-91ee-935c3ee1374c"
33
version = "1.0.0-DEV"
44

55
[deps]
6-
BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
76
DataValues = "e7dc6d0d-1eca-5fa6-8ad6-5aecde8b7ea5"
87
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
9-
StringEncodings = "69024149-9ee7-55f6-a4c4-859efe599b68"
10-
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
8+
ReadStat_jll = "a4dc8951-f1cc-5499-9034-9ec1c3e64557"
119

1210
[extras]
1311
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
@@ -16,7 +14,6 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
1614
test = ["Test"]
1715

1816
[compat]
19-
BinaryProvider = "≥ 0.4.2"
20-
DataValues = "≥ 0.4.4"
21-
StringEncodings = "≥ 0.3.1"
22-
julia = "1"
17+
DataValues = "0.4.4"
18+
ReadStat_jll = "1.1.1"
19+
julia = "1.3"

appveyor.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
environment:
22
matrix:
3-
- julia_version: 1.0
4-
- julia_version: 1.1
5-
- julia_version: 1.2
3+
- julia_version: 1.3
64
- julia_version: nightly
75

86
platform:

deps/.gitignore

Lines changed: 0 additions & 4 deletions
This file was deleted.

deps/build.jl

Lines changed: 0 additions & 3 deletions
This file was deleted.

deps/build_ReadStat.v0.1.1-dev.jl

Lines changed: 0 additions & 47 deletions
This file was deleted.

src/ReadStat.jl

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
module ReadStat
22

3-
import StringEncodings
4-
5-
# Load libreadstat from our deps.jl
6-
const depsjl_path = joinpath(dirname(@__FILE__), "..", "deps", "deps.jl")
7-
if !isfile(depsjl_path)
8-
error("ReadStat not installed properly, run Pkg.build(\"ReadStat\"), restart Julia and try again")
9-
end
10-
include(depsjl_path)
3+
using ReadStat_jll
114

125
##############################################################################
136
##

0 commit comments

Comments
 (0)