[update to 1.7.0] Use shutil.get_terminal_size for correct terminal w…

…idth on windows

Bruno Oliveira (5):
      Merge pull request #197 from nicoddemus/release-1.6.0
      Fix test and add CHANGELOG for #174
      Merge pull request #199 from blueyed/PY_IGNORE_IMPORTMISMATCH
      Merge pull request #201 from Victorious3/issue174
      Update CHANGELOG for 1.7.0

Daniel Hahler (1):
      pyimport: add support for PY_IGNORE_IMPORTMISMATCH

Victorious3 (1):
      Use shutil.get_terminal_size for correct terminal width on windows

1.7.0 (2018-10-11)
==================

- fix #174: use ``shutil.get_terminal_size()`` in Python 3.3+ to determine the size of the
  terminal, which produces more accurate results than the previous method.

- fix pytest-dev/pytest#2042: introduce new ``PY_IGNORE_IMPORTMISMATCH`` environment variable
  that suppresses ``ImportMismatchError`` exceptions when set to ``1``.

ChangeLog

@@ -1,3 +1,13 @@
+1.7.0 (2018-10-11)
+==================
+
+- fix #174: use ``shutil.get_terminal_size()`` in Python 3.3+ to determine the size of the
+  terminal, which produces more accurate results than the previous method.
+
+- fix pytest-dev/pytest#2042: introduce new ``PY_IGNORE_IMPORTMISMATCH`` environment variable
+  that suppresses ``ImportMismatchError`` exceptions when set to ``1``.
+
+
 1.6.0 (2018-08-27)
 ==================
 

Makefile

@@ -1,5 +1,5 @@
 PKG_NAME := py
-URL = https://files.pythonhosted.org/packages/4f/38/5f427d1eedae73063ce4da680d2bae72014995f9fdeaa57809df61c968cd/py-1.6.0.tar.gz
+URL = https://files.pythonhosted.org/packages/c7/fa/eb6dd513d9eb13436e110aaeef9a1703437a8efa466ce6bb2ff1d9217ac7/py-1.7.0.tar.gz
 ARCHIVES = 
 
 include ../common/Makefile.common

buildreq_cache

@@ -1,2 +1,2 @@
-1.6.0
+1.7.0
 pytest

options.conf

@@ -1,6 +1,6 @@
 [package]
 name = py
-url = https://files.pythonhosted.org/packages/4f/38/5f427d1eedae73063ce4da680d2bae72014995f9fdeaa57809df61c968cd/py-1.6.0.tar.gz
+url = https://files.pythonhosted.org/packages/c7/fa/eb6dd513d9eb13436e110aaeef9a1703437a8efa466ce6bb2ff1d9217ac7/py-1.7.0.tar.gz
 archives = 
 giturl = https://github.com/pytest-dev/py.git
 
@@ -21,6 +21,8 @@ broken_parallel_build = false
 compat = false
 # set conservative build flags
 conservative_flags = false
+# dev package requires the extras to be installed
+dev_requires_extras = false
 # pass -ffast-math to compiler
 fast-math = false
 # optimize build for speed over size

py.spec

@@ -3,16 +3,16 @@
 # Generated by: autospec.py
 #
 Name     : py
-Version  : 1.6.0
-Release  : 53
-URL      : https://files.pythonhosted.org/packages/4f/38/5f427d1eedae73063ce4da680d2bae72014995f9fdeaa57809df61c968cd/py-1.6.0.tar.gz
-Source0  : https://files.pythonhosted.org/packages/4f/38/5f427d1eedae73063ce4da680d2bae72014995f9fdeaa57809df61c968cd/py-1.6.0.tar.gz
+Version  : 1.7.0
+Release  : 54
+URL      : https://files.pythonhosted.org/packages/c7/fa/eb6dd513d9eb13436e110aaeef9a1703437a8efa466ce6bb2ff1d9217ac7/py-1.7.0.tar.gz
+Source0  : https://files.pythonhosted.org/packages/c7/fa/eb6dd513d9eb13436e110aaeef9a1703437a8efa466ce6bb2ff1d9217ac7/py-1.7.0.tar.gz
 Summary  : library with cross-python path, ini-parsing, io, code, log facilities
 Group    : Development/Tools
 License  : MIT
-Requires: py-python3
-Requires: py-license
-Requires: py-python
+Requires: py-license = %{version}-%{release}
+Requires: py-python = %{version}-%{release}
+Requires: py-python3 = %{version}-%{release}
 BuildRequires : buildreq-distutils23
 BuildRequires : buildreq-distutils3
 BuildRequires : pytest
@@ -45,7 +45,7 @@ license components for the py package.
 %package python
 Summary: python components for the py package.
 Group: Default
-Requires: py-python3
+Requires: py-python3 = %{version}-%{release}
 
 %description python
 python components for the py package.
@@ -61,14 +61,14 @@ python3 components for the py package.
 
 
 %prep
-%setup -q -n py-1.6.0
+%setup -q -n py-1.7.0
 
 %build
 export http_proxy=http://127.0.0.1:9/
 export https_proxy=http://127.0.0.1:9/
 export no_proxy=localhost,127.0.0.1,0.0.0.0
 export LANG=C
-export SOURCE_DATE_EPOCH=1535827660
+export SOURCE_DATE_EPOCH=1539370715
 python2 setup.py build -b py2
 python3 setup.py build -b py3
 
@@ -78,10 +78,10 @@ export https_proxy=http://127.0.0.1:9/
 export no_proxy=localhost,127.0.0.1,0.0.0.0
 py.test --verbose ||:
 %install
-export SOURCE_DATE_EPOCH=1535827660
+export SOURCE_DATE_EPOCH=1539370715
 rm -rf %{buildroot}
-mkdir -p %{buildroot}/usr/share/doc/py
-cp LICENSE %{buildroot}/usr/share/doc/py/LICENSE
+mkdir -p %{buildroot}/usr/share/package-licenses/py
+cp LICENSE %{buildroot}/usr/share/package-licenses/py/LICENSE
 python2 -tt setup.py build -b py2 install --root=%{buildroot} --force
 python3 -tt setup.py build -b py3 install --root=%{buildroot} --force
 echo ----[ mark ]----
@@ -96,8 +96,8 @@ echo ----[ mark ]----
 /usr/lib/python2*/*
 
 %files license
-%defattr(-,root,root,-)
-/usr/share/doc/py/LICENSE
+%defattr(0644,root,root,0755)
+/usr/share/package-licenses/py/LICENSE
 
 %files python
 %defattr(-,root,root,-)

release

@@ -1 +1 @@
-53
+54

testresults

@@ -1,5 +1,5 @@
-Total : 39
+Total : 29
 Pass : 0
-Fail : 39
+Fail : 29
 Skip : 0
 XFail : 0

upstream

@@ -1 +1 @@
-b7196e40ff311d5f44e3bed2e0d3477f4f19559b/py-1.6.0.tar.gz
+6d54b3d60e84440c0f9b5a2ecc1a4b10c2e30d58/py-1.7.0.tar.gz