Skip to content

Commit

Permalink
up dependencies: DataFrames v0.12 and CSV v0.7 (#4)
Browse files Browse the repository at this point in the history
thanks CompatHelper and github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>!
  • Loading branch information
github-actions[bot] authored Jul 14, 2020
1 parent 7af3efb commit 6772f46
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 8 deletions.
6 changes: 3 additions & 3 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "QuartetNetworkGoodnessFit"
uuid = "1382f7fc-2744-4d9d-8ec6-1e3efdec0746"
authors = ["Cecile Ane <[email protected]>"]
version = "0.2.0"
version = "0.2.1"

[deps]
CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
Expand All @@ -18,9 +18,9 @@ StatsFuns = "4c63d2b9-4356-54db-8cca-17b64c39e42c"

[compat]
CSV = "0.4, 0.5, 0.6, 0.7"
DataFrames = "0.13, 0.14, 0.15, 0.16, 0.17, 0.18, 0.19, 0.20"
DataFrames = "0.13, 0.14, 0.15, 0.16, 0.17, 0.18, 0.19, 0.20, 0.21"
NLopt = "0.5.1, 0.6"
PhyloNetworks = "0.11"
PhyloNetworks = "0.11, 0.12"
SpecialFunctions = "0.8, 0.9, 0.10"
StatsFuns = "0.7, 0.8, 0.9"
julia = "1.2, 1.3, 1.4"
3 changes: 3 additions & 0 deletions docs/Project.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
[deps]
CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
DocumenterMarkdown = "997ab1e6-3595-5248-9280-8efb232c3433"
PhyloNetworks = "33ad39ac-ed31-50eb-9b15-43d0656eaa72"

[compat]
CSV = "0.7"
DataFrames = "0.21"
Documenter = "~0.24"
4 changes: 2 additions & 2 deletions docs/src/man/gof.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ for each of the 3 topologies on these 4 taxa, that is, the
proportion of genes estimated to have each 4-taxon unrooted topology.

```@repl gof
using QuartetNetworkGoodnessFit, CSV
qCF = CSV.read(joinpath(dirname(pathof(QuartetNetworkGoodnessFit)), "..","test","example_qCF_5taxa.csv"));
using QuartetNetworkGoodnessFit, DataFrames, CSV
qCF = DataFrame!(CSV.File(joinpath(dirname(pathof(QuartetNetworkGoodnessFit)), "..","test","example_qCF_5taxa.csv")));
qCF
```

Expand Down
5 changes: 5 additions & 0 deletions test/Project.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
[deps]
CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
PhyloNetworks = "33ad39ac-ed31-50eb-9b15-43d0656eaa72"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[compat]
CSV = "0.7"
DataFrames = "0.21"
2 changes: 1 addition & 1 deletion test/runtests.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using QuartetNetworkGoodnessFit
using CSV
using DataFrames, CSV
using PhyloNetworks
using Test
using Distributed
Expand Down
2 changes: 1 addition & 1 deletion test/test_qnetGoF.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@testset "testing GoF, multinomial distribution" begin

df = CSV.read(joinpath(dirname(Base.find_package("PhyloNetworks")),"..","examples","buckyCF.csv"))
df = DataFrame!(CSV.File(joinpath(dirname(Base.find_package("PhyloNetworks")),"..","examples","buckyCF.csv")))
d0 = readTableCF(df)
d = deepcopy(d0)
net3 = readTopology("((((D:0.4,C:0.4):4.8,((A:0.8,B:0.8):2.2)#H1:2.2::0.7):4.0,(#H1:0::0.3,E:3.0):6.2):2.0,O:11.2);");
Expand Down
2 changes: 1 addition & 1 deletion test/test_ticr.jl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@testset "testing TICR, Dirichlet distribution" begin
# previously in PhyloNetworks

df = CSV.read(joinpath(dirname(Base.find_package("PhyloNetworks")),"..","examples","buckyCF.csv"));
df = DataFrame!(CSV.File(joinpath(dirname(Base.find_package("PhyloNetworks")),"..","examples","buckyCF.csv")));
d = readTableCF(df);

@testset "ticr! on data frame, tree" begin
Expand Down

2 comments on commit 6772f46

@cecileane
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/17937

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.2.1 -m "<description of version>" 6772f464dee66ca2d5e1a3a61e5ace8488c5e408
git push origin v0.2.1

Please sign in to comment.