Hello community,
here is the log from the commit of package python-pytest-isort for
openSUSE:Factory checked in at 2019-02-15 10:02:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pytest-isort (Old)
and /work/SRC/openSUSE:Factory/.python-pytest-isort.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pytest-isort"
Fri Feb 15 10:02:42 2019 rev:2 rq:676054 version:0.2.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pytest-isort/python-pytest-isort.changes
2018-05-15 10:32:44.465644570 +0200
+++
/work/SRC/openSUSE:Factory/.python-pytest-isort.new.28833/python-pytest-isort.changes
2019-02-15 10:02:44.991619023 +0100
@@ -1,0 +2,6 @@
+Thu Feb 14 14:11:43 UTC 2019 - Tomáš Chvátal <[email protected]>
+
+- Update to 0.2.1:
+ * Drop "pytest-cache" dependency, not required anymore - part of py.test
itself
+
+-------------------------------------------------------------------
Old:
----
pytest-isort-0.2.0.tar.gz
New:
----
0.2.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pytest-isort.spec ++++++
--- /var/tmp/diff_new_pack.9LhU5o/_old 2019-02-15 10:02:45.543618845 +0100
+++ /var/tmp/diff_new_pack.9LhU5o/_new 2019-02-15 10:02:45.547618843 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-pytest-isort
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,34 +12,27 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%bcond_with test
Name: python-pytest-isort
-Version: 0.2.0
+Version: 0.2.1
Release: 0
Summary: Plugin for pytest to perform isort checks
License: BSD-3-Clause
Group: Development/Languages/Python
-Url: http://github.com/moccu/pytest-isort/
-Source:
https://files.pythonhosted.org/packages/source/p/pytest-isort/pytest-isort-%{version}.tar.gz
-BuildRequires: %{python_module devel}
+URL: http://github.com/moccu/pytest-isort/
+Source: https://github.com/moccu/pytest-isort/archive/%{version}.tar.gz
+BuildRequires: %{python_module isort >= 4.0}
+BuildRequires: %{python_module pytest >= 3.0}
BuildRequires: %{python_module setuptools}
-BuildRequires: python-rpm-macros
-%if %{with test}
-BuildRequires: %{python_module isort >= 3.9.6}
-BuildRequires: %{python_module pytest >= 2.6.4}
-BuildRequires: %{python_module pytest-cache >= 1.0}
-%endif
BuildRequires: fdupes
-Requires: python-isort >= 3.9.6
-Requires: python-pytest >= 2.6.4
-Requires: python-pytest-cache >= 1.0
+BuildRequires: python-rpm-macros
+Requires: python-isort >= 4.0
+Requires: python-pytest >= 3.0
BuildArch: noarch
-
%python_subpackages
%description
@@ -55,13 +48,10 @@
%python_install
%python_expand %fdupes %{buildroot}%{$python_sitelib}
-%if %{with test}
%check
-%python_exec setup.py test
-%endif
+%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib}
py.test-%{$python_bin_suffix} -v
%files %{python_files}
-%defattr(-,root,root,-)
%doc CHANGELOG.rst README.rst
%license LICENSE.rst
%{python_sitelib}/*
++++++ pytest-isort-0.2.0.tar.gz -> 0.2.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-isort-0.2.0/.editorconfig
new/pytest-isort-0.2.1/.editorconfig
--- old/pytest-isort-0.2.0/.editorconfig 1970-01-01 01:00:00.000000000
+0100
+++ new/pytest-isort-0.2.1/.editorconfig 2018-09-11 10:20:57.000000000
+0200
@@ -0,0 +1,18 @@
+; http://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+indent_style = tab
+end_of_line = lf
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.py]
+indent_style = space
+indent_size = 4
+
+[*.rst]
+indent_style = space
+indent_size = 4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-isort-0.2.0/.gitignore
new/pytest-isort-0.2.1/.gitignore
--- old/pytest-isort-0.2.0/.gitignore 1970-01-01 01:00:00.000000000 +0100
+++ new/pytest-isort-0.2.1/.gitignore 2018-09-11 10:20:57.000000000 +0200
@@ -0,0 +1,7 @@
+*.egg
+*.pyc
+/build
+/dist
+/.tox
+.cache
+.pytest_cache
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-isort-0.2.0/.python-version
new/pytest-isort-0.2.1/.python-version
--- old/pytest-isort-0.2.0/.python-version 1970-01-01 01:00:00.000000000
+0100
+++ new/pytest-isort-0.2.1/.python-version 2018-09-11 10:20:57.000000000
+0200
@@ -0,0 +1,4 @@
+2.7.14
+3.4.7
+3.5.5
+3.6.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-isort-0.2.0/.travis.yml
new/pytest-isort-0.2.1/.travis.yml
--- old/pytest-isort-0.2.0/.travis.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/pytest-isort-0.2.1/.travis.yml 2018-09-11 10:20:57.000000000 +0200
@@ -0,0 +1,12 @@
+language: python
+sudo: false
+
+python:
+ - "2.7"
+ - "3.4"
+ - "3.5"
+ - "3.6"
+
+script:
+ - pip install -e .
+ - py.test -vs --cache-clear
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-isort-0.2.0/CHANGELOG.rst
new/pytest-isort-0.2.1/CHANGELOG.rst
--- old/pytest-isort-0.2.0/CHANGELOG.rst 2018-05-07 12:24:11.000000000
+0200
+++ new/pytest-isort-0.2.1/CHANGELOG.rst 2018-09-11 10:20:57.000000000
+0200
@@ -1,6 +1,12 @@
Changelog
=========
+0.2.1 - 2018-09-11
+------------------
+
+* Drop "pytest-cache" dependency, not required anymore - part of py.test itself
+
+
0.2.0 - 2018-05-07
------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-isort-0.2.0/PKG-INFO
new/pytest-isort-0.2.1/PKG-INFO
--- old/pytest-isort-0.2.0/PKG-INFO 2018-05-07 12:25:44.000000000 +0200
+++ new/pytest-isort-0.2.1/PKG-INFO 1970-01-01 01:00:00.000000000 +0100
@@ -1,170 +0,0 @@
-Metadata-Version: 1.1
-Name: pytest-isort
-Version: 0.2.0
-Summary: py.test plugin to check import ordering using isort
-Home-page: http://github.com/moccu/pytest-isort/
-Author: Moccu GmbH & Co. KG
-Author-email: [email protected]
-License: BSD
-Description: py.test plugin to check import ordering using isort
- ===================================================
-
- .. image:: https://badge.fury.io/py/pytest-isort.svg
- :target: http://badge.fury.io/py/pytest-isort
-
- .. image:: https://travis-ci.org/moccu/pytest-isort.svg?branch=master
- :target: https://travis-ci.org/moccu/pytest-isort
-
-
- Usage
- -----
-
- install using ``pip``::
-
- pip install pytest-isort
-
- Activate isort checks when calling ``py.test``::
-
- py.test --isort
-
- This will execute an isort check against every ``.py`` file (if its
not ignored).
-
-
- Example
- -------
-
- Given you have some files with incorrect sorted imports::
-
- # content of file1.py
-
- import os
- import sys
- import random
-
- # content of file2.py
-
- import json
- import sys
- import os
-
- If you run ``py.test`` and activate the isort plugin you'll se
something like this::
-
- $ py.test --isort
- ========================= test session starts
==========================
- platform darwin -- Python 2.7.9 -- py-1.4.26 -- pytest-2.6.4
- plugins: isort, cache
- collected 2 items
-
- file1.py F
- file2.py F
-
- =============================== FAILURES
===============================
- _____________________________ isort-check
______________________________
- ERROR: file1.py Imports are incorrectly sorted.
-
- import os
- +import random
- import sys
- -import random
- _____________________________ isort-check
______________________________
- ERROR: file2.py Imports are incorrectly sorted.
-
- import json
- +import os
- import sys
- -import os
- ======================= 2 failed in 0.02 seconds
=======================
-
- If you can't change the import ordering for ``file2.py``, you have the
option to
- exclude ``file2.py`` from isort checks.
-
- Simply add the ``isort_ignore`` setting to your ``py.test``
configuration file::
-
- [pytest]
- isort_ignore =
- file2.py
-
- Then re-run the tests::
-
- $ py.test --isort
- ========================= test session starts
==========================
- platform darwin -- Python 2.7.9 -- py-1.4.26 -- pytest-2.6.4
- plugins: isort, cache
- collected 1 items
-
- file1.py F
-
- =============================== FAILURES
===============================
- _____________________________ isort-check
______________________________
- ERROR: file1.py Imports are incorrectly sorted.
-
- import os
- +import random
- import sys
- -import random
- ======================= 1 failed in 0.02 seconds
=======================
-
- As you can see, ``file2.py`` is ignored and not checked. Now fix the
- import ordering in ``file1.py`` and re-run the tests::
-
- $ py.test --isort
- ========================= test session starts
==========================
- platform darwin -- Python 2.7.9 -- py-1.4.26 -- pytest-2.6.4
- plugins: isort, cache
- collected 1 items
-
- file1.py .
-
- ======================= 1 passed in 0.01 seconds
======================
-
- Everything is properly again. Congratulations!
-
- If you run your testsuite again and again, ``py.test`` will only check
changed
- files to speed up. You see this by adding ``-rs`` to your ``py.test``
options::
-
- $ py.test --isort -rs
- ========================= test session starts
==========================
- platform darwin -- Python 2.7.9 -- py-1.4.26 -- pytest-2.6.4
- plugins: isort, cache
- collected 1 items
-
- file1.py s
- ======================= short test summary info
========================
- SKIP [1] pytest_isort.py:145: file(s) previously passed isort
checks
-
- ====================== 1 skipped in 0.01 seconds
======================
-
-
- Configuration
- -------------
-
- You can exclude files from isort checks by using the ``isort_ignore``
- setting in your ``py.test`` configuration file (e.g. ``pytest.ini``)::
-
- # content of setup.cfg
- [pytest]
- isort_ignore =
- docs/conf.py
- *migrations/*.py
-
- This will ignore the ``conf.py`` python file inside the ``docs``
folder and
- also ignore any python file in ``migrations`` folders.
-
- Notes
- -----
-
- You can use ``isort`` to rewrite your python files and re-order the
imports but
- this is not part of this plugin.
-
-Platform: UNKNOWN
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.4
-Classifier: Programming Language :: Python :: 3.5
-Classifier: Programming Language :: Python :: 3.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-isort-0.2.0/README.rst
new/pytest-isort-0.2.1/README.rst
--- old/pytest-isort-0.2.0/README.rst 2018-05-07 10:27:27.000000000 +0200
+++ new/pytest-isort-0.2.1/README.rst 2018-09-11 10:20:57.000000000 +0200
@@ -28,13 +28,13 @@
Given you have some files with incorrect sorted imports::
# content of file1.py
-
+
import os
import sys
import random
-
+
# content of file2.py
-
+
import json
import sys
import os
@@ -44,23 +44,23 @@
$ py.test --isort
========================= test session starts ==========================
platform darwin -- Python 2.7.9 -- py-1.4.26 -- pytest-2.6.4
- plugins: isort, cache
+ plugins: isort
collected 2 items
-
+
file1.py F
file2.py F
-
+
=============================== FAILURES ===============================
_____________________________ isort-check ______________________________
ERROR: file1.py Imports are incorrectly sorted.
-
+
import os
+import random
import sys
-import random
_____________________________ isort-check ______________________________
ERROR: file2.py Imports are incorrectly sorted.
-
+
import json
+import os
import sys
@@ -81,15 +81,15 @@
$ py.test --isort
========================= test session starts ==========================
platform darwin -- Python 2.7.9 -- py-1.4.26 -- pytest-2.6.4
- plugins: isort, cache
+ plugins: isort
collected 1 items
-
+
file1.py F
-
+
=============================== FAILURES ===============================
_____________________________ isort-check ______________________________
ERROR: file1.py Imports are incorrectly sorted.
-
+
import os
+import random
import sys
@@ -102,11 +102,11 @@
$ py.test --isort
========================= test session starts ==========================
platform darwin -- Python 2.7.9 -- py-1.4.26 -- pytest-2.6.4
- plugins: isort, cache
+ plugins: isort
collected 1 items
-
+
file1.py .
-
+
======================= 1 passed in 0.01 seconds ======================
Everything is properly again. Congratulations!
@@ -117,13 +117,13 @@
$ py.test --isort -rs
========================= test session starts ==========================
platform darwin -- Python 2.7.9 -- py-1.4.26 -- pytest-2.6.4
- plugins: isort, cache
+ plugins: isort
collected 1 items
-
+
file1.py s
======================= short test summary info ========================
SKIP [1] pytest_isort.py:145: file(s) previously passed isort checks
-
+
====================== 1 skipped in 0.01 seconds ======================
@@ -135,7 +135,7 @@
# content of setup.cfg
[pytest]
- isort_ignore =
+ isort_ignore =
docs/conf.py
*migrations/*.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-isort-0.2.0/pytest_isort.egg-info/PKG-INFO
new/pytest-isort-0.2.1/pytest_isort.egg-info/PKG-INFO
--- old/pytest-isort-0.2.0/pytest_isort.egg-info/PKG-INFO 2018-05-07
12:25:44.000000000 +0200
+++ new/pytest-isort-0.2.1/pytest_isort.egg-info/PKG-INFO 1970-01-01
01:00:00.000000000 +0100
@@ -1,170 +0,0 @@
-Metadata-Version: 1.1
-Name: pytest-isort
-Version: 0.2.0
-Summary: py.test plugin to check import ordering using isort
-Home-page: http://github.com/moccu/pytest-isort/
-Author: Moccu GmbH & Co. KG
-Author-email: [email protected]
-License: BSD
-Description: py.test plugin to check import ordering using isort
- ===================================================
-
- .. image:: https://badge.fury.io/py/pytest-isort.svg
- :target: http://badge.fury.io/py/pytest-isort
-
- .. image:: https://travis-ci.org/moccu/pytest-isort.svg?branch=master
- :target: https://travis-ci.org/moccu/pytest-isort
-
-
- Usage
- -----
-
- install using ``pip``::
-
- pip install pytest-isort
-
- Activate isort checks when calling ``py.test``::
-
- py.test --isort
-
- This will execute an isort check against every ``.py`` file (if its
not ignored).
-
-
- Example
- -------
-
- Given you have some files with incorrect sorted imports::
-
- # content of file1.py
-
- import os
- import sys
- import random
-
- # content of file2.py
-
- import json
- import sys
- import os
-
- If you run ``py.test`` and activate the isort plugin you'll se
something like this::
-
- $ py.test --isort
- ========================= test session starts
==========================
- platform darwin -- Python 2.7.9 -- py-1.4.26 -- pytest-2.6.4
- plugins: isort, cache
- collected 2 items
-
- file1.py F
- file2.py F
-
- =============================== FAILURES
===============================
- _____________________________ isort-check
______________________________
- ERROR: file1.py Imports are incorrectly sorted.
-
- import os
- +import random
- import sys
- -import random
- _____________________________ isort-check
______________________________
- ERROR: file2.py Imports are incorrectly sorted.
-
- import json
- +import os
- import sys
- -import os
- ======================= 2 failed in 0.02 seconds
=======================
-
- If you can't change the import ordering for ``file2.py``, you have the
option to
- exclude ``file2.py`` from isort checks.
-
- Simply add the ``isort_ignore`` setting to your ``py.test``
configuration file::
-
- [pytest]
- isort_ignore =
- file2.py
-
- Then re-run the tests::
-
- $ py.test --isort
- ========================= test session starts
==========================
- platform darwin -- Python 2.7.9 -- py-1.4.26 -- pytest-2.6.4
- plugins: isort, cache
- collected 1 items
-
- file1.py F
-
- =============================== FAILURES
===============================
- _____________________________ isort-check
______________________________
- ERROR: file1.py Imports are incorrectly sorted.
-
- import os
- +import random
- import sys
- -import random
- ======================= 1 failed in 0.02 seconds
=======================
-
- As you can see, ``file2.py`` is ignored and not checked. Now fix the
- import ordering in ``file1.py`` and re-run the tests::
-
- $ py.test --isort
- ========================= test session starts
==========================
- platform darwin -- Python 2.7.9 -- py-1.4.26 -- pytest-2.6.4
- plugins: isort, cache
- collected 1 items
-
- file1.py .
-
- ======================= 1 passed in 0.01 seconds
======================
-
- Everything is properly again. Congratulations!
-
- If you run your testsuite again and again, ``py.test`` will only check
changed
- files to speed up. You see this by adding ``-rs`` to your ``py.test``
options::
-
- $ py.test --isort -rs
- ========================= test session starts
==========================
- platform darwin -- Python 2.7.9 -- py-1.4.26 -- pytest-2.6.4
- plugins: isort, cache
- collected 1 items
-
- file1.py s
- ======================= short test summary info
========================
- SKIP [1] pytest_isort.py:145: file(s) previously passed isort
checks
-
- ====================== 1 skipped in 0.01 seconds
======================
-
-
- Configuration
- -------------
-
- You can exclude files from isort checks by using the ``isort_ignore``
- setting in your ``py.test`` configuration file (e.g. ``pytest.ini``)::
-
- # content of setup.cfg
- [pytest]
- isort_ignore =
- docs/conf.py
- *migrations/*.py
-
- This will ignore the ``conf.py`` python file inside the ``docs``
folder and
- also ignore any python file in ``migrations`` folders.
-
- Notes
- -----
-
- You can use ``isort`` to rewrite your python files and re-order the
imports but
- this is not part of this plugin.
-
-Platform: UNKNOWN
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.4
-Classifier: Programming Language :: Python :: 3.5
-Classifier: Programming Language :: Python :: 3.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-isort-0.2.0/pytest_isort.egg-info/SOURCES.txt
new/pytest-isort-0.2.1/pytest_isort.egg-info/SOURCES.txt
--- old/pytest-isort-0.2.0/pytest_isort.egg-info/SOURCES.txt 2018-05-07
12:25:44.000000000 +0200
+++ new/pytest-isort-0.2.1/pytest_isort.egg-info/SOURCES.txt 1970-01-01
01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-CHANGELOG.rst
-LICENSE.rst
-MANIFEST.in
-README.rst
-pytest_isort.py
-setup.py
-pytest_isort.egg-info/PKG-INFO
-pytest_isort.egg-info/SOURCES.txt
-pytest_isort.egg-info/dependency_links.txt
-pytest_isort.egg-info/entry_points.txt
-pytest_isort.egg-info/requires.txt
-pytest_isort.egg-info/top_level.txt
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/pytest-isort-0.2.0/pytest_isort.egg-info/dependency_links.txt
new/pytest-isort-0.2.1/pytest_isort.egg-info/dependency_links.txt
--- old/pytest-isort-0.2.0/pytest_isort.egg-info/dependency_links.txt
2018-05-07 12:25:44.000000000 +0200
+++ new/pytest-isort-0.2.1/pytest_isort.egg-info/dependency_links.txt
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/pytest-isort-0.2.0/pytest_isort.egg-info/entry_points.txt
new/pytest-isort-0.2.1/pytest_isort.egg-info/entry_points.txt
--- old/pytest-isort-0.2.0/pytest_isort.egg-info/entry_points.txt
2018-05-07 12:25:44.000000000 +0200
+++ new/pytest-isort-0.2.1/pytest_isort.egg-info/entry_points.txt
1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-[pytest11]
-isort = pytest_isort
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/pytest-isort-0.2.0/pytest_isort.egg-info/requires.txt
new/pytest-isort-0.2.1/pytest_isort.egg-info/requires.txt
--- old/pytest-isort-0.2.0/pytest_isort.egg-info/requires.txt 2018-05-07
12:25:44.000000000 +0200
+++ new/pytest-isort-0.2.1/pytest_isort.egg-info/requires.txt 1970-01-01
01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-pytest-cache>=1.0
-pytest>=3.0
-isort>=4.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/pytest-isort-0.2.0/pytest_isort.egg-info/top_level.txt
new/pytest-isort-0.2.1/pytest_isort.egg-info/top_level.txt
--- old/pytest-isort-0.2.0/pytest_isort.egg-info/top_level.txt 2018-05-07
12:25:44.000000000 +0200
+++ new/pytest-isort-0.2.1/pytest_isort.egg-info/top_level.txt 1970-01-01
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-pytest_isort
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-isort-0.2.0/pytest_isort.py
new/pytest-isort-0.2.1/pytest_isort.py
--- old/pytest-isort-0.2.0/pytest_isort.py 2018-05-07 12:24:11.000000000
+0200
+++ new/pytest-isort-0.2.1/pytest_isort.py 2018-09-11 10:20:57.000000000
+0200
@@ -6,7 +6,7 @@
import pytest
-__version__ = '0.2.0'
+__version__ = '0.2.1'
MTIMES_HISTKEY = 'isort/mtimes'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-isort-0.2.0/setup.cfg
new/pytest-isort-0.2.1/setup.cfg
--- old/pytest-isort-0.2.0/setup.cfg 2018-05-07 12:25:44.000000000 +0200
+++ new/pytest-isort-0.2.1/setup.cfg 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-[egg_info]
-tag_build =
-tag_date = 0
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-isort-0.2.0/setup.py
new/pytest-isort-0.2.1/setup.py
--- old/pytest-isort-0.2.0/setup.py 2018-05-07 12:24:11.000000000 +0200
+++ new/pytest-isort-0.2.1/setup.py 2018-09-11 10:20:57.000000000 +0200
@@ -15,7 +15,7 @@
name='pytest-isort',
description='py.test plugin to check import ordering using isort',
long_description=read('README.rst'),
- version='0.2.0',
+ version='0.2.1',
license='BSD',
author='Moccu GmbH & Co. KG',
author_email='[email protected]',
@@ -24,7 +24,6 @@
entry_points={'pytest11': ['isort = pytest_isort']},
test_suite='.',
install_requires=[
- 'pytest-cache>=1.0',
'pytest>=3.0',
'isort>=4.0'
],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-isort-0.2.0/test_isort.py
new/pytest-isort-0.2.1/test_isort.py
--- old/pytest-isort-0.2.0/test_isort.py 1970-01-01 01:00:00.000000000
+0100
+++ new/pytest-isort-0.2.1/test_isort.py 2018-09-11 10:20:57.000000000
+0200
@@ -0,0 +1,125 @@
+# -*- coding=utf-8 -*-
+from pytest_isort import FileIgnorer, IsortError
+
+
+pytest_plugins = 'pytester',
+
+
+def test_version():
+ import pytest_isort
+ assert pytest_isort.__version__
+
+
+def test_file_ignorer(tmpdir):
+ ignorer = FileIgnorer([
+ 'somefile.py',
+ '# Commented line',
+ 'folder1/file1.py',
+ 'folder2/* # With comment',
+ ])
+
+ assert ignorer.ignores == [
+ 'somefile.py',
+ 'folder1/file1.py',
+ 'folder2/*'
+ ]
+
+ assert ignorer(tmpdir.join('otherfile.py')) is False
+ assert ignorer(tmpdir.join('folder1/file1.py')) == 'folder1/file1.py'
+ assert ignorer(tmpdir.join('folder1/file2.py')) is False
+ assert ignorer(tmpdir.join('folder2/file1.py')) == 'folder2/*'
+
+
+class TestIsortError:
+ def test_no_output(self):
+ assert IsortError('').simplified_error() == ''
+
+ def test_no_diff(self):
+ expected = 'FOOBAR: Lorem ipsum 123'
+ assert IsortError('FOOBAR: Lorem ipsum 123').simplified_error() ==
expected
+
+ def test_with_diff(self):
+ isort_output = """ERROR: /path/to/foobar.py Imports are incorrectly
sorted.
+ --- /path/to/foobar.py:before
+ +++ /path/to/foobar.py:after
+ @@ 123,123
+ +import logging
+ import os
+ import tempfile
+ -import logging"""
+
+ expected_output = """ERROR: /path/to/foobar.py Imports are incorrectly
sorted.
+
+ +import logging
+ import os
+ import tempfile
+ -import logging"""
+
+ assert IsortError(isort_output).simplified_error() == expected_output
+
+
+def test_file_no_ignored(testdir):
+ testdir.tmpdir.ensure('file1.py')
+ testdir.tmpdir.ensure('file2.py')
+
+ result = testdir.runpytest('--isort')
+ result.stdout.fnmatch_lines([
+ 'file1.py*',
+ 'file2.py*',
+ '*2 passed*',
+ ])
+ assert result.ret == 0
+
+
+def test_file_ignored(testdir):
+ testdir.tmpdir.ensure('file1.py')
+ testdir.tmpdir.ensure('file2.py')
+
+ testdir.makeini("""
+ [pytest]
+ isort_ignore =
+ file2.py
+ file3.py
+ """)
+
+ result = testdir.runpytest('--isort')
+ result.stdout.fnmatch_lines([
+ 'file1.py*',
+ '*1 passed*',
+ ])
+ assert result.ret == 0
+
+def test_correctly_sorted(testdir):
+ test_file = testdir.makepyfile("""
+ import os
+ import sys
+ """)
+
+ # Ugly hack to append the missing newline.
+ test_file = test_file.write(test_file.read() + '\n')
+
+ result = testdir.runpytest('--isort', '--verbose')
+ result.stdout.fnmatch_lines([
+ '*test_correctly_sorted*PASSED*',
+ '*1 passed*',
+ ])
+ assert result.ret == 0
+
+
+def test_incorrectly_sorted(testdir):
+ test_file = testdir.makepyfile("""
+ import sys
+ import os
+ """)
+
+ # Ugly hack to append the missing newline.
+ test_file = test_file.write(test_file.read() + '\n')
+
+ result = testdir.runpytest('--isort', '-vv')
+ result.stdout.fnmatch_lines([
+ '*test_incorrectly_sorted*FAILED*',
+ '*FAILURES*',
+ '*isort-check*',
+ '*1 failed*',
+ ])
+ assert result.ret == 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-isort-0.2.0/tox.ini
new/pytest-isort-0.2.1/tox.ini
--- old/pytest-isort-0.2.0/tox.ini 1970-01-01 01:00:00.000000000 +0100
+++ new/pytest-isort-0.2.1/tox.ini 2018-09-11 10:20:57.000000000 +0200
@@ -0,0 +1,8 @@
+[tox]
+envlist=py27,py34,py35,py36
+
+[testenv]
+skipsdist = True
+commands =
+ pip install -e {toxinidir}
+ py.test -vs --cache-clear
