Skip to content

Commit

Permalink
Minor docs and automation fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
richardreeve committed Apr 9, 2021
1 parent 6a6fa79 commit 741d973
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 24 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
name: Documentation

on:
release:
types:
- published
push:
branches:
- dev
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/nightly.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
name: JuliaNightly
# Nightly Scheduled Julia Nightly Run
on:
release:
types:
- published
push:
branches:
- dev
tags:
- 'v*'
schedule:
- cron: '0 2 * * 0' # Weekly at 2 AM UTC Sunday

Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/testing.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
name: CI

on:
release:
types:
- published
push:
branches:
- dev
tags:
- 'v*'
pull_request:

jobs:
Expand Down
7 changes: 3 additions & 4 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# NEWS

- v0.4.8 to v0.4.17
- fixing automation on new releases
- v0.4.7
- docs
- v0.4.7 to v0.4.18
- fixed automation on new releases
- documentation updates
- v0.4.6
- add sort function, sort! can be reversed
- v0.4.5
Expand Down
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "Phylo"
uuid = "aea672f4-3940-5932-aa44-993d1c3ff149"
author = ["Richard Reeve <Richard.Reeve@glasgow.ac.uk>"]
version = "0.4.17"
version = "0.4.18"

[deps]
AxisArrays = "39de3d68-74b9-583c-8d2d-e117c070f3a9"
Expand Down
17 changes: 10 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Phylo

*Package for creating and manipulating phylogenies*
## A package for creating and manipulating phylogenies

| **Documentation** | **Build Status** | **DOI** |
|:-----------------:|:--------------------------:|:--------------------------:|
Expand All @@ -18,17 +18,17 @@ installed with `add`. For example:
Updating git-repo `https://github.com/JuliaRegistries/General.git`
Resolving package versions...
Updating `~/.julia/environments/v1.6/Project.toml`
[aea672f4] + Phylo v0.4.7
[aea672f4] + Phylo v0.4.18
Updating `~/.julia/environments/v1.6/Manifest.toml`

(@v1.6) pkg>
```

## Project Status

The package is confirmed to work against the current LTS Julia v1.4 release
and the latest release on Linux, macOS, and Windows. It is also tested
against nightly.
The package is confirmed to work against Julia v1.6, the current LTS Julia
v1.4 release and the latest release on Linux, macOS, and Windows. It is also
tested against nightly.

## Contributing and Questions

Expand Down Expand Up @@ -159,6 +159,7 @@ julia> tree = open(parsenewick, Phylo.path("H1N1.newick"))
RootedTree with 507 tips, 1013 nodes and 1012 branches.
Leaf names are 227, 294, 295, 110, 390, ... [501 omitted] ... and 418
```

And it can read nexus trees from files too:

```julia
Expand Down Expand Up @@ -237,7 +238,7 @@ RCall.RObject{RCall.VecSxp}
Phylogenetic tree with 10 tips and 9 internal nodes.
Tip labels:
t10, t8, t1, t2, t6, t5, ...
t10, t8, t1, t2, t6, t5, ...
Rooted; includes branch lengths.
Expand All @@ -259,7 +260,7 @@ R> jt
Phylogenetic tree with 10 tips and 9 internal nodes.
Tip labels:
t10, t8, t1, t2, t6, t5, ...
t10, t8, t1, t2, t6, t5, ...
Rooted; includes branch lengths.
Expand Down Expand Up @@ -306,9 +307,11 @@ julia> d = DataFrame(nodename=getnodename.(tree, traversal(tree, preorder)), tra
│ 198 │ tip 71 │ -0.868774 │
│ 199 │ tip 89 │ -0.30126 │
```

![Continuous trait tree plot](docs/img/browniantree.png)

Then a discrete trait:

```julia
julia> @enum TemperatureTrait lowTempPref midTempPref highTempPref
Expand Down
7 changes: 4 additions & 3 deletions docs/src/index.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Phylo

*A package for creating and manipulating phylogenies*
## A package for creating and manipulating phylogenies

**Phylo** is a [Julia](http://www.julialang.org) package that provides
functionality for generating phylogenetic trees to feed into our
Expand Down Expand Up @@ -100,6 +100,7 @@ julia> tree = open(parsenewick, Phylo.path("H1N1.newick"))
RootedTree with 507 tips, 1013 nodes and 1012 branches.
Leaf names are 227, 294, 295, 110, 390, ... [501 omitted] ... and 418
```

And it can read nexus trees from files too:

```julia
Expand Down Expand Up @@ -155,7 +156,7 @@ RCall.RObject{RCall.VecSxp}
Phylogenetic tree with 10 tips and 9 internal nodes.

Tip labels:
t10, t8, t1, t2, t6, t5, ...
t10, t8, t1, t2, t6, t5, ...

Rooted; includes branch lengths.

Expand All @@ -177,7 +178,7 @@ R> jt
Phylogenetic tree with 10 tips and 9 internal nodes.

Tip labels:
t10, t8, t1, t2, t6, t5, ...
t10, t8, t1, t2, t6, t5, ...

Rooted; includes branch lengths.

Expand Down

2 comments on commit 741d973

@richardreeve
Copy link
Member Author

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/33896

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.4.18 -m "<description of version>" 741d973f532e82ab25f8a8d7af03e6f085e049c3
git push origin v0.4.18

Please sign in to comment.