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 modopt version in conda env #156

Merged
merged 15 commits into from
Apr 24, 2021
43 changes: 43 additions & 0 deletions .github/workflows/cd-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: CD

on:
push:
branches:
- master
- main

jobs:

coverage:
name: Deploy Coverage Results
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v2

- name: Set up Conda with Python 3.8
uses: conda-incubator/setup-miniconda@v2
with:
auto-update-conda: true
python-version: 3.8
auto-activate-base: false

- name: Install Package Dependencies
shell: bash -l {0}
run: |
python --version
python -m pip install --upgrade pip
python -m pip install nose nose-exclude coverage pycodestyle

- name: Run Tests
shell: bash -l {0}
run: |
python setup.py nosetests

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: coverage.xml
flags: unittests
6 changes: 3 additions & 3 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
run: |
python --version
python -m pip install --upgrade pip
python -m pip install nose nose-exclude coverage coveralls pycodestyle
python -m pip install nose nose-exclude coverage pycodestyle
python -m pip install twine

- name: Run Tests
Expand All @@ -62,7 +62,7 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: unit-test-results-${{ matrix.os }}-${{ matrix.python-version }}
path: pytest.xml
path: nosetests.xml

- name: Run Examples
continue-on-error: true
Expand Down Expand Up @@ -116,7 +116,7 @@ jobs:
run: |
python --version
python -m pip install --upgrade pip
python -m pip install nose nose-exclude coverage coveralls pycodestyle
python -m pip install nose nose-exclude coverage pycodestyle

- name: Run Tests
shell: bash -l {0}
Expand Down
5 changes: 4 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

|CI|_ |Codecov|_ |Python36|_ |Python37|_ |Python38|_ |Python39|_ |PyPi|_ |Doc|_
|CI|_ |Codecov|_ |Python36|_ |Python37|_ |Python38|_ |Python39|_ |PyPi|_ |Doc|_ |Docker|_

.. |CI| image:: https://github.com/CEA-COSMIC/pysap/workflows/CI/badge.svg
.. _CI: https://github.com/CEA-COSMIC/pysap/actions?query=workflow%3ACI
Expand All @@ -25,6 +25,9 @@
.. |Doc| image:: https://readthedocs.org/projects/python-pysap/badge/?version=latest
.. _Doc: https://python-pysap.readthedocs.io/en/latest/?badge=latest

.. |Docker| image:: https://img.shields.io/docker/cloud/build/ceacosmic/pysap
.. _Docker: https://hub.docker.com/r/ceacosmic/pysap

PySAP
======

Expand Down
3 changes: 2 additions & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies:
- pip:
- astropy==4.1
- joblib==1.0.1
- modopt==1.5.0
- modopt==1.5.1
- nibabel==3.2.1
- numpy==1.19.5
- progressbar2==3.53.1
Expand All @@ -21,3 +21,4 @@ dependencies:
- scipy==1.5.4
- sf_tools==2.0.4
- termcolor==1.1.0
- git+https://github.com/AGrigis/pysphinxdoc.git
2 changes: 2 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ verbosity=2
nologcapture=0
cover-package=pysap
with-coverage=1
cover-xml=1
with-xunit=1
ignore-files=test_examples.py

[build_sphinx]
Expand Down