[152638] trunk/dports/python/py-pytest

[stromnov at macports.org]

Revision: 152638
          https://trac.macports.org/changeset/152638
Author:   stromnov at macports.org
Date:     2016-09-13 23:54:30 -0700 (Tue, 13 Sep 2016)
Log Message:
-----------
py-pytest: resolve conflict with py-logilab-common (#52242)

Modified Paths:
--------------
    trunk/dports/python/py-pytest/Portfile

Added Paths:
-----------
    trunk/dports/python/py-pytest/files/
    trunk/dports/python/py-pytest/files/patch-setup.py.diff

Modified: trunk/dports/python/py-pytest/Portfile
===================================================================
--- trunk/dports/python/py-pytest/Portfile	2016-09-14 04:09:04 UTC (rev 152637)
+++ trunk/dports/python/py-pytest/Portfile	2016-09-14 06:54:30 UTC (rev 152638)
@@ -6,7 +6,7 @@
 
 name                py-pytest
 version             3.0.2
-revision            0
+revision            1
 categories-append   devel
 platforms           darwin
 license             MIT
@@ -33,6 +33,8 @@
     depends_lib-append  port:py${python.version}-setuptools \
                         port:py${python.version}-py
 
+    patchfiles-append   patch-setup.py.diff
+
     livecheck.type      none
 } else {
     livecheck.type      pypi

Added: trunk/dports/python/py-pytest/files/patch-setup.py.diff
===================================================================
--- trunk/dports/python/py-pytest/files/patch-setup.py.diff	                        (rev 0)
+++ trunk/dports/python/py-pytest/files/patch-setup.py.diff	2016-09-14 06:54:30 UTC (rev 152638)
@@ -0,0 +1,11 @@
+--- setup.py.orig	2016-09-14 09:49:41.000000000 +0300
++++ setup.py	2016-09-14 09:50:00.000000000 +0300
+@@ -70,7 +70,7 @@
+         author='Holger Krekel, Bruno Oliveira, Ronny Pfannschmidt, Floris Bruynooghe, Brianna Laugher, Florian Bruhin and others',
+         author_email='holger at merlinux.eu',
+         entry_points={'console_scripts':
+-                          ['pytest=pytest:main', 'py.test=pytest:main']},
++                          ['py.test=pytest:main']},
+         classifiers=classifiers,
+         cmdclass={'test': PyTest},
+         # the following should be enabled for release
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160913/fb7d64a3/attachment.html>