Skip to content

Commit

Permalink
Merge branch 'release/v2.1.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
CiaranOMara committed Nov 24, 2019
2 parents b9c19da + abcd21e commit c0720a7
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 163 deletions.
23 changes: 22 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,28 @@
# Files generated by invoking Julia with --code-coverage
*.jl.cov
*.jl.*.cov

# Files generated by invoking Julia with --track-allocation
*.jl.mem

# System-specific files and directories generated by the BinaryProvider and BinDeps packages
# They contain absolute paths specific to the host computer, and so should not be committed
deps/deps.jl
deps/build.log
deps/downloads/
deps/usr/
deps/src/

# Build artifacts for creating documentation generated by the Documenter package
docs/build/
docs/site/

# File generated by Pkg, the package manager, based on a corresponding Project.toml
# It records a fixed state of all packages used by the project. As such, it should not be
# committed for packages, but should be committed for applications that require a static
# environment.
Manifest.toml

### Linux template
*~

Expand Down Expand Up @@ -197,4 +219,3 @@ Temporary Items

# Temporary
# Auto-generated tag files

142 changes: 0 additions & 142 deletions Manifest.toml

This file was deleted.

6 changes: 3 additions & 3 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "BedgraphFiles"
uuid = "85eb9095-274b-55ce-be28-9e90f41ac741"
authors = ["Ciarán O'Mara <[email protected]>"]
version = "2.1.2"
version = "2.1.3"

[deps]
Bedgraph = "0bcc2ff6-69eb-520d-bede-0374fc5bd2fd"
Expand All @@ -17,7 +17,7 @@ TableTraitsUtils = "382cd787-c1b6-5bf2-a167-d5b971a19bda"
[compat]
Bedgraph = "^1.1"
FileIO = "^1.0.1"
IterableTables = ">=0.9.0"
IterableTables = "^0.9, ^0.10, ^0.11, ^1"
IteratorInterfaceExtensions = "^0.1.1, ^1"
TableShowUtils = "^0.2.0"
TableTraits = "^0.4, ^1"
Expand All @@ -26,9 +26,9 @@ julia = "0.7, ^1"

[extras]
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
Query = "1a8c2f83-1ff3-5112-b086-8aa67b057ba1"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"

[targets]
test = ["DataFrames", "Test", "Query", "Logging"]
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# BedgraphFiles.jl

[![Project Status: Active - The project has reached a stable, usable state and is being actively developed.](http://www.repostatus.org/badges/latest/active.svg)](http://www.repostatus.org/#active)
[![Build Status](https://travis-ci.org/CiaranOMara/BedgraphFiles.jl.svg?branch=master)](https://travis-ci.org/CiaranOMara/BedgraphFiles.jl)
[![Build Status](https://travis-ci.com/CiaranOMara/BedgraphFiles.jl.svg?branch=master)](https://travis-ci.com/CiaranOMara/BedgraphFiles.jl)
[![Build status](https://ci.appveyor.com/api/projects/status/jny2ep4u3cmly8pj/branch/master?svg=true)](https://ci.appveyor.com/project/CiaranOMara/Bedgraphfiles-jl/branch/master)
[![Build Status](https://api.cirrus-ci.com/github/CiaranOMara/BedgraphFiles.jl.svg)](https://cirrus-ci.com/github/CiaranOMara/BedgraphFiles.jl)
[![codecov.io](http://codecov.io/github/CiaranOMara/BedgraphFiles.jl/coverage.svg?branch=master)](http://codecov.io/github/CiaranOMara/BedgraphFiles.jl?branch=master)
Expand All @@ -12,13 +12,15 @@ This package provides load and save support for [Bedgraph](https://github.com/Ci
under the [FileIO](https://github.com/JuliaIO/FileIO.jl) package, and also implements the [IterableTables](https://github.com/davidanthoff/IterableTables.jl) interface for easy conversion between tabular data structures.

## Installation
You can install BedgraphFiles from the Julia REPL:
You can install BedgraphFiles from the Julia REPL.
Press `]` to enter pkg mode, then enter the following:

```julia
using Pkg
add("BedgraphFiles")
#Pkg.add("BedgraphFiles") for julia prior to v 0.7
add BedgraphFiles
```

If you are interested in the cutting edge of the development, please check out the [develop branch](https://github.com/CiaranOMara/BedgraphFiles.jl/tree/develop) to try new features before release.

## Usage

### Loading bedGraph files
Expand Down
24 changes: 12 additions & 12 deletions test/integrations/test-DataFrames.jl
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
@test typeof(df) == DataFrame
@test size(df) == (9,4)

@test df[:chrom] == Bag.chroms
@test df[:first] == Bag.firsts
@test df[:last] == Bag.lasts
@test df[:value] == Bag.values
@test df.chrom == Bag.chroms
@test df.first == Bag.firsts
@test df.last == Bag.lasts
@test df.value == Bag.values

@test DataFrame(Bag.records) == Bag.records |> DataFrame

Expand All @@ -23,10 +23,10 @@
@test typeof(df2) == DataFrame
@test size(df2) == (9,4)

@test df2[:chrom] == Bag.chroms
@test df2[:first] == Bag.firsts
@test df2[:last] == Bag.lasts
@test df2[:value] == Bag.values
@test df2.chrom == Bag.chroms
@test df2.first == Bag.firsts
@test df2.last == Bag.lasts
@test df2.value == Bag.values

@test DataFrame(load(Bag.file)) == load(Bag.file) |> DataFrame

Expand All @@ -36,10 +36,10 @@
@test typeof(df3) == DataFrame
@test size(df3) == (9,4)

@test df3[:chrom] == Bag.chroms
@test df3[:first] == Bag.firsts
@test df3[:last] == Bag.lasts
@test df3[:value] == Bag.values
@test df3.chrom == Bag.chroms
@test df3.first == Bag.firsts
@test df3.last == Bag.lasts
@test df3.value == Bag.values

@test DataFrame(load(Bag.file_headerless)) == load(Bag.file_headerless) |> DataFrame

Expand Down

2 comments on commit c0720a7

@CiaranOMara
Copy link
Owner Author

Choose a reason for hiding this comment

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

@JuliaRegistrator register()

@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/5802

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 Julia TagBot is installed, or can be done manually through the github interface, or via:

git tag -a v2.1.3 -m "<description of version>" c0720a7441eb05c301f77e87fb5ddf45dfe16d8f
git push origin v2.1.3

Please sign in to comment.