Skip to content

Commit b437168

Browse files
authored
Fix depreciation warnings and fix requirements (#75)
* Fix depreciation warnings and use Random * Add Base64 * Minimise testing Project.toml * Update README.md
1 parent 4410d78 commit b437168

File tree

7 files changed

+11
-40
lines changed

7 files changed

+11
-40
lines changed

Project.toml

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ uuid = "bd7594eb-a658-542f-9e75-4c4d8908c167"
33
version = "2.1.1"
44

55
[deps]
6+
Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
67
Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
78
DSP = "717857b8-e6f2-59f4-9121-6e50c889abd2"
89
FFTW = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341"
910
FixedPointNumbers = "53c48c17-4a7d-5ca2-90c5-79b7896eea93"
1011
IntervalSets = "8197267c-284f-5f27-9208-e0e47529a953"
1112
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
13+
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
1214
TreeViews = "a2a6695c-b41b-5b7d-aed9-dbfdeacea5d7"
1315
Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
1416

@@ -18,28 +20,13 @@ DSP = "0.6.1"
1820
FFTW = "1.1.0"
1921
FixedPointNumbers = "0.6.1"
2022
IntervalSets = "0.3.2"
23+
TreeViews = "0.3"
2124
Unitful = "0.17.0"
2225
julia = "1"
23-
TreeViews = "0.3"
2426

2527
[extras]
26-
DSP = "717857b8-e6f2-59f4-9121-6e50c889abd2"
2728
FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
28-
FixedPointNumbers = "53c48c17-4a7d-5ca2-90c5-79b7896eea93"
29-
# LibSndFile = "b13ce0c6-77b0-50c6-a2db-140568b8d1a5"
30-
Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
31-
Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
32-
SampledSignals = "bd7594eb-a658-542f-9e75-4c4d8908c167"
33-
TreeViews = "a2a6695c-b41b-5b7d-aed9-dbfdeacea5d7"
34-
IntervalSets = "8197267c-284f-5f27-9208-e0e47529a953"
29+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
3530

3631
[targets]
37-
test = ["DSP",
38-
"FileIO",
39-
"FixedPointNumbers",
40-
# "LibSndFile",
41-
"Unitful",
42-
"Compat",
43-
"SampledSignals",
44-
"TreeViews",
45-
"IntervalSets"]
32+
test = ["Test", "FileIO"]

README.md

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
[![Tests](https://github.com/JuliaAudio/SampledSignals.jl/actions/workflows/Tests.yml/badge.svg?branch=master)](https://github.com/JuliaAudio/SampledSignals.jl/actions/workflows/Tests.yml)
44
[![codecov.io](http://codecov.io/github/JuliaAudio/SampledSignals.jl/coverage.svg?branch=master)](http://codecov.io/github/JuliaAudio/SampledSignals.jl?branch=master)
55

6-
**Dev Note: Currently the master branch of SampledSignals requires the master branch of LibSndFile for its tests.**
7-
86
SampledSignals is a collection of types intended to be used on multichannel sampled signals like audio or radio data, EEG signals, etc., to provide better interoperability between packages that read data from files or streams, DSP packages, and output and display packages.
97

108
SampledSignals provides several types to stream and store sampled data: `SampleBuf`, `SpectrumBuf`, `SampleSource`, `SampleSink` which make use of [IntervalSets](https://github.com/JuliaMath/IntervalSets.jl) that can be used to represent contiguous ranges using a convenient `a..b` syntax, this feature is copied mostly from the [AxisArrays](https://github.com/mbauman/AxisArrays.jl) package, which also inspired much of the implementation of this package.
@@ -158,17 +156,3 @@ Currently for real-valued indices like time we are just rounding to the nearest
158156
### Relative vs. Absolute indexing
159157

160158
When we take a slice of a SampleBuf (e.g. take the span from 1s to 3s of a 10s audio buffer), what is the indexing domain of the result? Specifically, is it 1s-3s, or is it 0s-2s? For time-domain signals I can see wanting indexing relative to the beginning of the buffer, but in frequency-domain buffers it seems you usually want to keep the frequency information. Keeping track of the time information could also be useful if you split out a signal for processing and then want to re-combine things at the end.
161-
162-
## AbstractTrees troubleshooting
163-
164-
To run the SampledSignals tests you need Gumbo, but installing both Gumbo and Juno causes issues that prevent you from running the tests on 0.6. Here are the details:
165-
166-
* AbstractTrees < v0.1.0 is not compatible with Julia v0.6
167-
* Gumbo 0.3.0 (latest) requires AbstractTrees >= v0.0.4
168-
* ASTInterpreter requires AbstractTrees between v0.0.4 and v0.1.0
169-
* this limitation isn't in the REQUIRE in the repo, but was added to METADATA
170-
* ASTInterpreter is required by Atom and Gallium
171-
172-
### Solution:
173-
174-
Run `Pkg.checkout("ASTInterpreter")` and `Pkg.resolve()` until a new version is tagged. The ASTInterpreter tests don't pass, but it gets things working enough to get AbstractTrees back to 0.1.0 and the SampledSignals tests runnable.

src/SampledSignals.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ using FixedPointNumbers
2727
using DSP
2828
using Compat
2929
using Compat: AbstractRange, undef, range
30-
using Compat.Random: randstring
31-
using Compat.Base64: base64encode
30+
using Random: randstring
31+
using Base64: base64encode
3232
using TreeViews: TreeViews
3333

3434
if VERSION >= v"0.7.0-DEV"

test/DummySampleStream.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Compat.Test
1+
using Test
22
import Compat: undef
33

44
@testset "DummySampleStream Tests" begin

test/SampleBuf.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Compat.Test
1+
using Test
22
using Compat: undef, range
33
using SampledSignals
44
using Unitful

test/SampleStream.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Compat.Test
1+
using Test
22
import Compat: undef
33
using SampledSignals
44
using DSP

test/runtests.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using SampledSignals
2-
using Compat.Test
2+
using Test
33
using DSP
44
using FixedPointNumbers
55
using FileIO: File, Stream, @format_str

0 commit comments

Comments
 (0)