Skip to content

Commit

Permalink
bumping version to 0.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Miroslav Shubernetskiy committed Jul 28, 2017
1 parent da3204c commit 2adb7a7
Show file tree
Hide file tree
Showing 10 changed files with 60 additions and 20 deletions.
23 changes: 23 additions & 0 deletions .importanizerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"exclude": [
"*/docs/conf.py",
"*/.tox"
],
"groups": [
{
"type": "stdlib"
},
{
"type": "remainder"
},
{
"type": "packages",
"packages": [
"skipnose"
]
},
{
"type": "local"
}
]
}
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
language: python

python:
- "3.4"
- "3.6"
- "2.7"
- "pypy"

Expand Down
9 changes: 8 additions & 1 deletion HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,18 @@
History
-------

0.3.1 (2017-07-28)
~~~~~~~~~~~~~~~~~~

* Using wheels for distribution
* Excluding tests from being installed
* Added importanize as CI step

0.3.0 (2017-02-18)
~~~~~~~~~~~~~~~~~~

* **New** ``--skipnose-include`` clauses now can either be ANDed or ORed.

ANDed example::

--skipnose-include=foo --skipnose-include=bar
Expand Down
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ clean-test-all: clean-test

lint:
flake8 .
importanize --ci

test:
nosetests ${NOSE_FLAGS} tests/
Expand All @@ -58,7 +59,9 @@ check: clean-build clean-pyc clean-test lint test-coverage

release: clean
python setup.py sdist upload
python setup.py bdist_wheel upload

dist: clean
python setup.py sdist
python setup.py bdist_wheel
ls -l dist
1 change: 1 addition & 0 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
-r requirements.txt
coverage
flake8
importanize
mock
rednose
tox
5 changes: 4 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
[bdist_wheel]
universal=1

[flake8]
exclude = .tox
exclude=.tox
22 changes: 10 additions & 12 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
from __future__ import unicode_literals, print_function
from __future__ import print_function, unicode_literals
import os
import re
from setuptools import setup, find_packages

from setuptools import find_packages, setup

from skipnose import __author__, __version__


def read(fname):
return (open(os.path.join(os.path.dirname(__file__), fname), 'rb')
.read().decode('utf-8'))
with open(os.path.join(os.path.dirname(__file__), fname), 'rb') as fid:
return fid.read().decode('utf-8')


authors = read('AUTHORS.rst')
Expand All @@ -17,10 +19,6 @@ def read(fname):
readme = read('README.rst')


module_file = read("skipnose/__init__.py")
metadata = dict(re.findall("__([a-z]+)__\s*=\s*'([^']+)'", module_file))


requirements = read('requirements.txt').splitlines() + [
'setuptools',
]
Expand All @@ -34,13 +32,13 @@ def read(fname):

setup(
name='skipnose',
version=metadata['version'],
author=metadata['author'],
version=__version__,
author=__author__,
description='Nose plugin which allows to include/exclude directories '
'for testing by their glob pattern.',
long_description='\n\n'.join([readme, history, authors, licence]),
url='https://github.com/Dealertrack/skipnose',
packages=find_packages(exclude=['test', 'test.*']),
packages=find_packages(exclude=['tests', 'tests.*']),
install_requires=requirements,
test_suite='tests',
tests_require=test_requirements,
Expand Down
12 changes: 8 additions & 4 deletions skipnose/__init__.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals, print_function

from .skipnose import SkipNose # noqa
from __future__ import print_function, unicode_literals


__author__ = 'Miroslav Shubernetskiy'
__email__ = '[email protected]'
__version__ = '0.3.0'
__version__ = '0.3.1'


try:
from .skipnose import SkipNose # noqa
except ImportError:
pass # probably during install
1 change: 1 addition & 0 deletions tests/tests_skipnose.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import mock
from nose.case import FunctionTestCase
from nose.plugins.skip import SkipTest

from skipnose.skipnose import SkipNose, walk_subfolders


Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py27, py34, pypy
envlist = py27, py36, pypy

[testenv]
setenv =
Expand Down

0 comments on commit 2adb7a7

Please sign in to comment.