CEA-COSMIC
diff --git a/‎.github/workflows/cd-build.yml‎
Lines changed: 1 addition & 3 deletions b/‎.github/workflows/cd-build.yml‎
Lines changed: 1 addition & 3 deletions
diff --git a/‎.github/workflows/ci-build.yml‎
Lines changed: 6 additions & 15 deletions b/‎.github/workflows/ci-build.yml‎
Lines changed: 6 additions & 15 deletions
diff --git a/‎.gitignore‎
Lines changed: 1 addition & 0 deletions b/‎.gitignore‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎README.md‎
Lines changed: 2 additions & 2 deletions b/‎README.md‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎develop.txt‎
Lines changed: 8 additions & 5 deletions b/‎develop.txt‎
Lines changed: 8 additions & 5 deletions
diff --git a/‎docs/requirements.txt‎
Lines changed: 1 addition & 0 deletions b/‎docs/requirements.txt‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎docs/source/conf.py‎
Lines changed: 13 additions & 0 deletions b/‎docs/source/conf.py‎
Lines changed: 13 additions & 0 deletions
diff --git a/‎docs/source/refs.bib‎
Lines changed: 12 additions & 0 deletions b/‎docs/source/refs.bib‎
Lines changed: 12 additions & 0 deletions
diff --git a/‎docs/source/toc.rst‎
Lines changed: 1 addition & 0 deletions b/‎docs/source/toc.rst‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎modopt/examples/README.rst‎
Lines changed: 5 additions & 0 deletions b/‎modopt/examples/README.rst‎
Lines changed: 5 additions & 0 deletions
@@ -62,9 +62,7 @@ jobs:
       - 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
+          python-version: "3.8"
 
       - name: Install dependencies
         shell: bash -l {0}
 
@@ -16,21 +16,12 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest]
-        python-version: [3.8]
+        python-version: ["3.10"]
 
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Report WPS Errors
-        uses: wemake-services/wemake-python-styleguide@0.14.1
-        continue-on-error: true
-        with:
-          reporter: 'github-pr-review'
-          path: './modopt'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Set up Conda with Python ${{ matrix.python-version }}
         uses: conda-incubator/setup-miniconda@v2
         with:
@@ -52,7 +43,7 @@ jobs:
           python -m pip install --upgrade pip
           python -m pip install -r develop.txt
           python -m pip install -r docs/requirements.txt
-          python -m pip install astropy scikit-image scikit-learn
+          python -m pip install astropy "scikit-image<0.20" scikit-learn matplotlib
           python -m pip install tensorflow>=2.4.1
           python -m pip install twine
           python -m pip install .
@@ -61,7 +52,7 @@ jobs:
         shell: bash -l {0}
         run: |
           export PATH=/usr/share/miniconda/bin:$PATH
-          python setup.py test
+          pytest -n 2
 
       - name: Save Test Results
         if: always()
@@ -98,7 +89,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest]
-        python-version: [3.6, 3.7, 3.9]
+        python-version: ["3.7", "3.8", "3.9"]
 
     steps:
       - name: Checkout
@@ -117,11 +108,11 @@ jobs:
           python --version
           python -m pip install --upgrade pip
           python -m pip install -r develop.txt
-          python -m pip install astropy scikit-image scikit-learn
+          python -m pip install astropy "scikit-image<0.20" scikit-learn matplotlib
           python -m pip install .
 
       - name: Run Tests
         shell: bash -l {0}
         run: |
           export PATH=/usr/share/miniconda/bin:$PATH
-          python setup.py test
+          pytest -n 2
@@ -73,6 +73,7 @@ instance/
 docs/_build/
 docs/source/fortuna.*
 docs/source/scripts.*
+docs/source/auto_examples/
 docs/source/*.nblink
 
 # PyBuilder
 
@@ -37,11 +37,11 @@ All packages required by ModOpt should be installed automatically. Optional pack
 In order to run the code in this repository the following packages must be
 installed:
 
-* [Python](https://www.python.org/) [> 3.6]
+* [Python](https://www.python.org/) [> 3.7]
 * [importlib_metadata](https://importlib-metadata.readthedocs.io/en/latest/) [==3.7.0]
 * [Numpy](http://www.numpy.org/) [==1.19.5]
 * [Scipy](http://www.scipy.org/) [==1.5.4]
-* [Progressbar 2](https://progressbar-2.readthedocs.io/) [==3.53.1]
+* [tqdm](https://tqdm.github.io/) [>=4.64.0]
 
 ### Optional Packages
 
 
@@ -1,9 +1,12 @@
 coverage>=5.5
-flake8>=4
-nose>=1.3.7
 pytest>=6.2.2
+pytest-raises>=0.10
+pytest-cases>= 3.6
+pytest-xdist>= 3.0.1
 pytest-cov>=2.11.1
-pytest-pep8>=1.0.6
 pytest-emoji>=0.2.0
-pytest-flake8>=1.0.7
-wemake-python-styleguide>=0.15.2
+pydocstyle==6.1.1
+pytest-pydocstyle>=2.2.0
+black
+isort
+pytest-black
@@ -6,3 +6,4 @@ numpydoc==1.1.0
 sphinx==4.3.1
 sphinxcontrib-bibtex==2.4.1
 sphinxawesome-theme==3.2.1
+sphinx-gallery==0.11.1
@@ -45,6 +45,7 @@
     'nbsphinx',
     'nbsphinx_link',
     'numpydoc',
+    "sphinx_gallery.gen_gallery"
 ]
 
 # Include module names for objects
@@ -145,6 +146,18 @@
 # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
 html_show_copyright = True
 
+
+
+# -- Options for Sphinx Gallery ----------------------------------------------
+
+sphinx_gallery_conf = {
+    "examples_dirs": ["../../modopt/examples/"],
+    "filename_pattern": "/example_",
+    "ignore_pattern": r"/(__init__|conftest)\.py",
+}
+
+
+
 # -- Options for nbshpinx output ------------------------------------------
 
 
 
@@ -207,3 +207,15 @@ @article{zou2005
   journal = {Journal of the Royal Statistical Society Series B},
   doi = {10.1111/j.1467-9868.2005.00527.x}
 }
+
+@article{Goldstein2014,
+ author={Goldstein, Tom and O’Donoghue, Brendan and Setzer, Simon and Baraniuk, Richard},
+ year={2014},
+ month={Jan},
+ pages={1588–1623},
+ title={Fast Alternating Direction Optimization Methods},
+ journal={SIAM Journal on Imaging Sciences},
+ volume={7},
+ ISSN={1936-4954},
+ doi={10/gdwr49},
+}
@@ -25,6 +25,7 @@
 
   plugin_example
   notebooks
+  auto_examples/index
 
 .. toctree::
   :hidden:
 
@@ -0,0 +1,5 @@
+========
+Examples
+========
+
+This is a collection of Python scripts demonstrating the use of ModOpt.