From 05297c38c258a1a4a44a0b64d026d712ba8a3613 Mon Sep 17 00:00:00 2001 From: Richard Reeve Date: Wed, 10 Mar 2021 22:46:50 +0000 Subject: [PATCH] Move github actions and docs to dev branch --- .github/workflows/docs.yaml | 2 +- .github/workflows/testing.yaml | 2 +- README.md | 6 +++--- docs/src/index.md | 3 +-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 67d19fe7..431942dc 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -3,7 +3,7 @@ name: Documentation on: push: branches: - - master + - dev tags: - 'v*' pull_request: diff --git a/.github/workflows/testing.yaml b/.github/workflows/testing.yaml index 6ea80153..a6c28055 100644 --- a/.github/workflows/testing.yaml +++ b/.github/workflows/testing.yaml @@ -3,7 +3,7 @@ name: CI on: push: branches: - - master + - dev tags: - 'v*' pull_request: diff --git a/README.md b/README.md index 436e9739..79a6b553 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ can be time based, and traits that relate directly to physical units For instance, to construct a sampler for 5 tip non-ultrametric trees, and then generate one or two random tree of that type (the examples -below are from the master branch, but work similarly on the current +below are from the dev branch, but work similarly on the current release): ```julia @@ -350,9 +350,9 @@ julia> d = DataFrame(nodename=getnodename.(tree, traversal(tree, preorder)), tra [nightly-url]: https://github.com/EcoJulia/Phylo.jl/actions/workflows/nightly.yaml [coveralls-img]: https://img.shields.io/coveralls/EcoJulia/Phylo.jl.svg -[coveralls-url]: https://coveralls.io/r/EcoJulia/Phylo.jl?branch=master +[coveralls-url]: https://coveralls.io/r/EcoJulia/Phylo.jl?branch=dev -[codecov-img]: https://codecov.io/gh/EcoJulia/Phylo.jl/branch/master/graph/badge.svg +[codecov-img]: https://codecov.io/gh/EcoJulia/Phylo.jl/branch/dev/graph/badge.svg [codecov-url]: https://codecov.io/gh/EcoJulia/Phylo.jl [zenodo-badge]: https://zenodo.org/badge/93447241.svg diff --git a/docs/src/index.md b/docs/src/index.md index 28fdfe6e..2e1230bb 100644 --- a/docs/src/index.md +++ b/docs/src/index.md @@ -5,8 +5,7 @@ **Phylo** is a [Julia](http://www.julialang.org) package that provides functionality for generating phylogenetic trees to feed into our [Diversity](https://github.com/richardreeve/Diversity.jl) package to calculate phylogenetic - diversity (currently on master, - but not released). Both are currently under development, so please + diversity. Both are currently under development, so please [raise an issue](https://github.com/richardreeve/Phylo.jl/issues) if you find any problems. Currently the package can be used to make trees manually, and to generate random trees using the framework from `Distributions`. For instance, to construct a sampler for 5 tip non-ultrametric