From 3e2594c40057e104f0166f2bfa0c65f5f949a946 Mon Sep 17 00:00:00 2001 From: Carlos Gomez Date: Sat, 30 Mar 2019 17:26:40 +0100 Subject: [PATCH 1/3] clearing cache --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bb43c3b0..6247d482 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ install: # command to run tests + coverage script: - - pytest --cov=vip_hci -v + - pytest --cov=vip_hci -v --cache-clear after_success: - codecov From f34a9d68928ed3a5773e023336a7c1c99b76c95d Mon Sep 17 00:00:00 2001 From: Carlos Gomez Date: Sat, 30 Mar 2019 17:46:12 +0100 Subject: [PATCH 2/3] updating astropy version in requirements --- requirements.txt | 2 +- tests/conftest.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 939020a6..d333e7e8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ numpy ~= 1.8 scipy ~= 1.1.0 -astropy ~= 2.0 +astropy ~= 3.0 photutils ~= 0.6 scikit-learn ~= 0.17 scikit-image ~= 0.11 diff --git a/tests/conftest.py b/tests/conftest.py index d43c6cac..bafe4143 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -25,7 +25,7 @@ def example_dataset(): """ print("downloading data...") - url_prefix = ("https://github.com/carlgogo/VIP_extras/raw/master/datasets") + url_prefix = "https://github.com/carlgogo/VIP_extras/raw/master/datasets" f1 = download_file("{}/naco_betapic_cube.fits".format(url_prefix), cache=True) @@ -68,7 +68,7 @@ def example_dataset_ifs(): """ print("downloading data...") - url_prefix = ("https://github.com/carlgogo/VIP_extras/raw/master/datasets") + url_prefix = "https://github.com/carlgogo/VIP_extras/raw/master/datasets" f1 = download_file("{}/sphere_v471tau_cube.fits".format(url_prefix), cache=True) @@ -81,7 +81,7 @@ def example_dataset_ifs(): # load fits cube = vip.fits.open_fits(f1) - angles = vip.fits.open_fits(f3).flatten() # shape (61,1) -> (61,) + angles = vip.fits.open_fits(f3).flatten() psf = vip.fits.open_fits(f2) wl = vip.fits.open_fits(f4) From ea2a3820caea59941ef30b1d94525485bf221072 Mon Sep 17 00:00:00 2001 From: Carlos Gomez Date: Sat, 30 Mar 2019 17:55:04 +0100 Subject: [PATCH 3/3] updating docs --- .travis.yml | 2 +- docs/source/vip_hci.andromeda.rst | 20 ++++++------ docs/source/vip_hci.conf.rst | 20 ++++++------ docs/source/vip_hci.exlib.rst | 8 ++--- docs/source/vip_hci.fits.rst | 8 ++--- docs/source/vip_hci.frdiff.rst | 8 ++--- docs/source/vip_hci.leastsq.rst | 8 ++--- docs/source/vip_hci.llsg.rst | 12 +++---- docs/source/vip_hci.medsub.rst | 8 ++--- docs/source/vip_hci.metrics.rst | 52 ++++++++++++++++++------------- docs/source/vip_hci.negfc.rst | 24 +++++++------- docs/source/vip_hci.nmf.rst | 8 ++--- docs/source/vip_hci.pca.rst | 28 ++++++++--------- docs/source/vip_hci.preproc.rst | 40 ++++++++++++------------ docs/source/vip_hci.rst | 12 +++---- docs/source/vip_hci.stats.rst | 20 ++++++------ docs/source/vip_hci.var.rst | 24 +++++--------- 17 files changed, 151 insertions(+), 151 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6247d482..bb43c3b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ install: # command to run tests + coverage script: - - pytest --cov=vip_hci -v --cache-clear + - pytest --cov=vip_hci -v after_success: - codecov diff --git a/docs/source/vip_hci.andromeda.rst b/docs/source/vip_hci.andromeda.rst index 19088d40..0e4af1c5 100644 --- a/docs/source/vip_hci.andromeda.rst +++ b/docs/source/vip_hci.andromeda.rst @@ -1,5 +1,5 @@ -vip\_hci\.andromeda package -=========================== +vip\_hci.andromeda package +========================== .. automodule:: vip_hci.andromeda :members: @@ -9,32 +9,32 @@ vip\_hci\.andromeda package Submodules ---------- -vip\_hci\.andromeda\.andromeda module -------------------------------------- +vip\_hci.andromeda.andromeda module +----------------------------------- .. automodule:: vip_hci.andromeda.andromeda :members: :undoc-members: :show-inheritance: -vip\_hci\.andromeda\.fit module -------------------------------- +vip\_hci.andromeda.fit module +----------------------------- .. automodule:: vip_hci.andromeda.fit :members: :undoc-members: :show-inheritance: -vip\_hci\.andromeda\.shift module ---------------------------------- +vip\_hci.andromeda.shift module +------------------------------- .. automodule:: vip_hci.andromeda.shift :members: :undoc-members: :show-inheritance: -vip\_hci\.andromeda\.utils module ---------------------------------- +vip\_hci.andromeda.utils module +------------------------------- .. automodule:: vip_hci.andromeda.utils :members: diff --git a/docs/source/vip_hci.conf.rst b/docs/source/vip_hci.conf.rst index 559de4be..5c86ae79 100644 --- a/docs/source/vip_hci.conf.rst +++ b/docs/source/vip_hci.conf.rst @@ -1,5 +1,5 @@ -vip\_hci\.conf package -====================== +vip\_hci.conf package +===================== .. automodule:: vip_hci.conf :members: @@ -9,32 +9,32 @@ vip\_hci\.conf package Submodules ---------- -vip\_hci\.conf\.mem module --------------------------- +vip\_hci.conf.mem module +------------------------ .. automodule:: vip_hci.conf.mem :members: :undoc-members: :show-inheritance: -vip\_hci\.conf\.param module ----------------------------- +vip\_hci.conf.param module +-------------------------- .. automodule:: vip_hci.conf.param :members: :undoc-members: :show-inheritance: -vip\_hci\.conf\.timing module ------------------------------ +vip\_hci.conf.timing module +--------------------------- .. automodule:: vip_hci.conf.timing :members: :undoc-members: :show-inheritance: -vip\_hci\.conf\.utils\_conf module ----------------------------------- +vip\_hci.conf.utils\_conf module +-------------------------------- .. automodule:: vip_hci.conf.utils_conf :members: diff --git a/docs/source/vip_hci.exlib.rst b/docs/source/vip_hci.exlib.rst index 2b30fc59..681d8173 100644 --- a/docs/source/vip_hci.exlib.rst +++ b/docs/source/vip_hci.exlib.rst @@ -1,5 +1,5 @@ -vip\_hci\.exlib package -======================= +vip\_hci.exlib package +====================== .. automodule:: vip_hci.exlib :members: @@ -9,8 +9,8 @@ vip\_hci\.exlib package Submodules ---------- -vip\_hci\.exlib\.iuwt module ----------------------------- +vip\_hci.exlib.iuwt module +-------------------------- .. automodule:: vip_hci.exlib.iuwt :members: diff --git a/docs/source/vip_hci.fits.rst b/docs/source/vip_hci.fits.rst index f67c5172..87ce21b7 100644 --- a/docs/source/vip_hci.fits.rst +++ b/docs/source/vip_hci.fits.rst @@ -1,5 +1,5 @@ -vip\_hci\.fits package -====================== +vip\_hci.fits package +===================== .. automodule:: vip_hci.fits :members: @@ -9,8 +9,8 @@ vip\_hci\.fits package Submodules ---------- -vip\_hci\.fits\.fits module ---------------------------- +vip\_hci.fits.fits module +------------------------- .. automodule:: vip_hci.fits.fits :members: diff --git a/docs/source/vip_hci.frdiff.rst b/docs/source/vip_hci.frdiff.rst index 78d90d7b..5b982b88 100644 --- a/docs/source/vip_hci.frdiff.rst +++ b/docs/source/vip_hci.frdiff.rst @@ -1,5 +1,5 @@ -vip\_hci\.frdiff package -======================== +vip\_hci.frdiff package +======================= .. automodule:: vip_hci.frdiff :members: @@ -9,8 +9,8 @@ vip\_hci\.frdiff package Submodules ---------- -vip\_hci\.frdiff\.framediff module ----------------------------------- +vip\_hci.frdiff.framediff module +-------------------------------- .. automodule:: vip_hci.frdiff.framediff :members: diff --git a/docs/source/vip_hci.leastsq.rst b/docs/source/vip_hci.leastsq.rst index 78c33f38..4e3619c2 100644 --- a/docs/source/vip_hci.leastsq.rst +++ b/docs/source/vip_hci.leastsq.rst @@ -1,5 +1,5 @@ -vip\_hci\.leastsq package -========================= +vip\_hci.leastsq package +======================== .. automodule:: vip_hci.leastsq :members: @@ -9,8 +9,8 @@ vip\_hci\.leastsq package Submodules ---------- -vip\_hci\.leastsq\.leastsq module ---------------------------------- +vip\_hci.leastsq.leastsq module +------------------------------- .. automodule:: vip_hci.leastsq.leastsq :members: diff --git a/docs/source/vip_hci.llsg.rst b/docs/source/vip_hci.llsg.rst index e9414b7b..2586593f 100644 --- a/docs/source/vip_hci.llsg.rst +++ b/docs/source/vip_hci.llsg.rst @@ -1,5 +1,5 @@ -vip\_hci\.llsg package -====================== +vip\_hci.llsg package +===================== .. automodule:: vip_hci.llsg :members: @@ -9,16 +9,16 @@ vip\_hci\.llsg package Submodules ---------- -vip\_hci\.llsg\.llsg module ---------------------------- +vip\_hci.llsg.llsg module +------------------------- .. automodule:: vip_hci.llsg.llsg :members: :undoc-members: :show-inheritance: -vip\_hci\.llsg\.thresholding module ------------------------------------ +vip\_hci.llsg.thresholding module +--------------------------------- .. automodule:: vip_hci.llsg.thresholding :members: diff --git a/docs/source/vip_hci.medsub.rst b/docs/source/vip_hci.medsub.rst index b07868f9..69561507 100644 --- a/docs/source/vip_hci.medsub.rst +++ b/docs/source/vip_hci.medsub.rst @@ -1,5 +1,5 @@ -vip\_hci\.medsub package -======================== +vip\_hci.medsub package +======================= .. automodule:: vip_hci.medsub :members: @@ -9,8 +9,8 @@ vip\_hci\.medsub package Submodules ---------- -vip\_hci\.medsub\.medsub\_source module ---------------------------------------- +vip\_hci.medsub.medsub\_source module +------------------------------------- .. automodule:: vip_hci.medsub.medsub_source :members: diff --git a/docs/source/vip_hci.metrics.rst b/docs/source/vip_hci.metrics.rst index 8e10c3b3..c619a8a7 100644 --- a/docs/source/vip_hci.metrics.rst +++ b/docs/source/vip_hci.metrics.rst @@ -1,5 +1,5 @@ -vip\_hci\.metrics package -========================= +vip\_hci.metrics package +======================== .. automodule:: vip_hci.metrics :members: @@ -9,84 +9,92 @@ vip\_hci\.metrics package Submodules ---------- -vip\_hci\.metrics\.contrcurve module ------------------------------------- +vip\_hci.metrics.contrcurve module +---------------------------------- .. automodule:: vip_hci.metrics.contrcurve :members: :undoc-members: :show-inheritance: -vip\_hci\.metrics\.detection module ------------------------------------ +vip\_hci.metrics.detection module +--------------------------------- .. automodule:: vip_hci.metrics.detection :members: :undoc-members: :show-inheritance: -vip\_hci\.metrics\.dust\_distribution module --------------------------------------------- +vip\_hci.metrics.dust\_distribution module +------------------------------------------ .. automodule:: vip_hci.metrics.dust_distribution :members: :undoc-members: :show-inheritance: -vip\_hci\.metrics\.fakecomp module ----------------------------------- +vip\_hci.metrics.fakecomp module +-------------------------------- .. automodule:: vip_hci.metrics.fakecomp :members: :undoc-members: :show-inheritance: -vip\_hci\.metrics\.fakedisk module ----------------------------------- +vip\_hci.metrics.fakedisk module +-------------------------------- .. automodule:: vip_hci.metrics.fakedisk :members: :undoc-members: :show-inheritance: -vip\_hci\.metrics\.frame\_analysis module ------------------------------------------ +vip\_hci.metrics.frame\_analysis module +--------------------------------------- .. automodule:: vip_hci.metrics.frame_analysis :members: :undoc-members: :show-inheritance: -vip\_hci\.metrics\.phase\_function module ------------------------------------------ +vip\_hci.metrics.phase\_function module +--------------------------------------- .. automodule:: vip_hci.metrics.phase_function :members: :undoc-members: :show-inheritance: -vip\_hci\.metrics\.roc module ------------------------------ +vip\_hci.metrics.roc module +--------------------------- .. automodule:: vip_hci.metrics.roc :members: :undoc-members: :show-inheritance: -vip\_hci\.metrics\.scattered\_light\_disk module ------------------------------------------------- +vip\_hci.metrics.scattered\_light\_disk module +---------------------------------------------- .. automodule:: vip_hci.metrics.scattered_light_disk :members: :undoc-members: :show-inheritance: -vip\_hci\.metrics\.snr module ------------------------------ +vip\_hci.metrics.snr module +--------------------------- .. automodule:: vip_hci.metrics.snr :members: :undoc-members: :show-inheritance: +vip\_hci.metrics.stim module +---------------------------- + +.. automodule:: vip_hci.metrics.stim + :members: + :undoc-members: + :show-inheritance: + diff --git a/docs/source/vip_hci.negfc.rst b/docs/source/vip_hci.negfc.rst index 5959a4b9..295963e5 100644 --- a/docs/source/vip_hci.negfc.rst +++ b/docs/source/vip_hci.negfc.rst @@ -1,5 +1,5 @@ -vip\_hci\.negfc package -======================= +vip\_hci.negfc package +====================== .. automodule:: vip_hci.negfc :members: @@ -9,40 +9,40 @@ vip\_hci\.negfc package Submodules ---------- -vip\_hci\.negfc\.mcmc\_sampling module --------------------------------------- +vip\_hci.negfc.mcmc\_sampling module +------------------------------------ .. automodule:: vip_hci.negfc.mcmc_sampling :members: :undoc-members: :show-inheritance: -vip\_hci\.negfc\.nested\_sampling module ----------------------------------------- +vip\_hci.negfc.nested\_sampling module +-------------------------------------- .. automodule:: vip_hci.negfc.nested_sampling :members: :undoc-members: :show-inheritance: -vip\_hci\.negfc\.simplex\_fmerit module ---------------------------------------- +vip\_hci.negfc.simplex\_fmerit module +------------------------------------- .. automodule:: vip_hci.negfc.simplex_fmerit :members: :undoc-members: :show-inheritance: -vip\_hci\.negfc\.simplex\_optim module --------------------------------------- +vip\_hci.negfc.simplex\_optim module +------------------------------------ .. automodule:: vip_hci.negfc.simplex_optim :members: :undoc-members: :show-inheritance: -vip\_hci\.negfc\.utils\_negfc module ------------------------------------- +vip\_hci.negfc.utils\_negfc module +---------------------------------- .. automodule:: vip_hci.negfc.utils_negfc :members: diff --git a/docs/source/vip_hci.nmf.rst b/docs/source/vip_hci.nmf.rst index b9d75139..0af3aa88 100644 --- a/docs/source/vip_hci.nmf.rst +++ b/docs/source/vip_hci.nmf.rst @@ -1,5 +1,5 @@ -vip\_hci\.nmf package -===================== +vip\_hci.nmf package +==================== .. automodule:: vip_hci.nmf :members: @@ -9,8 +9,8 @@ vip\_hci\.nmf package Submodules ---------- -vip\_hci\.nmf\.nmf\_fullfr module ---------------------------------- +vip\_hci.nmf.nmf\_fullfr module +------------------------------- .. automodule:: vip_hci.nmf.nmf_fullfr :members: diff --git a/docs/source/vip_hci.pca.rst b/docs/source/vip_hci.pca.rst index 11480312..ea16506b 100644 --- a/docs/source/vip_hci.pca.rst +++ b/docs/source/vip_hci.pca.rst @@ -1,5 +1,5 @@ -vip\_hci\.pca package -===================== +vip\_hci.pca package +==================== .. automodule:: vip_hci.pca :members: @@ -9,48 +9,48 @@ vip\_hci\.pca package Submodules ---------- -vip\_hci\.pca\.pca\_fullfr module ---------------------------------- +vip\_hci.pca.pca\_fullfr module +------------------------------- .. automodule:: vip_hci.pca.pca_fullfr :members: :undoc-members: :show-inheritance: -vip\_hci\.pca\.pca\_fullfr\_grid module ---------------------------------------- +vip\_hci.pca.pca\_fullfr\_grid module +------------------------------------- .. automodule:: vip_hci.pca.pca_fullfr_grid :members: :undoc-members: :show-inheritance: -vip\_hci\.pca\.pca\_fullfr\_increm module ------------------------------------------ +vip\_hci.pca.pca\_fullfr\_increm module +--------------------------------------- .. automodule:: vip_hci.pca.pca_fullfr_increm :members: :undoc-members: :show-inheritance: -vip\_hci\.pca\.pca\_local module --------------------------------- +vip\_hci.pca.pca\_local module +------------------------------ .. automodule:: vip_hci.pca.pca_local :members: :undoc-members: :show-inheritance: -vip\_hci\.pca\.svd module -------------------------- +vip\_hci.pca.svd module +----------------------- .. automodule:: vip_hci.pca.svd :members: :undoc-members: :show-inheritance: -vip\_hci\.pca\.utils\_pca module --------------------------------- +vip\_hci.pca.utils\_pca module +------------------------------ .. automodule:: vip_hci.pca.utils_pca :members: diff --git a/docs/source/vip_hci.preproc.rst b/docs/source/vip_hci.preproc.rst index 46f0180f..e57aca6f 100644 --- a/docs/source/vip_hci.preproc.rst +++ b/docs/source/vip_hci.preproc.rst @@ -1,5 +1,5 @@ -vip\_hci\.preproc package -========================= +vip\_hci.preproc package +======================== .. automodule:: vip_hci.preproc :members: @@ -9,72 +9,72 @@ vip\_hci\.preproc package Submodules ---------- -vip\_hci\.preproc\.badframes module ------------------------------------ +vip\_hci.preproc.badframes module +--------------------------------- .. automodule:: vip_hci.preproc.badframes :members: :undoc-members: :show-inheritance: -vip\_hci\.preproc\.badpixremoval module ---------------------------------------- +vip\_hci.preproc.badpixremoval module +------------------------------------- .. automodule:: vip_hci.preproc.badpixremoval :members: :undoc-members: :show-inheritance: -vip\_hci\.preproc\.cosmetics module ------------------------------------ +vip\_hci.preproc.cosmetics module +--------------------------------- .. automodule:: vip_hci.preproc.cosmetics :members: :undoc-members: :show-inheritance: -vip\_hci\.preproc\.derotation module ------------------------------------- +vip\_hci.preproc.derotation module +---------------------------------- .. automodule:: vip_hci.preproc.derotation :members: :undoc-members: :show-inheritance: -vip\_hci\.preproc\.parangles module ------------------------------------ +vip\_hci.preproc.parangles module +--------------------------------- .. automodule:: vip_hci.preproc.parangles :members: :undoc-members: :show-inheritance: -vip\_hci\.preproc\.recentering module -------------------------------------- +vip\_hci.preproc.recentering module +----------------------------------- .. automodule:: vip_hci.preproc.recentering :members: :undoc-members: :show-inheritance: -vip\_hci\.preproc\.rescaling module ------------------------------------ +vip\_hci.preproc.rescaling module +--------------------------------- .. automodule:: vip_hci.preproc.rescaling :members: :undoc-members: :show-inheritance: -vip\_hci\.preproc\.skysubtraction module ----------------------------------------- +vip\_hci.preproc.skysubtraction module +-------------------------------------- .. automodule:: vip_hci.preproc.skysubtraction :members: :undoc-members: :show-inheritance: -vip\_hci\.preproc\.subsampling module -------------------------------------- +vip\_hci.preproc.subsampling module +----------------------------------- .. automodule:: vip_hci.preproc.subsampling :members: diff --git a/docs/source/vip_hci.rst b/docs/source/vip_hci.rst index 38d384c1..1a8550af 100644 --- a/docs/source/vip_hci.rst +++ b/docs/source/vip_hci.rst @@ -30,24 +30,24 @@ Subpackages Submodules ---------- -vip\_hci\.hci\_dataset module ------------------------------ +vip\_hci.hci\_dataset module +---------------------------- .. automodule:: vip_hci.hci_dataset :members: :undoc-members: :show-inheritance: -vip\_hci\.hci\_postproc module ------------------------------- +vip\_hci.hci\_postproc module +----------------------------- .. automodule:: vip_hci.hci_postproc :members: :undoc-members: :show-inheritance: -vip\_hci\.vip\_ds9 module -------------------------- +vip\_hci.vip\_ds9 module +------------------------ .. automodule:: vip_hci.vip_ds9 :members: diff --git a/docs/source/vip_hci.stats.rst b/docs/source/vip_hci.stats.rst index e833a5cf..2e724c49 100644 --- a/docs/source/vip_hci.stats.rst +++ b/docs/source/vip_hci.stats.rst @@ -1,5 +1,5 @@ -vip\_hci\.stats package -======================= +vip\_hci.stats package +====================== .. automodule:: vip_hci.stats :members: @@ -9,32 +9,32 @@ vip\_hci\.stats package Submodules ---------- -vip\_hci\.stats\.clip\_sigma module ------------------------------------ +vip\_hci.stats.clip\_sigma module +--------------------------------- .. automodule:: vip_hci.stats.clip_sigma :members: :undoc-members: :show-inheritance: -vip\_hci\.stats\.distances module ---------------------------------- +vip\_hci.stats.distances module +------------------------------- .. automodule:: vip_hci.stats.distances :members: :undoc-members: :show-inheritance: -vip\_hci\.stats\.im\_stats module ---------------------------------- +vip\_hci.stats.im\_stats module +------------------------------- .. automodule:: vip_hci.stats.im_stats :members: :undoc-members: :show-inheritance: -vip\_hci\.stats\.utils\_stats module ------------------------------------- +vip\_hci.stats.utils\_stats module +---------------------------------- .. automodule:: vip_hci.stats.utils_stats :members: diff --git a/docs/source/vip_hci.var.rst b/docs/source/vip_hci.var.rst index 26a94a06..65ba21eb 100644 --- a/docs/source/vip_hci.var.rst +++ b/docs/source/vip_hci.var.rst @@ -1,5 +1,5 @@ -vip\_hci\.var package -===================== +vip\_hci.var package +==================== .. automodule:: vip_hci.var :members: @@ -9,32 +9,24 @@ vip\_hci\.var package Submodules ---------- -vip\_hci\.var\.filters module ------------------------------ +vip\_hci.var.filters module +--------------------------- .. automodule:: vip_hci.var.filters :members: :undoc-members: :show-inheritance: -vip\_hci\.var\.fit\_2d module ------------------------------ +vip\_hci.var.fit\_2d module +--------------------------- .. automodule:: vip_hci.var.fit_2d :members: :undoc-members: :show-inheritance: -vip\_hci\.var\.plotting module ------------------------------- - -.. automodule:: vip_hci.var.plotting - :members: - :undoc-members: - :show-inheritance: - -vip\_hci\.var\.shapes module ----------------------------- +vip\_hci.var.shapes module +-------------------------- .. automodule:: vip_hci.var.shapes :members: