Skip to content

Commit

Permalink
Merge pull request #33 from abradle/master
Browse files Browse the repository at this point in the history
New version 1.0.10 with some travis updates and a file leak fix.
  • Loading branch information
abradle authored Jan 3, 2018
2 parents 1e2e137 + 1ec09e5 commit aa07342
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 23 deletions.
43 changes: 24 additions & 19 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,31 @@
os:
- linux
- linux
language: python
python:
- "2.6"
- "2.7"
- "3.3"
- "3.4"
- "3.5"
- '2.6'
- '2.7'
- '3.3'
- '3.4'
- '3.5'
matrix:
include:
# Use generic language for osx
- os: osx
python: 3.5
language: generic
# Perform the manual steps on osx to install python3 and activate venv
include:
- os: osx
python: 3.5
language: generic
before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install python3; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then virtualenv venv -p python3; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then source venv/bin/activate; fi
# Command to install dependencies
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install python3; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then virtualenv venv -p python3; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then source venv/bin/activate; fi
install:
- pip install -r requirements.txt
# command to run tests
- pip install -r requirements.txt
script: nosetests
deploy:
provider: pypi
user: abradle
distributions: "sdist bdist_wheel"
on:
branch: master
repo: rcsb/mmtf-python
password:
secure: K770zHNs79Bg+EE+1DcMRoB4QZpTZdTrJRmu8o6dnVjQgz3ZaPFkPZnkQdfOAa9UUCfLaCREjCkMSvUOxO9u9ep7HkM7zMnk88DEiKgVgddzoNEUG/RB0oYf1+hyc3FLcb2FTCLMTV9vtqPp6kRBMmpGzcQnGVsEDJjv59ZW9w4fXBIopoLEBcmAN6LBy19r3Hq4uBJRiW17jvtkfBhRTXRcgT/bYO3UD1THveUnYUoJw/HD8LSLO+svhHRclY0AAOV09ZVI7IA2+HXhCvbWVOFtDOzY/0m2qwII8GmtzGgvn1/JFLIf3dnth6er+eZwYcdhTUAVIkApq5p2zcJhKLg79FK4NhllsqKu/cOwREyrxXNQn8SyfDREfkhRRuLQ7iLDHiXdFmJD6wfNlVVrFQJlv5lEFogUsxBind0M2JPi7PD4GvyYl6ZESGfuhZSBKnzfecll1/vZB1u6x4M7rApC6t8b/KN2yjfyxaL6n8oDJdzEo0/JvmiGYVUG5GvNVYrIWdrJWVN4mVJ/Y8s+69c+a0puDK3bVLTwH+hLoInKtZvxh5sh9EE80cXGUK23Su5jTRoNrH6nV+qXNMe1F+9GNELffzbI0/Nk+fYys+M9xidEJ/BJQgZjmPEIg0pZR+H8Bwik0bI/0EDSSCbKLcigkEyRUy1tg8TSpWf4nDw=
3 changes: 1 addition & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,10 @@ All notable changes to this project will be documented in this file, following t
### Fixed
- Resolve issue with get_coords


## v1.0.8 - 2017-08-17
### Fixed
- Changing ascii to utf8 #29

## v1.0.x - 20XX-XX-XX
## v1.0.10 - 2018-01-03
### Fixed
- Don't leak open file handles #32
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![Build Status](https://travis-ci.org/rcsb/mmtf-python.svg?branch=master)](https://travis-ci.org/rcsb/mmtf-python)
[![Code Health](https://landscape.io/github/rcsb/mmtf-python/master/landscape.svg?style=flat)](https://landscape.io/github/rcsb/mmtf-python/master)
[![Version](http://img.shields.io/badge/version-1.0.9-blue.svg?style=flat)](https://github.com/rcsb/mmtf-python/)
[![Version](http://img.shields.io/badge/version-1.0.10-blue.svg?style=flat)](https://github.com/rcsb/mmtf-python/)
[![License](http://img.shields.io/badge/license-Apache%202.0-blue.svg?style=flat)](https://github.com/rcsb/mmtf-python/blob/master/LICENSE.txt)
[![Changelog](https://img.shields.io/badge/changelog--lightgrey.svg?style=flat)](https://github.com/rcsb/mmtf-python/blob/master/CHANGELOG.md)

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# Versions should comply with PEP440. For a discussion on single-sourcing
# the version across setup.py and the project code, see
# https://packaging.python.org/en/latest/single_source_version.html
version='1.0.9',
version='1.0.10',

description='A decoding libary for the PDB mmtf format',
long_description=long_description,
Expand Down

0 comments on commit aa07342

Please sign in to comment.