diff --git a/docs/source/README.rst b/docs/README.rst similarity index 100% rename from docs/source/README.rst rename to docs/README.rst diff --git a/docs/source/code/snippet_bd.py b/docs/code/snippet_bd.py similarity index 100% rename from docs/source/code/snippet_bd.py rename to docs/code/snippet_bd.py diff --git a/docs/source/code/snippet_bmf.py b/docs/code/snippet_bmf.py similarity index 100% rename from docs/source/code/snippet_bmf.py rename to docs/code/snippet_bmf.py diff --git a/docs/source/code/snippet_icm.py b/docs/code/snippet_icm.py similarity index 100% rename from docs/source/code/snippet_icm.py rename to docs/code/snippet_icm.py diff --git a/docs/source/code/snippet_lfnmf.py b/docs/code/snippet_lfnmf.py similarity index 100% rename from docs/source/code/snippet_lfnmf.py rename to docs/code/snippet_lfnmf.py diff --git a/docs/source/code/snippet_lsnmf.py b/docs/code/snippet_lsnmf.py similarity index 100% rename from docs/source/code/snippet_lsnmf.py rename to docs/code/snippet_lsnmf.py diff --git a/docs/source/code/snippet_nmf_conn.py b/docs/code/snippet_nmf_conn.py similarity index 100% rename from docs/source/code/snippet_nmf_conn.py rename to docs/code/snippet_nmf_conn.py diff --git a/docs/source/code/snippet_nmf_div.py b/docs/code/snippet_nmf_div.py similarity index 100% rename from docs/source/code/snippet_nmf_div.py rename to docs/code/snippet_nmf_div.py diff --git a/docs/source/code/snippet_nmf_fro.py b/docs/code/snippet_nmf_fro.py similarity index 100% rename from docs/source/code/snippet_nmf_fro.py rename to docs/code/snippet_nmf_fro.py diff --git a/docs/source/code/snippet_nsnmf.py b/docs/code/snippet_nsnmf.py similarity index 100% rename from docs/source/code/snippet_nsnmf.py rename to docs/code/snippet_nsnmf.py diff --git a/docs/source/code/snippet_pmf.py b/docs/code/snippet_pmf.py similarity index 100% rename from docs/source/code/snippet_pmf.py rename to docs/code/snippet_pmf.py diff --git a/docs/source/code/snippet_pmfcc.py b/docs/code/snippet_pmfcc.py similarity index 100% rename from docs/source/code/snippet_pmfcc.py rename to docs/code/snippet_pmfcc.py diff --git a/docs/source/code/snippet_psmf.py b/docs/code/snippet_psmf.py similarity index 100% rename from docs/source/code/snippet_psmf.py rename to docs/code/snippet_psmf.py diff --git a/docs/source/code/snippet_snmf_l.py b/docs/code/snippet_snmf_l.py similarity index 100% rename from docs/source/code/snippet_snmf_l.py rename to docs/code/snippet_snmf_l.py diff --git a/docs/source/code/snippet_snmf_r.py b/docs/code/snippet_snmf_r.py similarity index 100% rename from docs/source/code/snippet_snmf_r.py rename to docs/code/snippet_snmf_r.py diff --git a/docs/source/code/snippet_snmnmf.py b/docs/code/snippet_snmnmf.py similarity index 100% rename from docs/source/code/snippet_snmnmf.py rename to docs/code/snippet_snmnmf.py diff --git a/docs/source/code/usage.py b/docs/code/usage.py similarity index 100% rename from docs/source/code/usage.py rename to docs/code/usage.py diff --git a/docs/source/code/usage1.py b/docs/code/usage1.py similarity index 100% rename from docs/source/code/usage1.py rename to docs/code/usage1.py diff --git a/docs/source/code/usage2.py b/docs/code/usage2.py similarity index 100% rename from docs/source/code/usage2.py rename to docs/code/usage2.py diff --git a/docs/source/code/usage3.py b/docs/code/usage3.py similarity index 100% rename from docs/source/code/usage3.py rename to docs/code/usage3.py diff --git a/docs/source/code/usage4.py b/docs/code/usage4.py similarity index 100% rename from docs/source/code/usage4.py rename to docs/code/usage4.py diff --git a/docs/source/code/usage5.py b/docs/code/usage5.py similarity index 100% rename from docs/source/code/usage5.py rename to docs/code/usage5.py diff --git a/docs/source/code/usage6.py b/docs/code/usage6.py similarity index 100% rename from docs/source/code/usage6.py rename to docs/code/usage6.py diff --git a/docs/source/code/usage7.py b/docs/code/usage7.py similarity index 100% rename from docs/source/code/usage7.py rename to docs/code/usage7.py diff --git a/docs/source/conf.py b/docs/conf.py similarity index 98% rename from docs/source/conf.py rename to docs/conf.py index b384ad8..da0d640 100644 --- a/docs/source/conf.py +++ b/docs/conf.py @@ -43,7 +43,7 @@ # General information about the project. project = 'Nimfa' -copyright = '2016, The Nimfa developers' +copyright = '2017, Marinka Zitnik' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -52,7 +52,7 @@ # The short X.Y version. version = '1.3' # The full version, including alpha/beta/rc tags. -release = '1.3.1' +release = '1.3.4' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -199,7 +199,7 @@ # (source start file, target name, title, author, documentclass [howto/manual]). latex_documents = [ ('index', 'nimfa-APythonLibraryforNonnegativeMatrixFactorization.tex', 'nimfa - A Python Library for Nonnegative Matrix Factorization', - 'The Nimfa developers', 'manual'), + 'Marinka Zitnik', 'manual'), ] # The name of an image file (relative to this directory) to place at the top of diff --git a/docs/source/content-factorization.rst b/docs/content-factorization.rst similarity index 100% rename from docs/source/content-factorization.rst rename to docs/content-factorization.rst diff --git a/docs/source/content-initialization.rst b/docs/content-initialization.rst similarity index 100% rename from docs/source/content-initialization.rst rename to docs/content-initialization.rst diff --git a/docs/source/content-quality-performance.rst b/docs/content-quality-performance.rst similarity index 100% rename from docs/source/content-quality-performance.rst rename to docs/content-quality-performance.rst diff --git a/docs/source/content-utils.rst b/docs/content-utils.rst similarity index 100% rename from docs/source/content-utils.rst rename to docs/content-utils.rst diff --git a/docs/source/images/all_aml_consensus2.png b/docs/images/all_aml_consensus2.png similarity index 100% rename from docs/source/images/all_aml_consensus2.png rename to docs/images/all_aml_consensus2.png diff --git a/docs/source/images/all_aml_consensus3.png b/docs/images/all_aml_consensus3.png similarity index 100% rename from docs/source/images/all_aml_consensus3.png rename to docs/images/all_aml_consensus3.png diff --git a/docs/source/images/base/google-logo.png b/docs/images/base/google-logo.png similarity index 100% rename from docs/source/images/base/google-logo.png rename to docs/images/base/google-logo.png diff --git a/docs/source/images/base/orange-logo.png b/docs/images/base/orange-logo.png similarity index 100% rename from docs/source/images/base/orange-logo.png rename to docs/images/base/orange-logo.png diff --git a/docs/source/images/cbcl_faces_10_iters_SNMF_L.png b/docs/images/cbcl_faces_10_iters_SNMF_L.png similarity index 100% rename from docs/source/images/cbcl_faces_10_iters_SNMF_L.png rename to docs/images/cbcl_faces_10_iters_SNMF_L.png diff --git a/docs/source/images/cbcl_faces_10_iters_SNMF_R.png b/docs/images/cbcl_faces_10_iters_SNMF_R.png similarity index 100% rename from docs/source/images/cbcl_faces_10_iters_SNMF_R.png rename to docs/images/cbcl_faces_10_iters_SNMF_R.png diff --git a/docs/source/images/cbcl_faces_50_iters_LSNMF.png b/docs/images/cbcl_faces_50_iters_LSNMF.png similarity index 100% rename from docs/source/images/cbcl_faces_50_iters_LSNMF.png rename to docs/images/cbcl_faces_50_iters_LSNMF.png diff --git a/docs/source/images/cbcl_faces_50_iters_NMF.png b/docs/images/cbcl_faces_50_iters_NMF.png similarity index 100% rename from docs/source/images/cbcl_faces_50_iters_NMF.png rename to docs/images/cbcl_faces_50_iters_NMF.png diff --git a/docs/source/images/documents_basisW1.png b/docs/images/documents_basisW1.png similarity index 100% rename from docs/source/images/documents_basisW1.png rename to docs/images/documents_basisW1.png diff --git a/docs/source/images/documents_basisW13.png b/docs/images/documents_basisW13.png similarity index 100% rename from docs/source/images/documents_basisW13.png rename to docs/images/documents_basisW13.png diff --git a/docs/source/images/documents_basisW15.png b/docs/images/documents_basisW15.png similarity index 100% rename from docs/source/images/documents_basisW15.png rename to docs/images/documents_basisW15.png diff --git a/docs/source/images/documents_basisW4.png b/docs/images/documents_basisW4.png similarity index 100% rename from docs/source/images/documents_basisW4.png rename to docs/images/documents_basisW4.png diff --git a/docs/source/images/documents_basisW5.png b/docs/images/documents_basisW5.png similarity index 100% rename from docs/source/images/documents_basisW5.png rename to docs/images/documents_basisW5.png diff --git a/docs/source/images/medulloblastoma_consensus2.png b/docs/images/medulloblastoma_consensus2.png similarity index 100% rename from docs/source/images/medulloblastoma_consensus2.png rename to docs/images/medulloblastoma_consensus2.png diff --git a/docs/source/images/medulloblastoma_consensus3.png b/docs/images/medulloblastoma_consensus3.png similarity index 100% rename from docs/source/images/medulloblastoma_consensus3.png rename to docs/images/medulloblastoma_consensus3.png diff --git a/docs/source/images/orl_faces_200_iters_small_LSNMF.png b/docs/images/orl_faces_200_iters_small_LSNMF.png similarity index 100% rename from docs/source/images/orl_faces_200_iters_small_LSNMF.png rename to docs/images/orl_faces_200_iters_small_LSNMF.png diff --git a/docs/source/images/orl_faces_200_iters_small_NMF.png b/docs/images/orl_faces_200_iters_small_NMF.png similarity index 100% rename from docs/source/images/orl_faces_200_iters_small_NMF.png rename to docs/images/orl_faces_200_iters_small_NMF.png diff --git a/docs/source/images/orl_faces_500_iters_large_LSNMF.png b/docs/images/orl_faces_500_iters_large_LSNMF.png similarity index 100% rename from docs/source/images/orl_faces_500_iters_large_LSNMF.png rename to docs/images/orl_faces_500_iters_large_LSNMF.png diff --git a/docs/source/images/orl_faces_5_iters_small_PSMF_prior5.png b/docs/images/orl_faces_5_iters_small_PSMF_prior5.png similarity index 100% rename from docs/source/images/orl_faces_5_iters_small_PSMF_prior5.png rename to docs/images/orl_faces_5_iters_small_PSMF_prior5.png diff --git a/docs/source/index.rst b/docs/index.rst similarity index 100% rename from docs/source/index.rst rename to docs/index.rst diff --git a/docs/source/nimfa.datasets.rst b/docs/nimfa.datasets.rst similarity index 100% rename from docs/source/nimfa.datasets.rst rename to docs/nimfa.datasets.rst diff --git a/docs/source/nimfa.examples.all_aml.rst b/docs/nimfa.examples.all_aml.rst similarity index 100% rename from docs/source/nimfa.examples.all_aml.rst rename to docs/nimfa.examples.all_aml.rst diff --git a/docs/source/nimfa.examples.cbcl_images.rst b/docs/nimfa.examples.cbcl_images.rst similarity index 100% rename from docs/source/nimfa.examples.cbcl_images.rst rename to docs/nimfa.examples.cbcl_images.rst diff --git a/docs/source/nimfa.examples.documents.rst b/docs/nimfa.examples.documents.rst similarity index 100% rename from docs/source/nimfa.examples.documents.rst rename to docs/nimfa.examples.documents.rst diff --git a/docs/source/nimfa.examples.gene_func_prediction.rst b/docs/nimfa.examples.gene_func_prediction.rst similarity index 100% rename from docs/source/nimfa.examples.gene_func_prediction.rst rename to docs/nimfa.examples.gene_func_prediction.rst diff --git a/docs/source/nimfa.examples.medulloblastoma.rst b/docs/nimfa.examples.medulloblastoma.rst similarity index 100% rename from docs/source/nimfa.examples.medulloblastoma.rst rename to docs/nimfa.examples.medulloblastoma.rst diff --git a/docs/source/nimfa.examples.orl_images.rst b/docs/nimfa.examples.orl_images.rst similarity index 100% rename from docs/source/nimfa.examples.orl_images.rst rename to docs/nimfa.examples.orl_images.rst diff --git a/docs/source/nimfa.examples.recommendations.rst b/docs/nimfa.examples.recommendations.rst similarity index 100% rename from docs/source/nimfa.examples.recommendations.rst rename to docs/nimfa.examples.recommendations.rst diff --git a/docs/source/nimfa.examples.rst b/docs/nimfa.examples.rst similarity index 100% rename from docs/source/nimfa.examples.rst rename to docs/nimfa.examples.rst diff --git a/docs/source/nimfa.examples.synthetic.rst b/docs/nimfa.examples.synthetic.rst similarity index 100% rename from docs/source/nimfa.examples.synthetic.rst rename to docs/nimfa.examples.synthetic.rst diff --git a/docs/source/nimfa.methods.factorization.bd.rst b/docs/nimfa.methods.factorization.bd.rst similarity index 100% rename from docs/source/nimfa.methods.factorization.bd.rst rename to docs/nimfa.methods.factorization.bd.rst diff --git a/docs/source/nimfa.methods.factorization.bmf.rst b/docs/nimfa.methods.factorization.bmf.rst similarity index 100% rename from docs/source/nimfa.methods.factorization.bmf.rst rename to docs/nimfa.methods.factorization.bmf.rst diff --git a/docs/source/nimfa.methods.factorization.icm.rst b/docs/nimfa.methods.factorization.icm.rst similarity index 100% rename from docs/source/nimfa.methods.factorization.icm.rst rename to docs/nimfa.methods.factorization.icm.rst diff --git a/docs/source/nimfa.methods.factorization.lfnmf.rst b/docs/nimfa.methods.factorization.lfnmf.rst similarity index 100% rename from docs/source/nimfa.methods.factorization.lfnmf.rst rename to docs/nimfa.methods.factorization.lfnmf.rst diff --git a/docs/source/nimfa.methods.factorization.lsnmf.rst b/docs/nimfa.methods.factorization.lsnmf.rst similarity index 100% rename from docs/source/nimfa.methods.factorization.lsnmf.rst rename to docs/nimfa.methods.factorization.lsnmf.rst diff --git a/docs/source/nimfa.methods.factorization.nmf.rst b/docs/nimfa.methods.factorization.nmf.rst similarity index 100% rename from docs/source/nimfa.methods.factorization.nmf.rst rename to docs/nimfa.methods.factorization.nmf.rst diff --git a/docs/source/nimfa.methods.factorization.nsnmf.rst b/docs/nimfa.methods.factorization.nsnmf.rst similarity index 100% rename from docs/source/nimfa.methods.factorization.nsnmf.rst rename to docs/nimfa.methods.factorization.nsnmf.rst diff --git a/docs/source/nimfa.methods.factorization.pmf.rst b/docs/nimfa.methods.factorization.pmf.rst similarity index 100% rename from docs/source/nimfa.methods.factorization.pmf.rst rename to docs/nimfa.methods.factorization.pmf.rst diff --git a/docs/source/nimfa.methods.factorization.pmfcc.rst b/docs/nimfa.methods.factorization.pmfcc.rst similarity index 100% rename from docs/source/nimfa.methods.factorization.pmfcc.rst rename to docs/nimfa.methods.factorization.pmfcc.rst diff --git a/docs/source/nimfa.methods.factorization.psmf.rst b/docs/nimfa.methods.factorization.psmf.rst similarity index 100% rename from docs/source/nimfa.methods.factorization.psmf.rst rename to docs/nimfa.methods.factorization.psmf.rst diff --git a/docs/source/nimfa.methods.factorization.rst b/docs/nimfa.methods.factorization.rst similarity index 100% rename from docs/source/nimfa.methods.factorization.rst rename to docs/nimfa.methods.factorization.rst diff --git a/docs/source/nimfa.methods.factorization.sepnmf.rst b/docs/nimfa.methods.factorization.sepnmf.rst similarity index 100% rename from docs/source/nimfa.methods.factorization.sepnmf.rst rename to docs/nimfa.methods.factorization.sepnmf.rst diff --git a/docs/source/nimfa.methods.factorization.snmf.rst b/docs/nimfa.methods.factorization.snmf.rst similarity index 100% rename from docs/source/nimfa.methods.factorization.snmf.rst rename to docs/nimfa.methods.factorization.snmf.rst diff --git a/docs/source/nimfa.methods.factorization.snmnmf.rst b/docs/nimfa.methods.factorization.snmnmf.rst similarity index 100% rename from docs/source/nimfa.methods.factorization.snmnmf.rst rename to docs/nimfa.methods.factorization.snmnmf.rst diff --git a/docs/source/nimfa.methods.rst b/docs/nimfa.methods.rst similarity index 100% rename from docs/source/nimfa.methods.rst rename to docs/nimfa.methods.rst diff --git a/docs/source/nimfa.methods.seeding.fixed.rst b/docs/nimfa.methods.seeding.fixed.rst similarity index 100% rename from docs/source/nimfa.methods.seeding.fixed.rst rename to docs/nimfa.methods.seeding.fixed.rst diff --git a/docs/source/nimfa.methods.seeding.nndsvd.rst b/docs/nimfa.methods.seeding.nndsvd.rst similarity index 100% rename from docs/source/nimfa.methods.seeding.nndsvd.rst rename to docs/nimfa.methods.seeding.nndsvd.rst diff --git a/docs/source/nimfa.methods.seeding.random.rst b/docs/nimfa.methods.seeding.random.rst similarity index 100% rename from docs/source/nimfa.methods.seeding.random.rst rename to docs/nimfa.methods.seeding.random.rst diff --git a/docs/source/nimfa.methods.seeding.random_c.rst b/docs/nimfa.methods.seeding.random_c.rst similarity index 100% rename from docs/source/nimfa.methods.seeding.random_c.rst rename to docs/nimfa.methods.seeding.random_c.rst diff --git a/docs/source/nimfa.methods.seeding.random_vcol.rst b/docs/nimfa.methods.seeding.random_vcol.rst similarity index 100% rename from docs/source/nimfa.methods.seeding.random_vcol.rst rename to docs/nimfa.methods.seeding.random_vcol.rst diff --git a/docs/source/nimfa.methods.seeding.rst b/docs/nimfa.methods.seeding.rst similarity index 100% rename from docs/source/nimfa.methods.seeding.rst rename to docs/nimfa.methods.seeding.rst diff --git a/docs/source/nimfa.models.mf_fit.rst b/docs/nimfa.models.mf_fit.rst similarity index 100% rename from docs/source/nimfa.models.mf_fit.rst rename to docs/nimfa.models.mf_fit.rst diff --git a/docs/source/nimfa.models.mf_track.rst b/docs/nimfa.models.mf_track.rst similarity index 100% rename from docs/source/nimfa.models.mf_track.rst rename to docs/nimfa.models.mf_track.rst diff --git a/docs/source/nimfa.models.nmf.rst b/docs/nimfa.models.nmf.rst similarity index 100% rename from docs/source/nimfa.models.nmf.rst rename to docs/nimfa.models.nmf.rst diff --git a/docs/source/nimfa.models.nmf_mm.rst b/docs/nimfa.models.nmf_mm.rst similarity index 100% rename from docs/source/nimfa.models.nmf_mm.rst rename to docs/nimfa.models.nmf_mm.rst diff --git a/docs/source/nimfa.models.nmf_ns.rst b/docs/nimfa.models.nmf_ns.rst similarity index 100% rename from docs/source/nimfa.models.nmf_ns.rst rename to docs/nimfa.models.nmf_ns.rst diff --git a/docs/source/nimfa.models.nmf_std.rst b/docs/nimfa.models.nmf_std.rst similarity index 100% rename from docs/source/nimfa.models.nmf_std.rst rename to docs/nimfa.models.nmf_std.rst diff --git a/docs/source/nimfa.models.rst b/docs/nimfa.models.rst similarity index 100% rename from docs/source/nimfa.models.rst rename to docs/nimfa.models.rst diff --git a/docs/source/nimfa.models.smf.rst b/docs/nimfa.models.smf.rst similarity index 100% rename from docs/source/nimfa.models.smf.rst rename to docs/nimfa.models.smf.rst diff --git a/docs/source/nimfa.utils.linalg.rst b/docs/nimfa.utils.linalg.rst similarity index 100% rename from docs/source/nimfa.utils.linalg.rst rename to docs/nimfa.utils.linalg.rst diff --git a/docs/source/nimfa.utils.rst b/docs/nimfa.utils.rst similarity index 100% rename from docs/source/nimfa.utils.rst rename to docs/nimfa.utils.rst diff --git a/docs/source/nimfa.utils.utils.rst b/docs/nimfa.utils.utils.rst similarity index 100% rename from docs/source/nimfa.utils.utils.rst rename to docs/nimfa.utils.utils.rst diff --git a/nimfa/__init__.py b/nimfa/__init__.py index 96c864d..ddc37d5 100644 --- a/nimfa/__init__.py +++ b/nimfa/__init__.py @@ -12,7 +12,7 @@ """ __license__ = 'BSD' -__version__ = '1.3.2' +__version__ = '1.3.4' __maintainer__ = 'Marinka Zitnik' __email__ = 'marinka@cs.stanford.edu' diff --git a/setup.cfg b/setup.cfg index 3c6e79c..24378bc 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,2 +1,5 @@ [bdist_wheel] universal=1 + +[metadata] +description-file = README.md diff --git a/setup.py b/setup.py index 1dd4479..6130fe3 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ KEYWORDS = ['matrix factorization', 'nonnegative matrix factorization', 'bioinformatics', 'data mining', 'machine learning'] LICENSE = 'BSD' -VERSION = '1.3.2' +VERSION = '1.3.4' ISRELEASED = True INSTALL_REQUIRES = (