Skip to content

Commit e1823ef

Browse files
Merge pull request #179 from LCSB-BioCore/develop
Develop
2 parents bedf27c + 73a0729 commit e1823ef

File tree

8 files changed

+40
-9
lines changed

8 files changed

+40
-9
lines changed

.github/workflows/TagBot.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
name: TagBot
22
on:
3-
schedule:
4-
- cron: 0 * * * *
3+
issue_comment:
4+
types:
5+
- created
6+
workflow_dispatch:
57
jobs:
68
TagBot:
9+
if: github.event_name == 'workflow_dispatch' || github.actor == 'JuliaTagBot'
710
runs-on: ubuntu-latest
811
steps:
912
- uses: JuliaRegistries/TagBot@v1
1013
with:
1114
token: ${{ secrets.GITHUB_TOKEN }}
15+
ssh: ${{ secrets.DOCUMENTER_KEY }}

.github/workflows/docker.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Publish Docker image
2+
on:
3+
release:
4+
types: [published]
5+
jobs:
6+
push_to_registry:
7+
name: Push Docker image to GitHub Packages
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Check out the repo
11+
uses: actions/checkout@v2
12+
- name: Login to Registry
13+
uses: docker/login-action@v1
14+
with:
15+
registry: docker.pkg.github.com
16+
username: cylon-x
17+
password: ${{ secrets.DOCKER_TOKEN }}
18+
- uses: docker/build-push-action@v2
19+
with:
20+
push: true
21+
tags: lcsb-biocore/gigasom:latest
22+

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- uses: actions/checkout@v2
1818
- uses: julia-actions/setup-julia@latest
1919
with:
20-
version: 1.3
20+
version: 1.4
2121
- name: Install dependencies
2222
run: julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
2323
- name: Build and deploy

Dockerfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
FROM julia
2+
3+
RUN julia -e 'import Pkg; Pkg.add("GigaSOM"); Pkg.resolve(); Pkg.status(); Pkg.instantiate(); Pkg.precompile()'
4+
5+
CMD ["julia"]

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "GigaSOM"
22
uuid = "a03a9c34-069e-5582-a11c-5c984cab887c"
3-
version = "0.6.3"
3+
version = "0.6.4"
44

55
[deps]
66
CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"

src/io/process.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ function getMetaData(meta::Dict{String,String})::DataFrame
6262
# create a data frame for the results
6363
df = Matrix{String}(undef, pars, length(channel_properties))
6464
df .= defaultValue
65-
df = DataFrame(df)
65+
df = DataFrame(df, :auto)
6666
rename!(df, Symbol.(channel_properties))
6767

6868
# collect the data from params

test/testBatch.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
codes = som.codes
2727
@test size(codes) == (100, 10)
2828

29-
dfCodes = DataFrame(codes)
29+
dfCodes = DataFrame(codes, :auto)
3030
rename!(dfCodes, Symbol.(antigens))
31-
dfEmbed = DataFrame(embed)
31+
dfEmbed = DataFrame(embed, :auto)
3232
CSV.write(genDataPath * "/batchDfCodes.csv", dfCodes)
3333
CSV.write(genDataPath * "/batchWinners.csv", winners)
3434
CSV.write(genDataPath * "/batchEmbedded.csv", dfEmbed)

test/testParallel.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
codes = som.codes
2424
@test size(codes) == (100, 10)
2525

26-
dfCodes = DataFrame(codes)
26+
dfCodes = DataFrame(codes, :auto)
2727
rename!(dfCodes, Symbol.(antigens))
28-
dfEmbed = DataFrame(embed)
28+
dfEmbed = DataFrame(embed, :auto)
2929
CSV.write(genDataPath * "/parallelDfCodes.csv", dfCodes)
3030
CSV.write(genDataPath * "/parallelWinners.csv", winners)
3131
CSV.write(genDataPath * "/parallelEmbedded.csv", dfEmbed)

0 commit comments

Comments
 (0)