Skip to content

Commit

Permalink
version 0.2.5. Manifest changed to make sure that pyx and pyd files a…
Browse files Browse the repository at this point in the history
…re in the source distribution, necessary for conda to build correctly
  • Loading branch information
Otto Fajardo authored and ofajardo committed May 9, 2019
1 parent 97055f3 commit 8df3d21
Show file tree
Hide file tree
Showing 11 changed files with 45 additions and 34 deletions.
7 changes: 6 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
include *.h
recursive-include src *.h
recursive-include src *.h
recursive-include pyreadstat *.h
include *.pyx
recursive-include pyreadstat *.pyx
include *.pxd
recursive-include pyreadstat *.pxd
6 changes: 5 additions & 1 deletion change_log.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Binary file removed dist/pyreadstat-0.2.4.tar.gz
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added dist/pyreadstat-0.2.5.tar.gz
Binary file not shown.
2 changes: 2 additions & 0 deletions scripts/compiling_recipes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
62 changes: 31 additions & 31 deletions scripts/mingw_wheel_build.sh
Original file line number Diff line number Diff line change
@@ -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 "***************************************"
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 8df3d21

Please sign in to comment.