Skip to content

Commit

Permalink
Merge branch 'master' into new/jpeg-encoding
Browse files Browse the repository at this point in the history
  • Loading branch information
Enet4 authored Jan 28, 2023
2 parents 918e20f + 44185a8 commit 0dc718b
Show file tree
Hide file tree
Showing 39 changed files with 1,882 additions and 749 deletions.
42 changes: 15 additions & 27 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,48 +18,36 @@ jobs:
- beta
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
profile: minimal
toolchain: ${{ matrix.rust }}
override: true
- uses: Swatinem/rust-cache@v1
- uses: actions-rs/cargo@v1
with:
command: test
cache: true
# test base functionality
- run: cargo test
# test GDCM support in dicom-pixeldata
- run: cargo test --package dicom-pixeldata --features gdcm

check_windows:
name: Check (Windows)
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
profile: minimal
toolchain: stable
override: true
- uses: Swatinem/rust-cache@v1
- uses: actions-rs/cargo@v1
with:
command: check
cache: true
- run: cargo check

clippy:
name: Clippy
runs-on: ubuntu-latest
strategy:
matrix:
rust:
- stable
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: ${{ matrix.rust }}
override: true
- uses: Swatinem/rust-cache@v1
- run: rustup component add clippy
- uses: actions-rs/cargo@v1
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
command: clippy
toolchain: stable
components: clippy
cache: true
- run: cargo clippy
env:
RUSTFLAGS: -W warnings
40 changes: 0 additions & 40 deletions .travis.yml

This file was deleted.

4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,14 @@ cargo fmt
## Discussion and roadmapping
If you have more long-termed ideas about what DICOM-rs should include next,
please have a look at the [roadmap] and look into existing issues to provide feedback.
You can also talk about the project at the official [DICOM-rs Zulip organization].
You can also talk about the project at the official [DICOM-rs Zulip organization][zulip].

If you have any further questions or concerns,
or would like to be deeper involved in the project,
please reach out to the project maintainers.

[roadmap]: https://github.com/Enet4/dicom-rs/wiki/Roadmap
[Zulip organization]: https://dicom-rs.zulipchat.com
[zulip]: https://dicom-rs.zulipchat.com

## Project team and governance
DICOM-rs is currently led by Eduardo Pinho ([**@Enet4**](https://github.com/Enet4), <enet4mikeenet@gmail.com>).
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ The project also comprises an assortment of command line tools.
- [`scpproxy`](scpproxy) implements a Proxy service class provider.
- [`echoscu`](echoscu) implements a Verification service class user.
- [`storescu`](storescu) implements a Storage service class user.
- [`storescp`](storescp) implements a Storage service class provideer.
- [`storescp`](storescp) implements a Storage service class provider.
- [`toimage`](toimage) lets you convert a DICOM file into an image file.
- [`fromimage`](fromimage) lets you replace the imaging data of a DICOM file
with one from an image file.
Expand Down
2 changes: 1 addition & 1 deletion core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "dicom-core"
version = "0.5.2"
version = "0.5.3"
authors = ["Eduardo Pinho <enet4mikeenet@gmail.com>"]
description = "Efficient and practical core library for DICOM compliant systems"
edition = "2018"
Expand Down
Loading

0 comments on commit 0dc718b

Please sign in to comment.