Skip to content

Commit

Permalink
Merge pull request #17 from smspillaz/polysquare-cmake-linter.item_16
Browse files Browse the repository at this point in the history
Update README.md and bump version
  • Loading branch information
smspillaz committed Jul 30, 2015
2 parents d9b9868 + c8a564b commit 406cb71
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 22 deletions.
18 changes: 12 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,19 @@ cache:
python:
- '2.7'
- '3.4'
- 'pypy'
- pypy
- pypy3
install:
- eval $(curl -LSs --retry 100 --connect-timeout 3 public-travis-scripts.polysquare.org/bootstrap.py | python /dev/stdin -d container -s setup/python/setup.py -e bash -p /dev/stdout --cmake-version ${CMAKE_VERSION})
- eval $(curl -LSs --retry 100 --connect-timeout 3 public-travis-scripts.polysquare.org/bootstrap.py
| python /dev/stdin -d container -s setup/python/setup.py -e bash -p /dev/stdout)
script:
- polysquare_run check/python/check.py
- polysquare_run check/python/check.py
before_cache:
- polysquare_cleanup
- polysquare_cleanup
after_success:
- polysquare_run coverage/python/coverage.py
- polysquare_run coverage/python/coverage.py
before_deploy:
- polysquare_run deploy/python/deploy.py
- polysquare_run deploy/python/deploy.py
deploy:
provider: pypi
user:
Expand All @@ -26,3 +28,7 @@ deploy:
on:
repo: polysquare/polysquare-cmake-linter
branch: master
python: 2.7
env:
global:
secure: FGdzl2ZuXVb3F+Rr9llE0MHrYe1qq6AcxHuoUoZrDgkjpUSA5x8bzoW/ZG0PGYh5x5tkRHVyXYo7DvJJY1O9H0I0VoSWZBmNx3iLJLwqSr7O2lRURkIWsmwfs4fuSKiThMz03ZilDRl+uaIv9lJ+yf1pdLSLqyqpHZgQ9BYNP00=
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

## Status ##

| Travis CI (Ubuntu) | AppVeyor (Windows) | Coverage | PyPI |
|--------------------|--------------------|----------|------|
|[![Travis](https://travis-ci.org/polysquare/polysquare-cmake-linter.svg?branch=master)](https://travis-ci.org/polysquare/polysquare-cmake-linter)|[![AppVeyor](https://ci.appveyor.com/api/projects/status/0c80f40793wce9un/branch/master?svg=true)](https://ci.appveyor.com/project/smspillaz/polysquare-cmake-linter-935/branch/master)|[![Coveralls](https://coveralls.io/repos/polysquare/polysquare-cmake-linter/badge.png?branch=master)](https://coveralls.io/r/polysquare/polysquare-cmake-linter?branch=master)|[![PyPI](https://pypip.in/version/polysquare-cmake-linter/badge.svg)](https://pypi.python.org/pypi/polysquare-cmake-linter/)|
| Travis CI (Ubuntu) | AppVeyor (Windows) | Coverage | PyPI | Licence |
|--------------------|--------------------|----------|------|---------|
|[![Travis](https://img.shields.io/travis/polysquare/polysquare-cmake-linter.svg)](http://travis-ci.org/polysquare/polysquare-cmake-linter)|[![AppVeyor](https://img.shields.io/appveyor/ci/smspillaz/polysquare-cmake-linter-935.svg)](https://ci.appveyor.com/project/smspillaz/polysquare-cmake-linter-935)|[![Coveralls](https://img.shields.io/coveralls/polysquare/polysquare-cmake-linter.svg)](http://coveralls.io/polysquare/polysquare-cmake-linter)|[![PyPIVersion](https://img.shields.io/pypi/v/polysquare-cmake-linter.svg)](https://pypi.python.org/pypi/polysquare-cmake-linter)[![PyPIPythons](https://img.shields.io/pypi/pyversions/polysquare-cmake-linter.svg)](https://pypi.python.org/pypi/polysquare-cmake-linter)|[![License](https://img.shields.io/github/license/polysquare/polysquare-cmake-linter.svg)](http://github.com/polysquare/polysquare-cmake-linter)|

## Style Guide ##

Expand Down
8 changes: 4 additions & 4 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ environment:
- PYTHON: "C:\\Python27"

cache:
- C:\container
- C:\Python34
- C:\Python27
- C:\container -> appveyor.yml
- C:\Python34 -> appveyor.yml
- C:\Python27 -> appveyor.yml

install:
- ps: $env:PATH="${env:PYTHON};${env:PYTHON}/Scripts;${env:PATH};C:/MinGW/bin"
- ps: $env:POLYSQUARE_PREINSTALLED_PYTHON="C:\Python27"
- ps: $env:POLYSQUARE_PREINSTALLED_PYTHON="C:\Python34"
- ps: wget public-travis-scripts.polysquare.org/bootstrap.py -OutFile bootstrap
- ps: python bootstrap -d C:/container -s setup/python/setup.py -e powershell -p test-env.ps1 --no-mdl
- ps: . ./test-env
Expand Down
13 changes: 4 additions & 9 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
from setuptools import setup

setup(name="polysquare-cmake-linter",
version="0.0.7",
description="Polysquare CMake Linter",
version="0.0.9",
description="""Polysquare CMake Linter""",
long_description_markdown_filename="README.md",
author="Sam Spilsbury",
author_email="smspillaz@gmail.com",
Expand All @@ -31,10 +31,9 @@
packages=find_packages(exclude=["tests"]),
install_requires=["cmakeast>=0.0.7"],
extras_require={
"green": ["coverage",
"testtools",
"green": ["testtools",
"nose",
"nose-parameterized>=0.4.0",
"nose-parameterized>=0.5.0",
"setuptools-green"],
"polysquarelint": ["polysquare-setuptools-lint"]
},
Expand All @@ -43,10 +42,6 @@
"polysquare-cmake-linter=polysquarecmakelinter.linter:main"
]
},
dependency_links=[
("https://github.com/smspillaz/nose-parameterized/tarball/"
"detailed-docs#egg=nose-parameterized-0.4.0"),
],
test_suite="nose.collector",
zip_safe=True,
include_package_data=True)

0 comments on commit 406cb71

Please sign in to comment.