Skip to content

Commit 92c638a

Browse files
Merge pull request #345 from Traverse-Research/main
Upgrade to `zmq2`
2 parents eede431 + 317e2b2 commit 92c638a

34 files changed

+159
-417
lines changed

.appveyor.yml

-14
This file was deleted.

.appveyor/appveyor.bat

-120
This file was deleted.

.github/dependabot.yml

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: cargo
4+
directory: "/"
5+
schedule:
6+
interval: weekly
7+
open-pull-requests-limit: 10
8+
allow:
9+
- dependency-type: all

.github/workflows/ci.yaml

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
on: [push, pull_request]
2+
3+
name: Continuous integration
4+
5+
jobs:
6+
build:
7+
name: Build
8+
strategy:
9+
matrix:
10+
os: [ubuntu-latest, windows-latest, macos-latest]
11+
rust: [stable]
12+
runs-on: ${{ matrix.os }}
13+
steps:
14+
- uses: actions/checkout@v2
15+
- uses: actions-rs/toolchain@v1
16+
with:
17+
toolchain: ${{ matrix.rust }}
18+
override: true
19+
- name: Cargo build
20+
uses: actions-rs/cargo@v1
21+
with:
22+
command: build
23+
args: --workspace --all-targets
24+
test:
25+
name: Test
26+
strategy:
27+
matrix:
28+
os: [ubuntu-latest, windows-latest, macos-latest]
29+
rust: [stable]
30+
runs-on: ${{ matrix.os }}
31+
steps:
32+
- uses: actions/checkout@v2
33+
- uses: actions-rs/toolchain@v1
34+
with:
35+
toolchain: ${{ matrix.rust }}
36+
override: true
37+
- name: Cargo test
38+
uses: actions-rs/cargo@v1
39+
with:
40+
command: test
41+
args: --workspace --all-targets
42+
lint:
43+
name: Lint
44+
strategy:
45+
matrix:
46+
os: [ubuntu-latest, windows-latest, macos-latest]
47+
rust: [stable]
48+
runs-on: ${{ matrix.os }}
49+
steps:
50+
- uses: actions/checkout@v2
51+
- name: Cargo clippy
52+
uses: actions-rs/cargo@v1
53+
with:
54+
command: clippy
55+
args: --workspace --all-targets -- -D warnings

.travis.yml

-71
This file was deleted.

Cargo.toml

+9-11
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
[package]
22
name = "zmq"
3-
version = "0.9.2"
3+
version = "0.10.0"
44
authors = [
55
66
7+
78
]
89
license = "MIT/Apache-2.0"
910
description = "High-level bindings to the zeromq library"
@@ -15,30 +16,27 @@ build = "build.rs"
1516
edition = "2018"
1617

1718
[badges]
18-
maintenance = { status = "passively-maintained" }
19-
travis-ci = { repository = "erickt/rust-zmq" }
20-
appveyor = { repository = "erickt/rust-zmq" }
19+
maintenance = { status = "actively-maintained" }
2120

2221
[features]
2322
default = ["zmq_has"]
2423
# zmq_has was added in zeromq 4.1. As we now require 4.1 or newer,
2524
# this feature is a no-op and only present for backward-compatibility;
2625
# it will be removed in the next API-breaking release.
2726
zmq_has = []
28-
vendored = ['zmq-sys/vendored']
2927

3028
[dependencies]
3129
bitflags = "1.0"
3230
libc = "0.2.15"
33-
zmq-sys = { version = "0.11.0", path = "zmq-sys" }
31+
zmq-sys = { version = "0.12.0", path = "zmq-sys" }
3432

3533
[dev-dependencies]
36-
trybuild = "*" # { version = "0.4.0", features = ["stable"] }
37-
env_logger = { version = "0.7", default-features = false }
34+
trybuild = { version = "1" }
35+
env_logger = { version = "0.9", default-features = false }
3836
log = "0.4.3"
39-
nix = "0.16"
40-
quickcheck = "0.9"
41-
rand = "0.7"
37+
nix = "0.23"
38+
quickcheck = "1"
39+
rand = "0.8"
4240
tempfile = "3"
4341
timebomb = "0.1.2"
4442

0 commit comments

Comments
 (0)