Skip to content

Commit

Permalink
Merge branch 'release/1.0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
horta committed Apr 26, 2017
2 parents 7abe4f5 + f6fb6a4 commit 1bc225d
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 22 deletions.
50 changes: 33 additions & 17 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,49 @@
language: python
sudo: required
dist: trusty
cache: pip
services: docker
git:
depth: 5
cache:
pip: true
directories:
- "$HOME/bin"
- "$HOME/.download"
matrix:
include:
- os: linux
python: '2.7'
- os: linux
python: '3.5'
- os: linux
python: '3.6'
- python: 2.7
- python: 3.5
- python: 3.6
- env: DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
- os: osx
language: generic
env: PYENV=py27
- os: osx
language: generic
env: PYENV=py35
- os: osx
language: generic
env: PYENV=py36
before_install:
- travis/install_pandoc.sh
- travis_retry bash <(curl -s https://raw.githubusercontent.com/limix/travis-tools/master/get-travis-tools.sh)
- travis_retry travis/before-install.sh
script:
- python setup.py sdist
- pip install dist/`ls dist | grep -i -E '\.(gz)$' | head -1`
- pushd /
- python -c "import scipy_sugar; scipy_sugar.test()"
- popd
- travis_retry travis/script.sh
after_success:
- travis_retry travis/after-success.sh
notifications:
email: false
deploy:
provider: pypi
skip_upload_docs: true
user: dhorta
password:
secure: YUuA0B8+1SNpzt74hwX416e1URQHSPkKo7iF6Ky1jxfC7Zjl80/dB2y/p58DVY6qa56jiJUaM1mKCOMyqZf6ft76GUUw5Q78vtskB8wONFRw/g3S8K7lYtK62xD10QF9tmsmkojkvwZefIuWPQrgqjclDnt9DHV0OLbEnERs+DKOTazTBkZnokK44W+jsGwoDmWwPibY71UNBK8BecBG4iOAznzsGAOLZTo1x5pGrfzU/Qvets90HzF0sbGpPGhniD3zKFcrWf+22SVv2vIz2LCE0nMs03ZR7uIe/VElp1T8CIhjuXjsAoTXbg/gD4/JIt0I7deQY3iYj2UKZUB8POitycNe5qahDCpKYatyRWgBo7d94Kofa6D0oYCLGkClz4PQV9kI5JyAXZAJlhdXS3l7Lau/z45lxtilDNj6eobXUgKOsxhsdIFK9oV3JY5xVFGD5JF5TTi3fpbZ0pqPdp7grznvnpMaxizWprlkdzT3FYWOTcydUZcEjVTHALp9xNxRrfG6Di+RhBypU53VzNooFPWdVzP2uGbbP8zdg/YlhjgVSGDxJOIOxGupV2IAi2fZqgvuJHX3ZSCblt4EN7ihPIa9q55FxMisXUKkrWFxGcfkUeifah7BhjRjAECMaJFgk/K1UavIqkDFajehjNGp+wlQIfjxoVR6C63VOG8=
- secure: BCkQ+XcnLTNRDzEM5MnT/Xa5CT1LqmmohE4KvnmE0MfOPDKiunE2AwZm2qX30Ka/vMFjExIl+hMy/2IZRrFoem4/WSBKC1mZFD/ihgo9CyVOv6r5vxiXa0vTJTicqUP6DZ5b1aNBjqNrfwjRoihkQsGcmLClXAQPFDWJBSkdgecNODrLUhJhCy2T2RUB/EPtmkgFLJ3CBNvBuHwhtqbVs1sLmbcfZy773keJ5mCbznZFpKXwNLQNI9GPs9uMiLv2jHvNZQvRuYMkuT2kDmzJbInVj/Sj3aSYg5rPOggUqFpGej/oChZLlYwlybkfi0hqNM8kGTw5aVwfDJZYF7Uu5vWGmuzTorEaqVFMLc95C168UTcIyGbEFeu4TDw+zPQvMkaXctrJmxdyQOAvPNrPBbPpMt1tPtxpempj1gyrNhBoz58EOfCawkS4dTRjtA0DtbfREq88qj142YO1Ip3T3JaPTrfTLu5kH2n/B3yuZJ4NUadbxTIKnUgkPsPYb9iS2ui2OSzOP6dXnhEhSBroNFvvXd/Pk/RFenQjx9eETGYlDyOJ+e5N3D/tcpqBZNQDzCsVlNuk6Hu5j9ofhimLPqYqpz5VPsCTPOfa892jRCR0LN/m7LmvotX+okzrax4t+IqVB3wrv+dVshBgKQG0PsxL95a7adAUKLepkw9NNRw=
on:
distributions: sdist bdist_wheel
repo: glimix/scipy-sugar
tags: true
repo: limix/scipy-sugar
branch: master
env:
global:
- secure: bstlWhD2AA7TJmy1Tv1OfMW8gogwCCd0nSxCFk3QMBC2/o33K55AQjZkyG/kmQWjO2mduWQmx9SdXshJzTT2SRhJW53VO2Op4YBJO4l57NPE9R3ggcIGsw4vsAXBCVkRyQRxhMmadRKajHWJjkf8IfbVKb4RRIqJT/dQCcD7kOhgGHKLI9/eBCoIVkZLFCdhEeGKaHQxeTqOOmmIhjAFIXh0sCkM4Av3UHR72/eKrLOR4iyOECfLXFFVR5jMcDwqFrcqFTGVBaAA7UZtJuO8qVMDb/qi9HfCTKVotj8vYFM32nu037Y+Mf1IH5aW/Z4oiscsxARY7Diq6le2lFBG96IvzLdeUElLCZO8zzAfRiUryOAorDH5PbwbOPG0t/WNK8ys5RNcd95rL/h4haKn3BrcOhWhaUCerC1uxqbOQO7mknz52GjPlT+3MHjymqmLBBDKRY2fXfLVk1jUnaVC0ZuXHscoKr8f8e4wXkRrznYy2RRnm3k7X2X7kLCUN0FmxfMgsQK12yPQtKgBGo/0lnTMFEWBnHEDLipnFFYMFNlnLr4EN7yk1un2R1m1W0HIb/plqerULnPlp/aH/QpJyVSQo6T5b4WELHirqnPZTQO8wDQPajyWQAqc83D3yD+X8WXZYOGTe5TwyvS7byAw8udxZAgocJ2C19idohqaGHA=
- PKG_NAME=scipy_sugar
- PY_DEPS="ncephes scipy"
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# scipy-sugar

[![PyPI-License](https://img.shields.io/pypi/l/scipy-sugar.svg?style=flat-square)](https://pypi.python.org/pypi/scipy-sugar/)
[![PyPI-Version](https://img.shields.io/pypi/v/scipy-sugar.svg?style=flat-square)](https://pypi.python.org/pypi/scipy-sugar/) [![Anaconda-Version](https://anaconda.org/conda-forge/scipy-sugar/badges/version.svg)](https://anaconda.org/conda-forge/scipy-sugar) [![Anaconda-Downloads](https://anaconda.org/conda-forge/scipy-sugar/badges/downloads.svg)](https://anaconda.org/conda-forge/scipy-sugar) [![Documentation Status](https://readthedocs.org/projects/scipy-sugar/badge/?style=flat-square&version=latest)](https://scipy-sugar.readthedocs.io/en/latest/)
[![PyPI-Version](https://img.shields.io/pypi/v/scipy-sugar.svg?style=flat-square)](https://pypi.python.org/pypi/scipy-sugar/) [![Anaconda-Version](https://anaconda.org/conda-forge/scipy-sugar/badges/version.svg)](https://anaconda.org/conda-forge/scipy-sugar) [![Anaconda-Downloads](https://anaconda.org/conda-forge/scipy-sugar/badges/downloads.svg)](https://anaconda.org/conda-forge/scipy-sugar) [![Documentation Status](https://readthedocs.org/projects/scipy-sugar/badge/?style=flat-square&version=latest)](https://scipy-sugar.readthedocs.io/)

Missing SciPy functionalities.

Expand Down
2 changes: 1 addition & 1 deletion scipy_sugar/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def test():
os.chdir(src_path)

try:
return_code = __import__('pytest').main(['-q'])
return_code = __import__('pytest').main(['-q', '--doctest-modules'])
finally:
os.chdir(old_path)

Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,18 @@ def setup_package():
pytest_runner = ['pytest-runner'] if needs_pytest else []

setup_requires = [] + pytest_runner
install_requires = ['numpy>=1.9', 'scipy>=0.17.1']
install_requires = ['numpy>=1.9', 'scipy>=0.18']
tests_require = ['pytest>=3']

metadata = dict(
name='scipy-sugar',
version='1.0.1',
version='1.0.2',
maintainer="Danilo Horta",
maintainer_email="horta@ebi.ac.uk",
license="MIT",
description="Missing SciPy functionalities.",
long_description=long_description,
url='http://github.com/glimix/scipy-sugar',
url='https://github.com/limix/scipy-sugar',
packages=find_packages(),
zip_safe=True,
install_requires=install_requires,
Expand Down

0 comments on commit 1bc225d

Please sign in to comment.