Skip to content

Commit

Permalink
Merge pull request #52 from EcoJulia/fix-dev
Browse files Browse the repository at this point in the history
Move github actions and docs to dev branch
  • Loading branch information
richardreeve authored Mar 10, 2021
2 parents e58ff5e + 05297c3 commit 50bd048
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Documentation
on:
push:
branches:
- master
- dev
tags:
- 'v*'
pull_request:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/testing.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: CI
on:
push:
branches:
- master
- dev
tags:
- 'v*'
pull_request:
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions docs/src/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 50bd048

Please sign in to comment.