diff --git a/MANIFEST.in b/MANIFEST.in index 4c5055b..cb293b8 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,2 +1,7 @@ include *.h -recursive-include src *.h \ No newline at end of file +recursive-include src *.h +recursive-include pyreadstat *.h +include *.pyx +recursive-include pyreadstat *.pyx +include *.pxd +recursive-include pyreadstat *.pxd \ No newline at end of file diff --git a/change_log.md b/change_log.md index 3dc0827..bf064a3 100644 --- a/change_log.md +++ b/change_log.md @@ -1,4 +1,8 @@ -# 0.2.4 +# 0.2.5 (github, pypi and conda 09.05.2019) +* Same as 0.2.4, just fixed issues in source distribution so that conda build + succeeds. + +# 0.2.4 (github and pypi 08.05.2019) * encoding support for xpt files. * support for user defined missing character values in sav. * Updated Readstat Sources to Release 1.0 diff --git a/dist/pyreadstat-0.2.4.tar.gz b/dist/pyreadstat-0.2.4.tar.gz deleted file mode 100644 index 5817a5e..0000000 Binary files a/dist/pyreadstat-0.2.4.tar.gz and /dev/null differ diff --git a/dist/pyreadstat-0.2.4-cp27-cp27m-win_amd64.whl b/dist/pyreadstat-0.2.5-cp27-cp27m-win_amd64.whl similarity index 77% rename from dist/pyreadstat-0.2.4-cp27-cp27m-win_amd64.whl rename to dist/pyreadstat-0.2.5-cp27-cp27m-win_amd64.whl index a112edb..da1fed6 100644 Binary files a/dist/pyreadstat-0.2.4-cp27-cp27m-win_amd64.whl and b/dist/pyreadstat-0.2.5-cp27-cp27m-win_amd64.whl differ diff --git a/dist/pyreadstat-0.2.4-cp35-cp35m-win_amd64.whl b/dist/pyreadstat-0.2.5-cp35-cp35m-win_amd64.whl similarity index 81% rename from dist/pyreadstat-0.2.4-cp35-cp35m-win_amd64.whl rename to dist/pyreadstat-0.2.5-cp35-cp35m-win_amd64.whl index 4ac4264..1fa8c25 100644 Binary files a/dist/pyreadstat-0.2.4-cp35-cp35m-win_amd64.whl and b/dist/pyreadstat-0.2.5-cp35-cp35m-win_amd64.whl differ diff --git a/dist/pyreadstat-0.2.4-cp36-cp36m-win_amd64.whl b/dist/pyreadstat-0.2.5-cp36-cp36m-win_amd64.whl similarity index 77% rename from dist/pyreadstat-0.2.4-cp36-cp36m-win_amd64.whl rename to dist/pyreadstat-0.2.5-cp36-cp36m-win_amd64.whl index 99436c4..8e61e8e 100644 Binary files a/dist/pyreadstat-0.2.4-cp36-cp36m-win_amd64.whl and b/dist/pyreadstat-0.2.5-cp36-cp36m-win_amd64.whl differ diff --git a/dist/pyreadstat-0.2.4-cp37-cp37m-win_amd64.whl b/dist/pyreadstat-0.2.5-cp37-cp37m-win_amd64.whl similarity index 77% rename from dist/pyreadstat-0.2.4-cp37-cp37m-win_amd64.whl rename to dist/pyreadstat-0.2.5-cp37-cp37m-win_amd64.whl index c7e712d..f5be57d 100644 Binary files a/dist/pyreadstat-0.2.4-cp37-cp37m-win_amd64.whl and b/dist/pyreadstat-0.2.5-cp37-cp37m-win_amd64.whl differ diff --git a/dist/pyreadstat-0.2.5.tar.gz b/dist/pyreadstat-0.2.5.tar.gz new file mode 100644 index 0000000..b1e9be8 Binary files /dev/null and b/dist/pyreadstat-0.2.5.tar.gz differ diff --git a/scripts/compiling_recipes.txt b/scripts/compiling_recipes.txt index 8e5f173..027a5cf 100644 --- a/scripts/compiling_recipes.txt +++ b/scripts/compiling_recipes.txt @@ -12,6 +12,8 @@ python3 setup.py build_ext --inplace # compile in place rebuilding c sources python3 setup.py build_ext --inplace --use-cython +* Note: if cython is installed it will be used anyway. The resulting .c files will be different depending if built on +windows or linux. That means to generate wheels for windows, make sure that pyx are cythonized on windows. # build documentation: go to docs folder and: diff --git a/scripts/mingw_wheel_build.sh b/scripts/mingw_wheel_build.sh index cf8eb66..d2aac11 100644 --- a/scripts/mingw_wheel_build.sh +++ b/scripts/mingw_wheel_build.sh @@ -1,31 +1,31 @@ -#!/usr/bin/env bash - -# This script is to be run using mingw and generates python wheels. -# It assumes that there are already existing virtual envs for every python version - -# define python command for every version -py37=/c/Users/fajardoo/AppData/Local/conda/conda/envs/py37/python.exe -py36=/c/Users/fajardoo/AppData/Local/conda/conda/envs/py36/python.exe -py35=/c/Users/fajardoo/AppData/Local/conda/conda/envs/py35/python.exe -py27=/c/Users/fajardoo/AppData/Local/conda/conda/envs/py27/python.exe -build="setup.py sdist bdist_wheel" -##### - -cd .. - -# clean deployment folder -rm dist/* - -# build! -echo "Building wheel for python 3.7" -$py37 $build -echo "***************************************" -echo "Building wheel for python 3.6" -$py36 $build -echo "***************************************" -echo "Building wheel for python 3.5" -$py35 $build -echo "***************************************" -echo "Building wheel for python 2.7" -$py27 $build -echo "***************************************" +#!/usr/bin/env bash + +# This script is to be run using mingw and generates python wheels. +# It assumes that there are already existing virtual envs for every python version + +# define python command for every version +py37=/c/Users/fajardoo/AppData/Local/conda/conda/envs/py37/python.exe +py36=/c/Users/fajardoo/AppData/Local/conda/conda/envs/py36/python.exe +py35=/c/Users/fajardoo/AppData/Local/conda/conda/envs/py35/python.exe +py27=/c/Users/fajardoo/AppData/Local/conda/conda/envs/py27/python.exe +build="setup.py sdist bdist_wheel" +##### + +cd .. + +# clean deployment folder +rm dist/* + +# build! +echo "Building wheel for python 3.7" +$py37 $build +echo "***************************************" +echo "Building wheel for python 3.6" +$py36 $build +echo "***************************************" +echo "Building wheel for python 3.5" +$py35 $build +echo "***************************************" +echo "Building wheel for python 2.7" +$py27 $build +echo "***************************************" diff --git a/setup.py b/setup.py index 7b2c5bf..b5ebeac 100644 --- a/setup.py +++ b/setup.py @@ -129,7 +129,7 @@ setup( name='pyreadstat', - version='0.2.4', + version='0.2.5', description=short_description, author="Otto Fajardo", author_email="pleasecontactviagithub@notvalid.com",