From 0b80e4b6b07cb11d388a2734989887c0540e67c6 Mon Sep 17 00:00:00 2001 From: Will Holmgren Date: Sat, 15 Sep 2018 17:40:35 -0700 Subject: [PATCH 1/6] add license, docs, authors to manifest --- MANIFEST.in | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 0dc6e2cc13..88428c33f2 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,8 +1,23 @@ -#include *.txt +include AUTHORS.md +include LICENSE +include README.md + include versioneer.py include pvlib/_version.py + recursive-include pvlib/data * -include README.md + include pvlib/spa_c_files/*.h -#recursive-include docs *.txt +recursive-exclude * __pycache__ +recursive-exclude * *.py[co] + +recursive-include docs * +prune docs/tutorials +prune docs/sphinx/build +prune docs/sphinx/source/generated +# all doc figures created by doc build +prune docs/sphinx/source/savefig + +global-exclude .DS_Store +global-exclude .ipynb_checkpoints/* \ No newline at end of file From 5b679c4eec3fc4707a2ce96fbb4d50ab98a184d9 Mon Sep 17 00:00:00 2001 From: Will Holmgren Date: Sat, 15 Sep 2018 17:43:09 -0700 Subject: [PATCH 2/6] update whatsnew [skip ci] --- docs/sphinx/source/whatsnew/v0.6.0.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/sphinx/source/whatsnew/v0.6.0.rst b/docs/sphinx/source/whatsnew/v0.6.0.rst index 83af55a845..9fc11b6a41 100644 --- a/docs/sphinx/source/whatsnew/v0.6.0.rst +++ b/docs/sphinx/source/whatsnew/v0.6.0.rst @@ -156,6 +156,8 @@ Bug fixes * Fixed bug in tracking.singleaxis that mistakenly assigned nan values when the Sun was still above the horizon. No effect on systems with axis_tilt=0. (:issue:`569`) +* Source distribution did not contain LICENSE file. Added LICENSE, AUTHORS.md, + and some docs to MANIFEST. (:issue:`579`) Documentation From 37308f9221797cd83d5a9da15f6d96a6b5846328 Mon Sep 17 00:00:00 2001 From: Will Holmgren Date: Sun, 16 Sep 2018 10:30:26 -0700 Subject: [PATCH 3/6] remove prune tutorials, remove spa_c_files --- MANIFEST.in | 3 --- 1 file changed, 3 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 88428c33f2..3d17631c17 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -7,13 +7,10 @@ include pvlib/_version.py recursive-include pvlib/data * -include pvlib/spa_c_files/*.h - recursive-exclude * __pycache__ recursive-exclude * *.py[co] recursive-include docs * -prune docs/tutorials prune docs/sphinx/build prune docs/sphinx/source/generated # all doc figures created by doc build From 01e8c3e7daf6b2fef33c8537be447717ed2df2eb Mon Sep 17 00:00:00 2001 From: Will Holmgren Date: Sun, 16 Sep 2018 10:41:16 -0700 Subject: [PATCH 4/6] fix spa_c_files --- MANIFEST.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/MANIFEST.in b/MANIFEST.in index 3d17631c17..958cc844ed 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -7,6 +7,12 @@ include pvlib/_version.py recursive-include pvlib/data * +# include pvlib files needed to compile NREL SPA code, +# specifically exclude the code itself to comply with NREL license +recursive-include pvlib/spa_c_files *.py *.pyx *.pxd *.md +exclude pvlib/spa_c_files/spa.c +exclude pvlib/spa_c_files/spa.h + recursive-exclude * __pycache__ recursive-exclude * *.py[co] From 6fbdf669abd2aeafa4e3d9b14802909cf183d133 Mon Sep 17 00:00:00 2001 From: Will Holmgren Date: Sun, 16 Sep 2018 15:40:03 -0700 Subject: [PATCH 5/6] rework to use graft --- MANIFEST.in | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 958cc844ed..2571f8067e 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,26 +1,35 @@ +include MANIFEST.in include AUTHORS.md include LICENSE include README.md +include setup.py -include versioneer.py -include pvlib/_version.py - -recursive-include pvlib/data * +# include most everything under pvlib by default +# better to package too much than not enough +graft pvlib -# include pvlib files needed to compile NREL SPA code, -# specifically exclude the code itself to comply with NREL license -recursive-include pvlib/spa_c_files *.py *.pyx *.pxd *.md +# we included pvlib files needed to compile NREL SPA code in graft above, +# now we exclude the NREL code itself to comply with their license exclude pvlib/spa_c_files/spa.c exclude pvlib/spa_c_files/spa.h +prune pvlib/spa_c_files/build -recursive-exclude * __pycache__ -recursive-exclude * *.py[co] - -recursive-include docs * +graft docs prune docs/sphinx/build prune docs/sphinx/source/generated # all doc figures created by doc build prune docs/sphinx/source/savefig +global-exclude __pycache__ +global-exclude *.pyc +global-exclude *.pyo +global-exclude *.pyd +global-exclude *.so +global-exclude *~ global-exclude .DS_Store -global-exclude .ipynb_checkpoints/* \ No newline at end of file +global-exclude .git* +global-exclude \#* +global-exclude .ipynb_checkpoints + +include versioneer.py +include pvlib/_version.py \ No newline at end of file From d35a0fc6499f74aa099389e7c0c4ace7375e2812 Mon Sep 17 00:00:00 2001 From: Will Holmgren Date: Mon, 17 Sep 2018 10:23:39 -0700 Subject: [PATCH 6/6] more flexible spa exclude --- MANIFEST.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 2571f8067e..8cf60a428a 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -10,8 +10,8 @@ graft pvlib # we included pvlib files needed to compile NREL SPA code in graft above, # now we exclude the NREL code itself to comply with their license -exclude pvlib/spa_c_files/spa.c -exclude pvlib/spa_c_files/spa.h +global-exclude */spa.c +global-exclude */spa.h prune pvlib/spa_c_files/build graft docs