Skip to content

Remove libquadmath0 from builds#60

Merged
espenhgn merged 6 commits intomainfrom
fix-46
Oct 10, 2022
Merged

Remove libquadmath0 from builds#60
espenhgn merged 6 commits intomainfrom
fix-46

Conversation

@espenhgn
Copy link
Contributor

@espenhgn espenhgn commented Oct 3, 2022 •
edited
Loading

Fixes #46

Changes proposed in this pull request:

  • removes explicit install of libquadmath0 from container builds (but may be installed via other apt-install operations depending on platform)
  • adds a test of the KING installation in gwas.sif

Before submitting

@espenhgn espenhgn added the enhancement New feature or request label Oct 3, 2022
@espenhgn espenhgn marked this pull request as draft October 3, 2022 12:38
@espenhgn espenhgn marked this pull request as ready for review October 5, 2022 10:14
@espenhgn espenhgn mentioned this pull request Oct 5, 2022
Closed
ofrei
ofrei approved these changes Oct 10, 2022
View reviewed changes
Copy link
Contributor

@ofrei ofrei left a comment

Choose a reason for hiding this comment

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

Looks good!
What are the steps to run the tests? Is this covered somewhere in dev readme file? I think this should be added to Contributing.md, or as a new README.md file within tests folder.

@espenhgn
Copy link
Contributor Author

espenhgn commented Oct 10, 2022 •
edited
Loading

Looks good! What are the steps to run the tests? Is this covered somewhere in dev readme file? I think this should be added to Contributing.md, or as a new README.md file within tests folder.

I simply run the tests using the pytest framework (https://docs.pytest.org/en/7.1.x/), akin to py.test -v tests or py.test -v tests/test_gwas.py from the root folder. The verbose flag (-v) is optional. I can add this info via #67 which adds a bunch more checks.

@espenhgn espenhgn merged commit 58edf7c into main Oct 10, 2022
espenhgn added a commit that referenced this pull request Oct 10, 2022
@espenhgn
Squashed commit of the following:
5fad5c9 
commit d28f835
Author: Espen Hagen <2492641+espenhgn@users.noreply.github.com>
Date:   Mon Oct 10 14:34:21 2022 +0200

    Revise Minimac4/bgenix installation in `gwas.sif` (#64)

    * dev branch squashing fix-39 onto main

    * revised Minimac4 installer script

    * add test that Minimac4 is installed in gwas.sif

    * minor edit to bgenix install+test

    * usecases/bolt_out/example_3chr.frq,usecases/bolt_out/myld.l2.ldscore.gz: convert to Git LFS

    * updated CHANGELOG

commit 90df3d0
Author: Espen Hagen <2492641+espenhgn@users.noreply.github.com>
Date:   Mon Oct 10 14:31:40 2022 +0200

    Use Mambaforge for `python3.sif` builds  (#63)

    * dev branch squashing fix-39 onto main

    * download miniforge3

    * grap miniforge for appropriate platform

    * removed comments

    * install pyreadstat, xlrd, h5py from conda-forge

    * use mamba; mamba clean & pip cache purge

    * use Mambaforge

    * comment

    * usecases/bolt_out/example_3chr.frq,usecases/bolt_out/myld.l2.ldscore.gz: convert to Git LFS

    * src/scripts/install_miniconda3.sh -> src/scripts/install_mambaforge.sh

    * updated CHANGELOG.md

    * Minor updates to readme/changelog

commit 58edf7c
Author: Espen Hagen <2492641+espenhgn@users.noreply.github.com>
Date:   Mon Oct 10 13:53:32 2022 +0200

    Remove libquadmath0 from builds (#60)

    * dev branch squashing fix-39 onto main

    * remove libquadmath0 from containers

    * KING seems fine without libquadmath0

    * usecases/bolt_out/example_3chr.frq,usecases/bolt_out/myld.l2.ldscore.gz: convert to Git LFS

    * updated changelog
espenhgn added a commit that referenced this pull request Oct 10, 2022
@espenhgn
Squashed commit of the following:
3f2292b 
commit a833a1a
Merge: 5fad5c9 d28f835
Author: Espen Hagen <2492641+espenhgn@users.noreply.github.com>
Date:   Mon Oct 10 15:21:43 2022 +0200

    Merge branch 'main' into fix-43

commit 5fad5c9
Author: Espen Hagen <2492641+espenhgn@users.noreply.github.com>
Date:   Mon Oct 10 13:17:38 2022 +0000

    Squashed commit of the following:

    commit d28f835
    Author: Espen Hagen <2492641+espenhgn@users.noreply.github.com>
    Date:   Mon Oct 10 14:34:21 2022 +0200

        Revise Minimac4/bgenix installation in `gwas.sif` (#64)

        * dev branch squashing fix-39 onto main

        * revised Minimac4 installer script

        * add test that Minimac4 is installed in gwas.sif

        * minor edit to bgenix install+test

        * usecases/bolt_out/example_3chr.frq,usecases/bolt_out/myld.l2.ldscore.gz: convert to Git LFS

        * updated CHANGELOG

    commit 90df3d0
    Author: Espen Hagen <2492641+espenhgn@users.noreply.github.com>
    Date:   Mon Oct 10 14:31:40 2022 +0200

        Use Mambaforge for `python3.sif` builds  (#63)

        * dev branch squashing fix-39 onto main

        * download miniforge3

        * grap miniforge for appropriate platform

        * removed comments

        * install pyreadstat, xlrd, h5py from conda-forge

        * use mamba; mamba clean & pip cache purge

        * use Mambaforge

        * comment

        * usecases/bolt_out/example_3chr.frq,usecases/bolt_out/myld.l2.ldscore.gz: convert to Git LFS

        * src/scripts/install_miniconda3.sh -> src/scripts/install_mambaforge.sh

        * updated CHANGELOG.md

        * Minor updates to readme/changelog

    commit 58edf7c
    Author: Espen Hagen <2492641+espenhgn@users.noreply.github.com>
    Date:   Mon Oct 10 13:53:32 2022 +0200

        Remove libquadmath0 from builds (#60)

        * dev branch squashing fix-39 onto main

        * remove libquadmath0 from containers

        * KING seems fine without libquadmath0

        * usecases/bolt_out/example_3chr.frq,usecases/bolt_out/myld.l2.ldscore.gz: convert to Git LFS

        * updated changelog

commit d28f835
Author: Espen Hagen <2492641+espenhgn@users.noreply.github.com>
Date:   Mon Oct 10 14:34:21 2022 +0200

    Revise Minimac4/bgenix installation in `gwas.sif` (#64)

    * dev branch squashing fix-39 onto main

    * revised Minimac4 installer script

    * add test that Minimac4 is installed in gwas.sif

    * minor edit to bgenix install+test

    * usecases/bolt_out/example_3chr.frq,usecases/bolt_out/myld.l2.ldscore.gz: convert to Git LFS

    * updated CHANGELOG

commit 90df3d0
Author: Espen Hagen <2492641+espenhgn@users.noreply.github.com>
Date:   Mon Oct 10 14:31:40 2022 +0200

    Use Mambaforge for `python3.sif` builds  (#63)

    * dev branch squashing fix-39 onto main

    * download miniforge3

    * grap miniforge for appropriate platform

    * removed comments

    * install pyreadstat, xlrd, h5py from conda-forge

    * use mamba; mamba clean & pip cache purge

    * use Mambaforge

    * comment

    * usecases/bolt_out/example_3chr.frq,usecases/bolt_out/myld.l2.ldscore.gz: convert to Git LFS

    * src/scripts/install_miniconda3.sh -> src/scripts/install_mambaforge.sh

    * updated CHANGELOG.md

    * Minor updates to readme/changelog

commit 58edf7c
Author: Espen Hagen <2492641+espenhgn@users.noreply.github.com>
Date:   Mon Oct 10 13:53:32 2022 +0200

    Remove libquadmath0 from builds (#60)

    * dev branch squashing fix-39 onto main

    * remove libquadmath0 from containers

    * KING seems fine without libquadmath0

    * usecases/bolt_out/example_3chr.frq,usecases/bolt_out/myld.l2.ldscore.gz: convert to Git LFS

    * updated changelog

commit 8bfa258
Author: Espen Hagen <2492641+espenhgn@users.noreply.github.com>
Date:   Thu Oct 6 07:39:11 2022 +0000

    updated changelog

commit 6a23ec6
Author: Espen Hagen <2492641+espenhgn@users.noreply.github.com>
Date:   Wed Oct 5 20:06:39 2022 +0000

    ubuntu 20.04 as base image

commit f75ea77
Author: Espen Hagen <2492641+espenhgn@users.noreply.github.com>
Date:   Wed Oct 5 16:00:46 2022 +0000

    run apt-get clean after install

commit 74ae269
Author: Espen Hagen <2492641+espenhgn@users.noreply.github.com>
Date:   Wed Oct 5 12:45:26 2022 +0000

    add test that python is installed in python3.sif

commit 825ba3e
Author: Espen Hagen <2492641+espenhgn@users.noreply.github.com>
Date:   Wed Oct 5 12:25:24 2022 +0000

    rename test function

commit 4741840
Author: Espen Hagen <2492641+espenhgn@users.noreply.github.com>
Date:   Wed Oct 5 12:25:14 2022 +0000

    bump base image to ubuntu:22.04

commit 9856755
Author: Espen Hagen <2492641+espenhgn@users.noreply.github.com>
Date:   Wed Oct 5 12:09:01 2022 +0000

    fixed merge

commit ca2d649
Author: Espen Hagen <2492641+espenhgn@users.noreply.github.com>
Date:   Wed Oct 5 12:06:31 2022 +0000

    squashed fix-42

commit 8ad61b9
Author: Espen Hagen <2492641+espenhgn@users.noreply.github.com>
Date:   Wed Oct 5 12:05:01 2022 +0000

    squashed fix-46
espenhgn added a commit that referenced this pull request Oct 11, 2022
@espenhgn
Bump base image to Ubuntu:20.04 (#65)
411c220 
* squashed fix-46

* squashed fix-42

* fixed merge

* bump base image to ubuntu:22.04

* rename test function

* add test that python is installed in python3.sif

* run apt-get clean after install

* ubuntu 20.04 as base image

* updated changelog

* Squashed commit of the following:

commit d28f835
Author: Espen Hagen <2492641+espenhgn@users.noreply.github.com>
Date:   Mon Oct 10 14:34:21 2022 +0200

    Revise Minimac4/bgenix installation in `gwas.sif` (#64)

    * dev branch squashing fix-39 onto main

    * revised Minimac4 installer script

    * add test that Minimac4 is installed in gwas.sif

    * minor edit to bgenix install+test

    * usecases/bolt_out/example_3chr.frq,usecases/bolt_out/myld.l2.ldscore.gz: convert to Git LFS

    * updated CHANGELOG

commit 90df3d0
Author: Espen Hagen <2492641+espenhgn@users.noreply.github.com>
Date:   Mon Oct 10 14:31:40 2022 +0200

    Use Mambaforge for `python3.sif` builds  (#63)

    * dev branch squashing fix-39 onto main

    * download miniforge3

    * grap miniforge for appropriate platform

    * removed comments

    * install pyreadstat, xlrd, h5py from conda-forge

    * use mamba; mamba clean & pip cache purge

    * use Mambaforge

    * comment

    * usecases/bolt_out/example_3chr.frq,usecases/bolt_out/myld.l2.ldscore.gz: convert to Git LFS

    * src/scripts/install_miniconda3.sh -> src/scripts/install_mambaforge.sh

    * updated CHANGELOG.md

    * Minor updates to readme/changelog

commit 58edf7c
Author: Espen Hagen <2492641+espenhgn@users.noreply.github.com>
Date:   Mon Oct 10 13:53:32 2022 +0200

    Remove libquadmath0 from builds (#60)

    * dev branch squashing fix-39 onto main

    * remove libquadmath0 from containers

    * KING seems fine without libquadmath0

    * usecases/bolt_out/example_3chr.frq,usecases/bolt_out/myld.l2.ldscore.gz: convert to Git LFS

    * updated changelog
@espenhgn espenhgn deleted the fix-46 branch October 13, 2022 11:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ofrei ofrei ofrei approved these changes

Assignees

No one assigned

Labels

enhancement New feature or request

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Dockerfile recipes: is libquadmath0 essential?

2 participants

@espenhgn @ofrei