Skip to content
This repository has been archived by the owner on Aug 4, 2022. It is now read-only.

Commit

Permalink
Bug 1464082 - Vendor pytest via |mach vendor python|; r=ahal
Browse files Browse the repository at this point in the history
Updated to 3.2.5.

MozReview-Commit-ID: 34OG1iGeMVW
  • Loading branch information
davehunt committed May 24, 2018
1 parent 1b649d8 commit 12de404
Show file tree
Hide file tree
Showing 451 changed files with 73,420 additions and 9,023 deletions.
1 change: 1 addition & 0 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ pipenv = "==2018.5.18"
virtualenv = "==15.2.0"
six = "==1.10.0"
attrs = "==18.1.0"
pytest = "==3.2.5"

[requires]
python_version = "2.7"
17 changes: 16 additions & 1 deletion Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions third_party/python/py/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.dump eol=lf
12 changes: 12 additions & 0 deletions third_party/python/py/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@

.cache/
.tox/
__pycache__/

*.pyc
*.pyo

*.egg-info
.eggs/

dist/*
29 changes: 29 additions & 0 deletions third_party/python/py/.hgignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@

# Automatically generated by `hgimportsvn`
syntax:glob
.svn
.hgsvn

# These lines are suggested according to the svn:ignore property
# Feel free to enable them by uncommenting them
syntax:glob
*.pyc
*.pyo
*.swp
*.html
*.class
*.orig
*~

doc/_build
build/
dist/
*.egg-info
issue/
env/
3rdparty/
.tox
lib/
bin/
include/
src/
27 changes: 27 additions & 0 deletions third_party/python/py/.travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
sudo: false
language: python
python:
- '2.7'
- '3.4'
- '3.5'
- '3.6'
- 'pypy-5.4'
env:
- DEPS="pytest~=2.9.0"
- DEPS="pytest~=3.0.0"
#- DEPS="pytest~=3.1.0"

matrix:

include:
- python: '2.7'
# using a different option due to pytest-addopts pytester issues
env: PYTEST_XADDOPTS="-n 3 --runslowtests" DEPS="pytest~=3.0.0 pytest-xdist"
allow_failures:
- python: 'pypy-5.4'
install:
- pip install -U setuptools setuptools_scm
- pip install $DEPS
- pip install -U . --force-reinstall
script:
- py.test --lsof $PYTEST_XADDOPTS
24 changes: 24 additions & 0 deletions third_party/python/py/AUTHORS
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
Holger Krekel, holger at merlinux eu
Benjamin Peterson, benjamin at python org
Ronny Pfannschmidt, Ronny.Pfannschmidt at gmx de
Guido Wesdorp, johnny at johnnydebris net
Samuele Pedroni, pedronis at openend se
Carl Friedrich Bolz, cfbolz at gmx de
Armin Rigo, arigo at tunes org
Maciek Fijalkowski, fijal at genesilico pl
Brian Dorsey, briandorsey at gmail com
Floris Bruynooghe, flub at devork be
merlinux GmbH, Germany, office at merlinux eu

Contributors include::

Ross Lawley
Ralf Schmitt
Chris Lamb
Harald Armin Massa
Martijn Faassen
Ian Bicking
Jan Balster
Grig Gheorghiu
Bob Ippolito
Christian Tismer
Loading

0 comments on commit 12de404

Please sign in to comment.