Update to Julia 1.3, add Project.toml, use JLL package (#194)

* Update to Julia 1.3, add `Project.toml`, use JLL package * rm manifest * rm obsolete FORCE_COMPILE_ZMQ tests * tests now require 1.3 Co-authored-by: Steven G. Johnson <[email protected]>
JuliaInterop · Jan 8, 2020 · 8da465c · 8da465c
1 parent 129ad5a
commit 8da465c
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 121 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,21 +3,14 @@ os:
     - linux
     - osx
 julia:
-    - 1.0
-    - 1.1
-    - 1.2
     - 1.3
     - nightly
-env:
-  matrix:
-    - FORCE_COMPILE_ZMQ=no
-    - FORCE_COMPILE_ZMQ=yes
 notifications:
     email: false
 jobs:
   include:
     - stage: "Documentation"
-      julia: 1.0
+      julia: 1.3
       os: linux
       script:
         - julia --project=docs/ -e 'using Pkg; Pkg.instantiate();

diff --git a/Project.toml b/Project.toml
@@ -3,14 +3,12 @@ uuid = "c2297ded-f4af-51ae-bb23-16f91089e4e1"
 version = "1.1.0"
 
 [deps]
-BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
 FileWatching = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
-Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"
+ZeroMQ_jll = "8f1865be-045e-5c20-9c9f-bfbfb0764568"
 
 [compat]
-BinaryProvider = "≥ 0.3.0"
-julia = "1"
+julia = "1.3"
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,8 +1,5 @@
 environment:
   matrix:
-  - julia_version: 1
-  - julia_version: 1.1
-  - julia_version: 1.2
   - julia_version: 1.3
   - julia_version: nightly
 

diff --git a/deps/.gitignore b/deps/.gitignore
diff --git a/deps/build.jl b/deps/build.jl
diff --git a/deps/compile.jl b/deps/compile.jl
diff --git a/src/ZMQ.jl b/src/ZMQ.jl
@@ -1,20 +1,14 @@
 # Support for ZeroMQ, a network and interprocess communication library
 
 module ZMQ
+using ZeroMQ_jll
 
-import Libdl
 using Base.Libc: EAGAIN
 using FileWatching: UV_READABLE, uv_pollcb, _FDWatcher
 import Sockets
 using Sockets: connect, bind, send, recv
 import Base.GC: @preserve
 
-const depsjl_path = joinpath(dirname(@__FILE__), "..", "deps", "deps.jl")
-if !isfile(depsjl_path)
-    error("Blosc not installed properly, run Pkg.build(\"ZMQ\"), restart Julia and try again")
-end
-include(depsjl_path)
-
 export
     #Types
     StateError,Context,Socket,Message,
@@ -36,7 +30,6 @@ include("message.jl")
 include("comm.jl")
 
 function __init__()
-    check_deps()
     major = Ref{Cint}()
     minor = Ref{Cint}()
     patch = Ref{Cint}()