Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix #159 #160

Merged
merged 5 commits into from
Jun 17, 2021
Merged

fix #159 #160

merged 5 commits into from
Jun 17, 2021

Conversation

paquiteau
Copy link
Contributor

add std flags for c++14 (default is c++17 for gcc >=11)

sfarrens and others added 4 commits April 23, 2021 21:11
* add initial CI setup to develop branch to trigger tests

* Release preparation (CEA-COSMIC#146)

* set fixed package versions

* fixed discrepancy

* test with v3.4.0 of matplotlib

* lowered packages versions for python 3.6 support

* fixed nibabel version

* test github actions

* test running examples

* exclude example tests from nosetests

* fixed script name

* install pysap before running examples

* PySAP installation updates (CEA-COSMIC#150)

* updated conda env

* updated environment

* updated conda env

* removed tensorflow from env

* added pynfft to env

* added Dockerfile

* removed test lines from Dockerfile

* Plug-in versions (CEA-COSMIC#149)

* set plug-in and modopt versions for next release

* updated pysap-mri version

* Added new examples (CEA-COSMIC#152)

Co-authored-by: chaithyagr <[email protected]>
Co-authored-by: Samuel Farrens <[email protected]>

* Release clean up (CEA-COSMIC#151)

* updated readme

* fixed typos

* updated docker instructions

* updated readthedocs to use conda env

* updated nosetests to provide XML outputs (CEA-COSMIC#153)

* updated nosetests to provide XML outputs

* added Docker badge

* Update README.rst

* Update README.rst

* Update ci-build.yml

* Update setup.cfg

* test adding pysphinxdoc

Co-authored-by: Chaithya G R <[email protected]>
Co-authored-by: chaithyagr <[email protected]>
* add initial CI setup to develop branch to trigger tests

* Release preparation (CEA-COSMIC#146)

* set fixed package versions

* fixed discrepancy

* test with v3.4.0 of matplotlib

* lowered packages versions for python 3.6 support

* fixed nibabel version

* test github actions

* test running examples

* exclude example tests from nosetests

* fixed script name

* install pysap before running examples

* PySAP installation updates (CEA-COSMIC#150)

* updated conda env

* updated environment

* updated conda env

* removed tensorflow from env

* added pynfft to env

* added Dockerfile

* removed test lines from Dockerfile

* Plug-in versions (CEA-COSMIC#149)

* set plug-in and modopt versions for next release

* updated pysap-mri version

* Added new examples (CEA-COSMIC#152)

Co-authored-by: chaithyagr <[email protected]>
Co-authored-by: Samuel Farrens <[email protected]>

* Release clean up (CEA-COSMIC#151)

* updated readme

* fixed typos

* updated docker instructions

* updated readthedocs to use conda env

* updated nosetests to provide XML outputs (CEA-COSMIC#153)

* updated nosetests to provide XML outputs

* added Docker badge

* Update README.rst

* Update README.rst

* Update ci-build.yml

* Update setup.cfg

* test adding pysphinxdoc

* added CD build

Co-authored-by: Chaithya G R <[email protected]>
Co-authored-by: chaithyagr <[email protected]>
* add initial CI setup to develop branch to trigger tests

* Release preparation (CEA-COSMIC#146)

* set fixed package versions

* fixed discrepancy

* test with v3.4.0 of matplotlib

* lowered packages versions for python 3.6 support

* fixed nibabel version

* test github actions

* test running examples

* exclude example tests from nosetests

* fixed script name

* install pysap before running examples

* PySAP installation updates (CEA-COSMIC#150)

* updated conda env

* updated environment

* updated conda env

* removed tensorflow from env

* added pynfft to env

* added Dockerfile

* removed test lines from Dockerfile

* Plug-in versions (CEA-COSMIC#149)

* set plug-in and modopt versions for next release

* updated pysap-mri version

* Added new examples (CEA-COSMIC#152)

Co-authored-by: chaithyagr <[email protected]>
Co-authored-by: Samuel Farrens <[email protected]>

* Release clean up (CEA-COSMIC#151)

* updated readme

* fixed typos

* updated docker instructions

* updated readthedocs to use conda env

* updated nosetests to provide XML outputs (CEA-COSMIC#153)

* updated nosetests to provide XML outputs

* added Docker badge

* Update README.rst

* Update README.rst

* Update ci-build.yml

* Update setup.cfg

* test adding pysphinxdoc

* added CD build

* Update environment.yml

Co-authored-by: Chaithya G R <[email protected]>
Co-authored-by: chaithyagr <[email protected]>
@sfarrens sfarrens changed the base branch from master to develop June 16, 2021 11:35
@sfarrens
Copy link
Contributor

Hi @paquiteau, thanks for the PR!

I have approved the CI run and the proposed change seems fine to me, so if everything passes I should be able to merge this.

@codecov-commenter
Copy link

codecov-commenter commented Jun 16, 2021

Codecov Report

Merging #160 (59d6086) into develop (cdee5d9) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff            @@
##           develop     #160   +/-   ##
========================================
  Coverage    61.88%   61.88%           
========================================
  Files           30       30           
  Lines         1658     1658           
========================================
  Hits          1026     1026           
  Misses         632      632           
Flag Coverage Δ
unittests 61.88% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.


Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update cdee5d9...59d6086. Read the comment docs.

@sfarrens sfarrens merged commit c2a8dd5 into CEA-COSMIC:develop Jun 17, 2021
@sfarrens sfarrens linked an issue Jun 24, 2021 that may be closed by this pull request
1 task
@sfarrens sfarrens mentioned this pull request Jan 17, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[INSTALLATION ERROR] default gcc 11 fail to compile sparse2d
3 participants