Skip to content

Commit

Permalink
Merge pull request #345 from Traverse-Research/main
Browse files Browse the repository at this point in the history
Upgrade to `zmq2`
  • Loading branch information
Jasper-Bekkers authored Sep 13, 2022
2 parents eede431 + 317e2b2 commit 92c638a
Show file tree
Hide file tree
Showing 34 changed files with 159 additions and 417 deletions.
14 changes: 0 additions & 14 deletions .appveyor.yml

This file was deleted.

120 changes: 0 additions & 120 deletions .appveyor/appveyor.bat

This file was deleted.

9 changes: 9 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
version: 2
updates:
- package-ecosystem: cargo
directory: "/"
schedule:
interval: weekly
open-pull-requests-limit: 10
allow:
- dependency-type: all
55 changes: 55 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
on: [push, pull_request]

name: Continuous integration

jobs:
build:
name: Build
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
rust: [stable]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: ${{ matrix.rust }}
override: true
- name: Cargo build
uses: actions-rs/cargo@v1
with:
command: build
args: --workspace --all-targets
test:
name: Test
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
rust: [stable]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: ${{ matrix.rust }}
override: true
- name: Cargo test
uses: actions-rs/cargo@v1
with:
command: test
args: --workspace --all-targets
lint:
name: Lint
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
rust: [stable]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- name: Cargo clippy
uses: actions-rs/cargo@v1
with:
command: clippy
args: --workspace --all-targets -- -D warnings
71 changes: 0 additions & 71 deletions .travis.yml

This file was deleted.

20 changes: 9 additions & 11 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
[package]
name = "zmq"
version = "0.9.2"
version = "0.10.0"
authors = [
"[email protected]",
"[email protected]",
"[email protected]",
]
license = "MIT/Apache-2.0"
description = "High-level bindings to the zeromq library"
Expand All @@ -15,30 +16,27 @@ build = "build.rs"
edition = "2018"

[badges]
maintenance = { status = "passively-maintained" }
travis-ci = { repository = "erickt/rust-zmq" }
appveyor = { repository = "erickt/rust-zmq" }
maintenance = { status = "actively-maintained" }

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

[dependencies]
bitflags = "1.0"
libc = "0.2.15"
zmq-sys = { version = "0.11.0", path = "zmq-sys" }
zmq-sys = { version = "0.12.0", path = "zmq-sys" }

[dev-dependencies]
trybuild = "*" # { version = "0.4.0", features = ["stable"] }
env_logger = { version = "0.7", default-features = false }
trybuild = { version = "1" }
env_logger = { version = "0.9", default-features = false }
log = "0.4.3"
nix = "0.16"
quickcheck = "0.9"
rand = "0.7"
nix = "0.23"
quickcheck = "1"
rand = "0.8"
tempfile = "3"
timebomb = "0.1.2"

Expand Down
Loading

0 comments on commit 92c638a

Please sign in to comment.