Skip to content
This repository has been archived by the owner on Oct 23, 2021. It is now read-only.

Commit

Permalink
Merge pull request #32 from s-weigand/release-on-pypi
Browse files Browse the repository at this point in the history
Release on pypi
  • Loading branch information
joernweissenborn committed Jul 25, 2018
2 parents 9986f22 + 1eb30eb commit 9e7461b
Show file tree
Hide file tree
Showing 6 changed files with 60 additions and 8 deletions.
38 changes: 34 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ matrix:

# LINUX
- python: "3.6"
env: linux-py36
env:
- linux-py36
- DEPLOY_ALL=true

- python: "3.7-dev" # 3.7 development branch
env: linux-py37
Expand All @@ -42,8 +44,7 @@ matrix:
- language: generic
python: 3.6
os: osx
env:
- osx-py36
env: osx-py36
before_install:
- echo "before_install"
- wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh;
Expand Down Expand Up @@ -95,7 +96,36 @@ after_success:
- coveralls
- coverage erase

deploy:
# full deploy with python 3.6, since the package is pure python
provider: pypi
distributions: sdist bdist_wheel
user: s-weigand
# if you just want to get used to workflow of publishing new versions
# you can simply comment the lines between PRODUCTION and uncomment the
# the ones between TESTING to use the PyPi testserver
############# PRODUCTION ###############
password:
secure: hxUebPQEG5q+Iz2cfXi7KedXNNBVNnmIRkYAGms+/DEB2C3ax3TUUsPYEcdCr4LdNT8TB10iHlSnuGcMhPMPAMQR82RjUtmAIJFudi1TPCvxsFXaKJIVlsVBBHM1qlfg5zIJ1v7QHmIzkyCNdNxE3doJd6XDUlDUFNC5fH+HPETYZC6e3rrXgLWyB2vqvmcpRRzBHfxkPiQ4cJs8LGbJiPwOyRl70/fAaHzWp9g3Jde4iyRCjGLsNGyhj9+hDZlgV/K6cDD2RQGmffWlllTLckDQUbLQbZjiM1vKnahSH0HifVTTXitVT/otYkx1KAjxGTbcRv8+QIL3MjMcFHjQlo2yAAkOS1aTBIdYKEeU6eKmgG3Cp1E9J43oplK8fjDMP5/eBMPtzs8ir0OYwtO15Np/nfPNyGNPsTKTXDJo8TheLXJUB+aUwbaHWYYeglNKiNC9+d7nostwXSCDkW1H0ZnI3GKOzjXQoXawLEQ8adst+mbzA1APJaH+7tJ+r/nwI7jFWen/MKYeczel9XVvmcmVlOD8hn5iXJkd5jVQMBfmUFE8g7Rdhg9htIYf/iHA33W/CcGCnw+NJTEzZqzqZ5R3JwNCVQSxlPbFpFvj+Vwx+M0KoFOIbTWs/hGZCY4mwe0GCuAKqUFPBO+4EXEsrqXSP6fnotUNZV3nkI4J0sE=
############# PRODUCTION ###############

############## TESTING #################
# server: https://test.pypi.org/legacy/
# password:
# secure: votHCGQUaFfMqTha9GkNLoB3oWlB3CA5VNtiFSKJUxIJAUj7wVCtKct9pl1XlNZ9R0IJ/XQARf0vIewP24GgzkYBHKDPXegLLm12RaL+c9qP9qsKOM/EsJbwdu1yo/BM9zaX8HoQ0XjCQPw/G1UCTLU04rlOFheAkpReOQhApiUD3pJop2bSO9PctWOajAdoCbeG4qP/wrcNNx4aj+CLLeNkPFlb9et9NDSBV8JlZnXA8wPugru3oBkgG7D6K45pVwXiNYMhvXAJc166p5OHGMazVzt0KZAl1V7bISdQwsRUF5daNHX7K6oO5vS82CaIYv4joyYMBIXo4PDmP9RweaM+2mF1Lms8KvR/UbKG6g7IhuQkcfMR0lqPmpdEBOOCuY4TqFeQ/DUEGVjefmwQ7X2UDlFG+MRZK932l9Q8Ma74/CtGAbHNvl0ejWhR7IUbhtcxduQ1SV+l9ZQBSqLD8kIGoGft9rtvh5K0zfOR7rIbxbzSmiCiGfcsbEqb+K7IZCN6X5NxSdMUelmgvospjMNYVv8S3fQNWOBY0yyoAOCpJp9VDrJCLjmrNfzkm6GIBFjAyPdSxNAk3YbXo8OsYgoMoUzcHFfXKiv9/RYo+4TZT27geqg8hIgnZycHjjZPts7kCmRFGPOvx511PIWyMa93em4OWfx99IbGqoSZJag=
##############TESTING ##################
skip_cleanup: true
on:
############# PRODUCTION ###############
branch: master
############# PRODUCTION ###############
tags: true
repo: glotaran/lmfit-varpro
# there can only a maximum one test with DEPLOY_ALL=true, since PyPi will throw an error
# and make the fail if the file (mostly sdist) already exists on the server
condition: "$DEPLOY_ALL = true"

notifications:
slack:
rooms:
- secure: "VidmiSSh3NBpBRsbe/Y4z02rEW/VNvW6IA47AgbVQkWM2D/f5p26vqequ4GHCDNJJzSUn5FX85eTj+p9nssXeVWJW3/KNp/NX0DTiylixj1Ep4myTfhWJwQlV56bq+7OZCjwRF290oTz4XECUQ6cL/+JeYH3E4GaAz3T9kxhpfZfP+dMJ8FIjQgaT5UorlcY3uFjx4FgScTyJPNyv0vzwpNc2KQVIWBVe3KBpnqkoYDGCjU4rVUa61HJ+agfYi0UelxyaRZKyMw1+EjTPZqpLBX2QKreAv7wWvbsVvmb+3jC/jlndVSN0HSG513nSUEAmd10I2YoWSPj5Ri8aMcBkJLVbt/Y8pedoHcAY8yam/Z5Pqh4lqvaP9tGJTLoIFzFkmrWnvtnx4bp+8QKSvK9SFhX2l90AoNKhwpYnAssMKgbtCeR3IJCEU99XpsT2DiKknvJKLQ+dcATv05b7XEnu5be46LllcykfoF6L64ZUyBPimlleGufdWNJzs/VWVHbVxZePlVpfX/Bp9sCq/uX1u3xosA1NWjiexw1R37u/fBTxELFuRR/jYOm7ON/YC/2yjHox05009WZy0IIzxwURpBH6YU0mQgXYFgTJGkNLN3418pXr0doN2LNgrfBUbAcD8jFVyx7aOJiGee3TP7/MKZRLhJcWs4uUKNWCqgtPbs="
- secure: "VidmiSSh3NBpBRsbe/Y4z02rEW/VNvW6IA47AgbVQkWM2D/f5p26vqequ4GHCDNJJzSUn5FX85eTj+p9nssXeVWJW3/KNp/NX0DTiylixj1Ep4myTfhWJwQlV56bq+7OZCjwRF290oTz4XECUQ6cL/+JeYH3E4GaAz3T9kxhpfZfP+dMJ8FIjQgaT5UorlcY3uFjx4FgScTyJPNyv0vzwpNc2KQVIWBVe3KBpnqkoYDGCjU4rVUa61HJ+agfYi0UelxyaRZKyMw1+EjTPZqpLBX2QKreAv7wWvbsVvmb+3jC/jlndVSN0HSG513nSUEAmd10I2YoWSPj5Ri8aMcBkJLVbt/Y8pedoHcAY8yam/Z5Pqh4lqvaP9tGJTLoIFzFkmrWnvtnx4bp+8QKSvK9SFhX2l90AoNKhwpYnAssMKgbtCeR3IJCEU99XpsT2DiKknvJKLQ+dcATv05b7XEnu5be46LllcykfoF6L64ZUyBPimlleGufdWNJzs/VWVHbVxZePlVpfX/Bp9sCq/uX1u3xosA1NWjiexw1R37u/fBTxELFuRR/jYOm7ON/YC/2yjHox05009WZy0IIzxwURpBH6YU0mQgXYFgTJGkNLN3418pXr0doN2LNgrfBUbAcD8jFVyx7aOJiGee3TP7/MKZRLhJcWs4uUKNWCqgtPbs="
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[![latest release](https://pypip.in/version/lmfit-varpro/badge.svg)](https://pypi.org/project/lmfit-varpro/)
[![Build Status](https://travis-ci.org/glotaran/lmfit-varpro.svg?branch=master)](https://travis-ci.org/glotaran/lmfit-varpro)
[![Build Status](https://ci.appveyor.com/api/projects/status/github/glotaran/lmfit-varpro?branch=master&svg=true)](https://ci.appveyor.com/project/jsnel/lmfit-varpro?branch=master)
[![Documentation Status](https://readthedocs.org/projects/lmfit-varpro/badge/?version=latest)](https://lmfit-varpro.readthedocs.io/en/latest/?badge=latest)
Expand Down
2 changes: 1 addition & 1 deletion lmfit_varpro/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

__author__ = """Joris Snellenburg, Stefan Schuetz, Joern Weissenborn"""
__email__ = 'j.snellenburg@gmail.com, YamiNoKeshin@gmail.com, joern.weissenborn@gmail.com'
__version__ = '0.1.0'
__version__ = '0.0.1'

from . import constraints, separable_model, result

Expand Down
3 changes: 3 additions & 0 deletions requirements_dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
pip>=9.0.1
wheel>=0.30.0

# needed to release new versions
bumpversion==0.5.3

# documentation dependencies
Sphinx>=1.7.5
m2r>=0.1.15
Expand Down
15 changes: 15 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[bumpversion]
current_version = 0.0.1
commit = True
tag = True

[bumpversion:file:setup.py]
search = version='{current_version}'
replace = version='{new_version}'

[bumpversion:file:lmfit_varpro/__init__.py]
search = __version__ = '{current_version}'
replace = __version__ = '{new_version}'

[bdist_wheel]
universal = 1
9 changes: 6 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,16 @@
with open("README.md", "r") as fh:
long_description = fh.read()



setuptools.setup(
name="lmfit-varpro",
version="0.0.1",
version='0.0.1',
description='A variable projection implementation for Python/lmfit.',
long_description=long_description,
long_description_content_type="text/markdown",
url='https://github.com/glotaran/lmfit-varpro',
download_url = 'https://github.com/glotaran/lmfit-varpro/archive/0.0.1.tar.gz',
download_url = 'https://github.com/glotaran/lmfit-varpro/tarball/master',
keywords = ['alpha'],
author='Joris Snellenburg, '
'Joern Weissenborn',
Expand All @@ -23,6 +25,7 @@
'Intended Audience :: Science/Research',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
'Natural Language :: English',
'Operating System :: OS Independent',
Expand All @@ -32,7 +35,7 @@
],
install_requires=[
'numpy',
'lmfit',
'lmfit'
],
test_suite='tests',
tests_require=['pytest'],
Expand Down

0 comments on commit 9e7461b

Please sign in to comment.