Skip to content

Commit

Permalink
Merge pull request #37 from miki725/ci
Browse files Browse the repository at this point in the history
ci
  • Loading branch information
miki725 committed May 4, 2017
2 parents 4cc619d + 0fada4f commit 17600b4
Show file tree
Hide file tree
Showing 25 changed files with 711 additions and 625 deletions.
4 changes: 4 additions & 0 deletions .importanizerc
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
{
"exclude": [
"*/.tox/*",
"*/test_data/*.py"
],
"groups": [
{
"type": "stdlib"
},
{
"type": "sitepackages"
},
{
"type": "remainder"
},
Expand Down
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
4 changes: 2 additions & 2 deletions AUTHORS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ Development Lead
Contributors
~~~~~~~~~~~~

Benjamin Abel - https://github.com/benjaminabel
Pamela McA'Nulty - https://github.com/PamelaM
* Benjamin Abel - https://github.com/benjaminabel
* Pamela McA'Nulty - https://github.com/PamelaM
12 changes: 12 additions & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,18 @@
History
-------

0.5.0 (2017-05-03)
~~~~~~~~~~~~~~~~~~

* Added ``--ci`` flag to validate import organization in files
* Added ``sitepackages`` import group. Thanks `Pamela <https://github.com/PamelaM>`_.
See ``README`` for more info
* Added pipe handling (e.g. ``cat foo.py | importanize``)
* Fixed bug which incorrectly sorted imports with aliases (e.g. ``import foo as bar``)
* Files are not overridden when imports are already organized.
Useful in precommit hooks which detect changed files.
* Released as Python `wheel <http://pythonwheels.com/>`_

0.4.1 (2015-07-28)
~~~~~~~~~~~~~~~~~~

Expand Down
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.PHONY: clean-pyc clean-build docs clean

NOSE_FLAGS=-sv --with-doctest --rednose
NOSE_FLAGS=-sv --with-doctest --rednose --exclude=test_data
COVER_CONFIG_FLAGS=--with-coverage --cover-package=importanize,tests --cover-tests --cover-erase
COVER_REPORT_FLAGS=--cover-html --cover-html-dir=htmlcov
COVER_FLAGS=${COVER_CONFIG_FLAGS} ${COVER_REPORT_FLAGS}
Expand Down Expand Up @@ -45,6 +45,7 @@ clean-test-all: clean-test

lint:
flake8 importanize tests
python -m importanize tests/ importanize/ tests/ --ci

test:
nosetests ${NOSE_FLAGS} tests/
Expand All @@ -59,9 +60,11 @@ check: lint clean-build clean-pyc clean-test 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

docs:
Expand Down
2 changes: 1 addition & 1 deletion importanize/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

__author__ = 'Miroslav Shubernetskiy'
__email__ = 'miroslav@miki725.com'
__version__ = '0.4.1'
__version__ = '0.5'
__description__ = (
'Utility for organizing Python imports using PEP8 or custom rules'
)
Loading

0 comments on commit 17600b4

Please sign in to comment.