Commit 623dd590 authored by Jakob Luettgau's avatar Jakob Luettgau
Browse files

Add additional targets to wheel building automation, fix long_description to...

Add additional targets to wheel building automation, fix long_description to only inlcude statements compatibile to pypi's rst parser.
parent e789f838
......@@ -57,7 +57,10 @@ servedocs: docs # compile the docs watching for changes
watchmedo shell-command -p '*.rst' -c '$(MAKE) -C docs html' -R -D .
release: dist # package and upload a release
wheels:
./devel/build-all.sh
release: #dist # package and upload a release
#twine upload --repository testpypi dist/*
twine upload dist/*
......
......@@ -48,7 +48,7 @@ To install in most cases the following will work::
pip install darshan
For alternative installation instructions and installation from source refer to :doc:`install`.
For alternative installation instructions and installation from source refer to <docs/install.rst>
Testing
......
......@@ -20,15 +20,16 @@ docker run --rm -e PLAT=$PLAT \
$DOCKER_IMAGE $PRE_CMD /io/devel/build-wheels.sh
exit
DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
PLAT=manylinux1_i686
PRE_CMD=linux32
docker pull $DOCKER_IMAGE
docker run --rm -e PLAT=$PLAT -v $MNT_PYDARSHAN:/io -v $MNT_DARSHAN:/darshan $DOCKER_IMAGE $PRE_CMD /io/devel/build-wheels.sh
docker run --rm -e PLAT=$PLAT \
-v $MNT_PYDARSHAN:/io \
-v $MNT_DARSHAN:/darshan \
$DOCKER_IMAGE $PRE_CMD /io/devel/build-wheels.sh
......@@ -37,4 +38,8 @@ PLAT=manylinux2010_x86_64
PRE_CMD=
docker pull $DOCKER_IMAGE
docker run --rm -e PLAT=$PLAT -v $MNT_PYDARSHAN:/io -v $MNT_DARSHAN:/darshan $DOCKER_IMAGE $PRE_CMD /io/devel/build-wheels.sh
docker run --rm -e PLAT=$PLAT \
-v $MNT_PYDARSHAN:/io \
-v $MNT_DARSHAN:/darshan \
$DOCKER_IMAGE $PRE_CMD /io/devel/build-wheels.sh
#!/bin/bash
set -e -u -x
mkdir -p /io/wheelhouse/${PLAT}
function repair_wheel {
wheel="$1"
if ! auditwheel show "$wheel"; then
echo "Skipping non-platform wheel $wheel"
else
auditwheel repair "$wheel" --plat "$PLAT" -w /io/wheelhouse/
auditwheel repair "$wheel" --plat "$PLAT" -w /io/wheelhouse/${PLAT}/
fi
}
......@@ -33,16 +35,16 @@ ls /opt/python
# Compile wheels
for PYBIN in /opt/python/*/bin; do
"${PYBIN}/pip" install -r /io/requirements_dev.txt
"${PYBIN}/pip" wheel /io/ --no-deps -w /io/wheelhouse/
"${PYBIN}/pip" wheel /io/ --build-option "--with-extension" --no-deps -w /io/wheelhouse/${PLAT}
done
# Bundle external shared libraries into the wheels
for whl in /io/wheelhouse/*.whl; do
for whl in /io/wheelhouse/${PLAT}/*.whl; do
repair_wheel "$whl"
done
## Install packages and test
#for PYBIN in /opt/python/*/bin/; do
# "${PYBIN}/pip" install darshan --no-index -f /io/wheelhouse
# "${PYBIN}/pip" install darshan --no-index -f /io/wheelhouse/${PLAT}
# (cd "$HOME"; "${PYBIN}/nosetests" darshan)
#done
pip==18.1
bumpversion==0.5.3
wheel==0.32.1
watchdog==0.9.0
......@@ -18,4 +17,4 @@ pytest==3.8.2
pytest-runner==4.2
nose
scalene
#scalene
jupyter
notebook
# altair (has svg well exposed)
altair
# for bokeh + svg export
# but bokeh is almost as verbose to use as matplotlib
bokeh
selenium
#!/usr/bin/env python
# -*- coding: utf-8 -*-
from setuptools import setup, find_packages
from setuptools import setup, find_packages, Extension
import sys
with open('README.rst') as readme_file:
readme = readme_file.read()
......@@ -12,6 +14,33 @@ setup_requirements = ['pytest-runner', ]
test_requirements = ['pytest']
ext_modules = []
if '--with-extension' in sys.argv:
ext_modules.append(Extension(
'darshan.extension',
#optional=True,
sources=['darshan/extension.c'],
library_dirs=['/usr/lib64/atlas/', '/usr/lib/atlas'],
include_dirs=['/usr/include'],
libraries=['darshan-util']
))
sys.argv.remove('--with-extension')
#ext_modules.append(Extension(
# 'darshan.extension',
# #optional=True,
# sources=['darshan/extension.c'],
# library_dirs=['/usr/lib64/atlas/', '/usr/lib/atlas'],
# include_dirs=['/usr/include'],
# libraries=['darshan-util']
# ))
setup(
author='',
author_email='',
......@@ -20,16 +49,23 @@ setup(
'Intended Audience :: Developers',
'Natural Language :: English',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
# 'Programming Language :: Python :: 3.4',
# 'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
],
description="Python tools to interact with darshan log records of HPC applications.",
#long_description=readme,
long_description="PyDarshan",
#options={"bdist_wheel": {"universal": False}},
#libraries=["darshanutils"],
ext_modules = ext_modules,
install_requires=requirements,
long_description=readme,
include_package_data=True,
keywords='darshan',
name='darshan',
......@@ -38,6 +74,6 @@ setup(
test_suite='tests',
tests_require=test_requirements,
url='https://www.mcs.anl.gov/research/projects/darshan/',
version='0.1.0',
version='0.0.2',
zip_safe=False,
)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment