Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[requires.io] dependency update on master branch #4

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

[requires.io] dependency update on master branch #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6d97081
[requires.io] dependency update
requires Jan 15, 2017
b1b0bc3
[requires.io] dependency update
requires Jan 15, 2017
2bd0598
[requires.io] dependency update
requires Apr 12, 2017
2b7082a
[requires.io] dependency update
requires Apr 16, 2017
e5a1bba
[requires.io] dependency update
requires May 9, 2017
7348cb0
[requires.io] dependency update
requires May 12, 2017
2e2a8ab
[requires.io] dependency update
requires Sep 4, 2018
f6d48cc
[requires.io] dependency update
requires Dec 13, 2018
f468e59
[requires.io] dependency update
requires Dec 13, 2018
1eb7539
[requires.io] dependency update
requires Dec 14, 2018
bc84790
[requires.io] dependency update
requires Jan 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions requirements-testing.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
pytest-cov==1.8.1
pytest-cov==2.6.1
pytest-pep8==1.0.6
python-coveralls==2.4.3
python-coveralls==2.9.1
18 changes: 1 addition & 17 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
import sys

from setuptools import setup, find_packages
from setuptools.command.test import test as TestCommand

dirname = os.path.dirname(__file__)

Expand All @@ -13,22 +12,9 @@
long_description += '\n' + f.read()


class PyTest(TestCommand):
def finalize_options(self):
TestCommand.finalize_options(self)
self.test_args = 'tests'
self.test_suite = True

def run_tests(self):
# import here, cause outside the eggs aren't loaded
import pytest
errno = pytest.main(self.test_args)
sys.exit(errno)


setup(
name='poultry',
version='1.4.0',
version='1.5.2',
description='A tweet collection manager.',
long_description=long_description,
# Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
Expand All @@ -41,7 +27,6 @@ def run_tests(self):
'Operating System :: Microsoft :: Windows',
'Operating System :: MacOS :: MacOS X',
'Topic :: Utilities',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 3',
],
keywords='',
Expand All @@ -63,7 +48,6 @@ def run_tests(self):
'poultry = poultry.main:dispatch',
],
},
cmdclass={'test': PyTest},
tests_require=[
'pytest>=2.4.2',
],
Expand Down
5 changes: 3 additions & 2 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
# and then run "tox" from this directory.

[tox]
envlist = py27,py34,py33,pypy
envlist = py36

[testenv]
commands = py.test tests README.rst --pep8 --junitxml={envlogdir}/junit-{envname}.xml []
#commands = py.test tests README.rst --pep8 --junitxml={envlogdir}/junit-{envname}.xml []
commands = py.test tests README.rst []
deps = -r{toxinidir}/requirements-testing.txt

[pytest]
Expand Down