Skip to content

Commit

Permalink
Merge pull request #79 from CSBiology/developer
Browse files Browse the repository at this point in the history
Update master with changes from Developer for 1.0.02
  • Loading branch information
kMutagene authored Feb 19, 2020
2 parents c8bf7c8 + f419cf0 commit 66cdf16
Show file tree
Hide file tree
Showing 53 changed files with 2,117 additions and 1,175 deletions.
18 changes: 18 additions & 0 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"isRoot": true,
"tools": {
"fake-cli": {
"version": "5.19.1",
"commands": [
"fake"
]
},
"paket": {
"version": "5.242.1",
"commands": [
"paket"
]
}
}
}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -185,3 +185,4 @@ paket-files
docsrc/tools/FSharp.Formatting.svclog
docs
/temp
/pkg
119 changes: 76 additions & 43 deletions .paket/Paket.Restore.targets

Large diffs are not rendered by default.

11 changes: 3 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
language: csharp
#sudo: required
sudo: false
dist: trusty # Ubuntu 14.04
mono: latest
dotnet : 2.1.403

before_install:
- export PATH=$PATH:/home/travis/.dotnet/tools
- dotnet tool install paket -g
- dotnet restore build.proj
dotnet : 3.1.101

script:
- dotnet fake build --target Linux
- chmod +x ./build.sh
- ./build.sh -t Mono

branches:
only:
Expand Down
18 changes: 17 additions & 1 deletion BioFSharp.sln
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{63297B
ProjectSection(SolutionItems) = preProject
paket.dependencies = paket.dependencies
paket.lock = paket.lock
paket.references = paket.references
EndProjectSection
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "BioFSharp", "src\BioFSharp\BioFSharp.fsproj", "{DC20B62F-9F8B-4128-898D-9436B1CE8B8D}"
Expand All @@ -30,6 +29,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "content", "content", "{8E6D
docsrc\content\Alignment.fsx = docsrc\content\Alignment.fsx
docsrc\content\AminoProperties.fsx = docsrc\content\AminoProperties.fsx
docsrc\content\BioCollections.fsx = docsrc\content\BioCollections.fsx
docsrc\content\BioContainers.fsx = docsrc\content\BioContainers.fsx
docsrc\content\BioDB.fsx = docsrc\content\BioDB.fsx
docsrc\content\BioID.fsx = docsrc\content\BioID.fsx
docsrc\content\BioItem.fsx = docsrc\content\BioItem.fsx
Expand Down Expand Up @@ -105,65 +105,81 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
DotnetCore|Any CPU = DotnetCore|Any CPU
Mono|Any CPU = Mono|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{DC20B62F-9F8B-4128-898D-9436B1CE8B8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DC20B62F-9F8B-4128-898D-9436B1CE8B8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DC20B62F-9F8B-4128-898D-9436B1CE8B8D}.DotnetCore|Any CPU.ActiveCfg = DotnetCore|Any CPU
{DC20B62F-9F8B-4128-898D-9436B1CE8B8D}.DotnetCore|Any CPU.Build.0 = DotnetCore|Any CPU
{DC20B62F-9F8B-4128-898D-9436B1CE8B8D}.Mono|Any CPU.ActiveCfg = Mono|Any CPU
{DC20B62F-9F8B-4128-898D-9436B1CE8B8D}.Mono|Any CPU.Build.0 = Mono|Any CPU
{DC20B62F-9F8B-4128-898D-9436B1CE8B8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DC20B62F-9F8B-4128-898D-9436B1CE8B8D}.Release|Any CPU.Build.0 = Release|Any CPU
{EC120240-3BD9-4026-BA39-FEBEF5B7D41B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EC120240-3BD9-4026-BA39-FEBEF5B7D41B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EC120240-3BD9-4026-BA39-FEBEF5B7D41B}.DotnetCore|Any CPU.ActiveCfg = DotnetCore|Any CPU
{EC120240-3BD9-4026-BA39-FEBEF5B7D41B}.Mono|Any CPU.ActiveCfg = Mono|Any CPU
{EC120240-3BD9-4026-BA39-FEBEF5B7D41B}.Mono|Any CPU.Build.0 = Mono|Any CPU
{EC120240-3BD9-4026-BA39-FEBEF5B7D41B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EC120240-3BD9-4026-BA39-FEBEF5B7D41B}.Release|Any CPU.Build.0 = Release|Any CPU
{36183ED7-462B-45DF-8FD5-6BD45084985B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{36183ED7-462B-45DF-8FD5-6BD45084985B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{36183ED7-462B-45DF-8FD5-6BD45084985B}.DotnetCore|Any CPU.ActiveCfg = DotnetCore|Any CPU
{36183ED7-462B-45DF-8FD5-6BD45084985B}.Mono|Any CPU.ActiveCfg = Mono|Any CPU
{36183ED7-462B-45DF-8FD5-6BD45084985B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{36183ED7-462B-45DF-8FD5-6BD45084985B}.Release|Any CPU.Build.0 = Release|Any CPU
{4EBA7C43-6726-4AFE-9EF2-3607CA038A62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4EBA7C43-6726-4AFE-9EF2-3607CA038A62}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4EBA7C43-6726-4AFE-9EF2-3607CA038A62}.DotnetCore|Any CPU.ActiveCfg = DotnetCore|Any CPU
{4EBA7C43-6726-4AFE-9EF2-3607CA038A62}.DotnetCore|Any CPU.Build.0 = DotnetCore|Any CPU
{4EBA7C43-6726-4AFE-9EF2-3607CA038A62}.Mono|Any CPU.ActiveCfg = Mono|Any CPU
{4EBA7C43-6726-4AFE-9EF2-3607CA038A62}.Mono|Any CPU.Build.0 = Mono|Any CPU
{4EBA7C43-6726-4AFE-9EF2-3607CA038A62}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4EBA7C43-6726-4AFE-9EF2-3607CA038A62}.Release|Any CPU.Build.0 = Release|Any CPU
{12A8066D-B779-425C-A2D2-491693EC6B42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{12A8066D-B779-425C-A2D2-491693EC6B42}.Debug|Any CPU.Build.0 = Debug|Any CPU
{12A8066D-B779-425C-A2D2-491693EC6B42}.DotnetCore|Any CPU.ActiveCfg = DotnetCore|Any CPU
{12A8066D-B779-425C-A2D2-491693EC6B42}.Mono|Any CPU.ActiveCfg = Mono|Any CPU
{12A8066D-B779-425C-A2D2-491693EC6B42}.Mono|Any CPU.Build.0 = Mono|Any CPU
{12A8066D-B779-425C-A2D2-491693EC6B42}.Release|Any CPU.ActiveCfg = Release|Any CPU
{12A8066D-B779-425C-A2D2-491693EC6B42}.Release|Any CPU.Build.0 = Release|Any CPU
{9562FADF-F2E9-4998-BEF7-B252C55F7A38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9562FADF-F2E9-4998-BEF7-B252C55F7A38}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9562FADF-F2E9-4998-BEF7-B252C55F7A38}.DotnetCore|Any CPU.ActiveCfg = DotnetCore|Any CPU
{9562FADF-F2E9-4998-BEF7-B252C55F7A38}.DotnetCore|Any CPU.Build.0 = DotnetCore|Any CPU
{9562FADF-F2E9-4998-BEF7-B252C55F7A38}.Mono|Any CPU.ActiveCfg = Mono|Any CPU
{9562FADF-F2E9-4998-BEF7-B252C55F7A38}.Mono|Any CPU.Build.0 = Mono|Any CPU
{9562FADF-F2E9-4998-BEF7-B252C55F7A38}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9562FADF-F2E9-4998-BEF7-B252C55F7A38}.Release|Any CPU.Build.0 = Release|Any CPU
{DBD17E56-E3A2-4A19-AEAB-0E758FEBCD84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DBD17E56-E3A2-4A19-AEAB-0E758FEBCD84}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DBD17E56-E3A2-4A19-AEAB-0E758FEBCD84}.DotnetCore|Any CPU.ActiveCfg = Debug|Any CPU
{DBD17E56-E3A2-4A19-AEAB-0E758FEBCD84}.Mono|Any CPU.ActiveCfg = Mono|Any CPU
{DBD17E56-E3A2-4A19-AEAB-0E758FEBCD84}.Mono|Any CPU.Build.0 = Mono|Any CPU
{DBD17E56-E3A2-4A19-AEAB-0E758FEBCD84}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DBD17E56-E3A2-4A19-AEAB-0E758FEBCD84}.Release|Any CPU.Build.0 = Release|Any CPU
{1EB6FB44-6B1E-4939-BF49-267D163959FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1EB6FB44-6B1E-4939-BF49-267D163959FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1EB6FB44-6B1E-4939-BF49-267D163959FF}.DotnetCore|Any CPU.ActiveCfg = DotnetCore|Any CPU
{1EB6FB44-6B1E-4939-BF49-267D163959FF}.Mono|Any CPU.ActiveCfg = Mono|Any CPU
{1EB6FB44-6B1E-4939-BF49-267D163959FF}.Mono|Any CPU.Build.0 = Mono|Any CPU
{1EB6FB44-6B1E-4939-BF49-267D163959FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1EB6FB44-6B1E-4939-BF49-267D163959FF}.Release|Any CPU.Build.0 = Release|Any CPU
{B46C2CB5-8EC2-425B-9B15-D0BAEF30C08F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B46C2CB5-8EC2-425B-9B15-D0BAEF30C08F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B46C2CB5-8EC2-425B-9B15-D0BAEF30C08F}.DotnetCore|Any CPU.ActiveCfg = DotnetCore|Any CPU
{B46C2CB5-8EC2-425B-9B15-D0BAEF30C08F}.DotnetCore|Any CPU.Build.0 = DotnetCore|Any CPU
{B46C2CB5-8EC2-425B-9B15-D0BAEF30C08F}.Mono|Any CPU.ActiveCfg = Mono|Any CPU
{B46C2CB5-8EC2-425B-9B15-D0BAEF30C08F}.Mono|Any CPU.Build.0 = Mono|Any CPU
{B46C2CB5-8EC2-425B-9B15-D0BAEF30C08F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B46C2CB5-8EC2-425B-9B15-D0BAEF30C08F}.Release|Any CPU.Build.0 = Release|Any CPU
{6055D81F-D817-44B3-B82B-F35E9ACB4802}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6055D81F-D817-44B3-B82B-F35E9ACB4802}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6055D81F-D817-44B3-B82B-F35E9ACB4802}.DotnetCore|Any CPU.ActiveCfg = DotnetCore|Any CPU
{6055D81F-D817-44B3-B82B-F35E9ACB4802}.DotnetCore|Any CPU.Build.0 = DotnetCore|Any CPU
{6055D81F-D817-44B3-B82B-F35E9ACB4802}.Mono|Any CPU.ActiveCfg = Mono|Any CPU
{6055D81F-D817-44B3-B82B-F35E9ACB4802}.Mono|Any CPU.Build.0 = Mono|Any CPU
{6055D81F-D817-44B3-B82B-F35E9ACB4802}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ BioFSharp is an open source bioinformatics and computational biology toolbox wri
![GitHub contributors](https://img.shields.io/github/contributors/CSBiology/BioFSharp)


|Branch|Ubuntu(trusty)|Windows|
|Branch|Linux Mono (Xenial)|Linux .Net Core only (Bionic Beaver)|Windows|
|---|---|---|
| master | [![Build Status](https://travis-ci.com/CSBiology/BioFSharp.svg?branch=master)](https://travis-ci.com/CSBiology/BioFSharp) | [![Build status](https://ci.appveyor.com/api/projects/status/9a5r4aklmmbykobk/branch/master?svg=true)](https://ci.appveyor.com/project/kMutagene/biofsharp/branch/master) |
| developer | [![Build Status](https://travis-ci.com/CSBiology/BioFSharp.svg?branch=developer)](https://travis-ci.com/CSBiology/BioFSharp) | [![Build status](https://ci.appveyor.com/api/projects/status/9a5r4aklmmbykobk/branch/developer?svg=true)](https://ci.appveyor.com/project/kMutagene/biofsharp/branch/developer) |
| master | [![Build Status](https://travis-ci.com/CSBiology/BioFSharp.svg?branch=master)](https://travis-ci.com/CSBiology/BioFSharp) | [![Build status](https://ci.appveyor.com/api/projects/status/9a5r4aklmmbykobk/branch/master?svg=true)](https://ci.appveyor.com/project/kMutagene/biofsharp/branch/master) | [![Build status](https://ci.appveyor.com/api/projects/status/9a5r4aklmmbykobk/branch/master?svg=true)](https://ci.appveyor.com/project/kMutagene/biofsharp/branch/master) |
| developer | [![Build Status](https://travis-ci.com/CSBiology/BioFSharp.svg?branch=developer)](https://travis-ci.com/CSBiology/BioFSharp) | [![Build status](https://ci.appveyor.com/api/projects/status/9a5r4aklmmbykobk/branch/developer?svg=true)](https://ci.appveyor.com/project/kMutagene/biofsharp/branch/developer) |[![Build status](https://ci.appveyor.com/api/projects/status/9a5r4aklmmbykobk/branch/developer?svg=true)](https://ci.appveyor.com/project/kMutagene/biofsharp/branch/developer) |



Expand Down
10 changes: 10 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
#### 1.0.02 - Wednesday, February 19, 2020
* **BioFSharp.BioDB:**
* Fix FaTool OData model URL
* **BioFSharp.Vis**
* Add Function to save chord plots as html files

#### 1.0.01 - Thursday, October 24, 2019
* **BioFSharp.Stats:**
* Major speed improvements for Sailent

#### 1.0.0 - Wednesday, October 23, 2019
Renaming of BioFSharp.Biotools makes this a major version increase, as it is not backwards compatible. Several bugfixes and additions to multiple sub projects:

Expand Down
27 changes: 22 additions & 5 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,29 @@
image: Visual Studio 2019
image:
- Ubuntu
- Visual Studio 2019

init:
- git config --global core.autocrlf input
- dotnet tool install fake-cli -g
- dotnet tool install paket -g

build_script:
- cmd: build.cmd All
matrix:
fast_finish: true

for:
-
matrix:
only:
- image: Visual Studio 2019

build_script:
- cmd: build.cmd
-
matrix:
only:
- image: Ubuntu

build_script:
- chmod +x ./build.sh
- sh: ./build.sh -t Dotnet

test: off
version: 0.0.1.{build}
Expand Down
8 changes: 3 additions & 5 deletions build.cmd
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
@echo off
cls

dotnet tool restore
dotnet paket restore
dotnet restore build.proj

IF NOT EXIST build.fsx (
fake run init.fsx
)
fake build %*
dotnet fake build %*
Loading

0 comments on commit 66cdf16

Please sign in to comment.