-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
py-pytest: update to 3.6.3 for py37 compatibility and add py37 subport
Ref: pytest-dev/pytest#3497 py37-pytest passed `py.test-3.7 -k 'not test_entry_points'`. test_entry_points fails as the pytest entry point is patched away
- Loading branch information
Chih-Hsuan Yen
authored and
Chih-Hsuan Yen
committed
Jul 9, 2018
1 parent
6bd11f9
commit 8b7abb5
Showing
2 changed files
with
16 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,11 @@ | ||
--- setup.py.orig 2017-12-05 23:41:58.000000000 +0300 | ||
+++ setup.py 2017-12-24 16:31:49.000000000 +0300 | ||
@@ -77,7 +77,7 @@ | ||
'Holger Krekel, Bruno Oliveira, Ronny Pfannschmidt, ' | ||
'Floris Bruynooghe, Brianna Laugher, Florian Bruhin and others'), | ||
entry_points={'console_scripts': [ | ||
- 'pytest=pytest:main', 'py.test=pytest:main']}, | ||
+ 'py.test=pytest:main']}, | ||
--- setup.py.orig 2018-07-06 23:28:02.000000000 +0800 | ||
+++ setup.py 2018-07-06 23:28:21.000000000 +0800 | ||
@@ -99,7 +99,7 @@ | ||
"Holger Krekel, Bruno Oliveira, Ronny Pfannschmidt, " | ||
"Floris Bruynooghe, Brianna Laugher, Florian Bruhin and others" | ||
), | ||
- entry_points={"console_scripts": ["pytest=pytest:main", "py.test=pytest:main"]}, | ||
+ entry_points={"console_scripts": ["py.test=pytest:main"]}, | ||
classifiers=classifiers, | ||
keywords="test unittest", | ||
cmdclass={'test': PyTest}, | ||
# the following should be enabled for release |