Skip to content

Commit

Permalink
Merge a56ee3e into 820f1f5
Browse files Browse the repository at this point in the history
  • Loading branch information
ladyrassilon committed Aug 29, 2017
2 parents 820f1f5 + a56ee3e commit cc80f79
Show file tree
Hide file tree
Showing 7 changed files with 44 additions and 7 deletions.
7 changes: 7 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[run]
source = rpn
[report]
omit =
*/python?.?/*
*/site-packages/nose/*
tests/*
3 changes: 3 additions & 0 deletions .coveralls.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
service_name: travis-ci
url: git://github.com/ladyrassilon/rpn.git
parallel: true
23 changes: 23 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
language: python
python:
- "2.7"
- "3.3"
- "3.4"
- "3.5"
- "3.6"
- "pypy"
- "pypy3"
install:
- pip install coveralls pep8 pylint
matrix:
include:
- env: COMMAND=pylint
python: 3.5
script: pylint -f parseable -d I0011,R0801 rpn tests
- env: COMMAND=pep8
python: 3.5
script: pep8 rpn tests
script:
- coverage run setup.py test
after_success:
- coveralls
5 changes: 3 additions & 2 deletions build_jenkins.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ dt="rpn-"$(date '+%d-%m-%Y-%H-%M-%S');
mkvirtualenv "$dt"
workon "$dt"

pip install --no-cache pylint pep8 nose
pep8 rpn tests > pep8_report.txt
# pip install --no-cache pylint pep8 nose

python setup.py nosetests --with-xunit --with-coverage --cover-package rpn --cover-erase --cover-xml --cover-branch --cover-html
pep8 rpn tests > pep8_report.txt
pylint -f parseable -d I0011,R0801 rpn | tee pylint.out

deactivate
Expand Down
2 changes: 1 addition & 1 deletion rpn/decorators.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from exceptions import NotPositiveInteger
from .exceptions import NotPositiveInteger


def get_items(operator_function):
Expand Down
2 changes: 1 addition & 1 deletion rpn/functions.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from decorators import get_items
from .decorators import get_items


def add(stack):
Expand Down
9 changes: 6 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,20 @@
author="Gemma Hentsch",
author_email="contact@halfapenguin.com",
install_requires=[
"sympy"
"sympy==1.0",
],
tests_require=[
"sympy==1.0",
"coverage",
"nose",
# "pep8",
# "pylint",
],
long_description=long_description,
test_suite="nose.collector",
url="https://github.com/zooeysoftware/rpn",
url="https://github.com/ladyrassilon/rpn",
keywords=["rpn", "math", "formula"],
download_url="https://github.com/zooeysoftware/rpn/releases",
download_url="https://github.com/ladyrassilon/rpn/releases",
classifiers=[
"Development Status :: 4 - Beta",
"Programming Language :: Python :: 3.3",
Expand Down

0 comments on commit cc80f79

Please sign in to comment.