Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 4 commits into from
Jan 8, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f3ac372
Update to Julia 1.3, add `Project.toml`, use JLL package
staticfloat Dec 18, 2019
50ef45b
rm manifest
stevengj Jan 8, 2020
0dd7e2c
rm obsolete FORCE_COMPILE_ZMQ tests
stevengj Jan 8, 2020
b5de6a2
tests now require 1.3
stevengj Jan 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
6 changes: 2 additions & 4 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 0 additions & 3 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
environment:
matrix:
- julia_version: 1
- julia_version: 1.1
- julia_version: 1.2
- julia_version: 1.3
- julia_version: nightly

Expand Down
6 changes: 0 additions & 6 deletions deps/.gitignore
View file
Open in desktop

This file was deleted.

64 changes: 0 additions & 64 deletions deps/build.jl
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions deps/compile.jl
View file
Open in desktop

This file was deleted.

9 changes: 1 addition & 8 deletions src/ZMQ.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -36,7 +30,6 @@ include("message.jl")
include("comm.jl")

function __init__()
check_deps()
major = Ref{Cint}()
minor = Ref{Cint}()
patch = Ref{Cint}()
Expand Down