From 0da23bd81388286372d724a8a73aaf4d6ed41fad Mon Sep 17 00:00:00 2001 From: GILIYAR RADHAKRISHNA Chaithya Date: Thu, 11 Jan 2024 10:08:38 +0100 Subject: [PATCH] Minor fixes for binder --- apt.txt | 3 +++ docs/binder/environment.yml | 2 ++ docs/source/conf.py | 2 +- environment.yml | 34 +++++++++++++--------------------- 4 files changed, 19 insertions(+), 22 deletions(-) create mode 100644 apt.txt diff --git a/apt.txt b/apt.txt new file mode 100644 index 00000000..11cf6cac --- /dev/null +++ b/apt.txt @@ -0,0 +1,3 @@ +cmake +libnfft3-dev +libgl1-mesa-glx diff --git a/docs/binder/environment.yml b/docs/binder/environment.yml index 7e558d8a..221370a3 100644 --- a/docs/binder/environment.yml +++ b/docs/binder/environment.yml @@ -14,4 +14,6 @@ dependencies: - python-pysap@git+https://github.com/cea-cosmic/pysap - modopt@git+https://github.com/cea-cosmic/modopt - pysap-mri@git+https://github.com/cea-cosmic/pysap-mri + - finufft + - mri-nufft diff --git a/docs/source/conf.py b/docs/source/conf.py index 38f5eff1..5dcdf29d 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -95,7 +95,7 @@ 'repo': 'pysap', 'branch': 'gh-pages', # Can be any branch, tag, or commit hash. Use a branch that hosts your docs. 'binderhub_url': 'https://mybinder.org', # Any URL of a binderhub deployment. Must be full URL (e.g. https://mybinder.org). - 'dependencies': ['../binder/apt.txt', '../binder/requirements.txt', '../binder/environment.yml'], + 'dependencies': ['../binder/apt.txt', '../binder/environment.yml'], # Optional keys 'notebooks_dir': 'notebooks', # Jupyter notebooks for Binder will be copied to this directory (relative to built documentation root). 'use_jupyter_lab': True, # Whether Binder links should start Jupyter Lab instead of the Jupyter Notebook interface. diff --git a/environment.yml b/environment.yml index dde3a6fb..221370a3 100644 --- a/environment.yml +++ b/environment.yml @@ -1,27 +1,19 @@ -name: pysap +name: pysap-tutorials channels: - conda-forge - - astra-toolbox dependencies: - python=3.10 - - astra-toolbox>=2.0.0 - - cmake>=3.12.0 + - pip>=19.1.1 + - astropy>=3.2.1 - jupyter>=1.0.0 - - matplotlib>=3.3.4 - - pynfft>=1.3.2 - - pynufft>=2021.2.1 - - pip + - matplotlib>=3.1.1 + - numpy>=1.16.4 + - pyqtgraph>=0.10.0 - pip: - - astropy>=4.1 - - joblib>=1.0.1 - - modopt>=1.5.1 - - nibabel>=3.2.1 - - numpy>=1.19.5 - - progressbar2>=3.53.1 - - PyWavelets>=1.1.1 - - scikit-image>=0.17.2 - - scikit-learn>=0.24.1 - - scipy>=1.5.4 - - sf_tools>=2.0.4 - - termcolor>=1.1.0 - - git+https://github.com/AGrigis/pysphinxdoc.git + - setuptools>=60.0.0 + - python-pysap@git+https://github.com/cea-cosmic/pysap + - modopt@git+https://github.com/cea-cosmic/modopt + - pysap-mri@git+https://github.com/cea-cosmic/pysap-mri + - finufft + - mri-nufft +