From 6c37a51f950b6f73f31d20d7e7b9d97674674032 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Wed, 27 Jan 2016 08:28:18 -0200 Subject: [PATCH 1/6] Fix version at the top of the CHANGELOG --- CHANGELOG | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 4bd2fee28..ceac3efe4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,5 @@ -2.8.2.dev1 ------ +2.8.8.dev1 +---------- 2.8.7 ----- From dd0062c17748121a20c6f80e0ac13d7245555554 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Wed, 27 Jan 2016 08:59:26 -0200 Subject: [PATCH 2/6] Dummy change to test readthedocs hook --- ISSUES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/ISSUES.txt b/ISSUES.txt index cc4b3ecc9..081d727e8 100644 --- a/ISSUES.txt +++ b/ISSUES.txt @@ -18,6 +18,7 @@ Unlike mock, "args.path" acts on the parsed auto-spec'ed ``os.path.abspath`` so it's independent from if the client side called "os.path.abspath(path=...)" or "os.path.abspath('positional')". + refine parametrize API ------------------------------------------------------------- tags: critical feature From 70b5d5aee9484fc5cec48cdf68102bb3aba2514e Mon Sep 17 00:00:00 2001 From: holger krekel Date: Fri, 29 Jan 2016 14:52:07 +0100 Subject: [PATCH 3/6] sprint funding draft --- doc/en/announce/sprint-funding-2016.txt | 60 +++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 doc/en/announce/sprint-funding-2016.txt diff --git a/doc/en/announce/sprint-funding-2016.txt b/doc/en/announce/sprint-funding-2016.txt new file mode 100644 index 000000000..0bd84c4fd --- /dev/null +++ b/doc/en/announce/sprint-funding-2016.txt @@ -0,0 +1,60 @@ + +call for (funding of) the next pytest-sprint +====================================================== + +The pytest core group is looking for donations or invoiced +money from companies and individuals in order to fund travels +and accomodation for the next pytest sprint, June 20-26th 2016 +in Freiburg, Germany. If this works out you can expect some +great new developments in the python testing space to be released +in 2016. Here is a short list of preliminary topics: + +- improving pytest-xdist test scheduling to take into account + fixture setups and explicit user hints. + +- provide info on fixture dependencies during --collect-only + +- tying pytest-xdist to tox so that you can do "py.test -e py34" + to run tests in a particular tox-managed virtualenv. Also + look into making pytest-xdist use tox environments on + remote ssh-sides so that remote dependency management becomes + easier. + +- refactoring the fixture system so more people understand it :) + +- integrating PyUnit setup methods as autouse fixtures. + possibly adding ways to influence ordering of same-scoped + fixtures (so you can make a choice of which fixtures come + before others) + +- fixing bugs and issues from the tracker (endless source :) + +The sprint is going to take place for several days with a break +day in between in the black forest town Freiburg in Germany. + +Here are some participants who said they could likely come, +given some funding:: + + Andreas Pelme, Sweden + Brianna Laughner, Australia + Bruno Oliveira, Brazil + Florian Bruhin, Switzerland + Florian Bruynooghe, UK + Holger Krekel, Germany + Omar Kohl, Germany + Raphael Pierzina, US/UK + +Other contributors and newcomers are invited to join as well but please +send a mail to the pytest-dev mailing list if you intend to do so +somewhat soon. If you are working for a company and using pytest heavily +you are welcome to join and we also encourage your company to provide +some funding for the sprint. They may see it, and rightfully so, as a +very cheap training which brings you together with the experts in the +field :) + +The money we need to the travels and accommodation is estimated to +be around 6000 Euro currently. If you are a company and paying is easier +for you to process via an invoice, Holger's company http://merlinux.eu can +invoice you for the sprint and will channel the funds to the +participants. + From 545bf0d5a10458b595ade57c79f08285a7992cd3 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Fri, 29 Jan 2016 15:43:15 +0100 Subject: [PATCH 4/6] a few refinements --- doc/en/announce/sprint-funding-2016.txt | 30 +++++++++++++------------ 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/doc/en/announce/sprint-funding-2016.txt b/doc/en/announce/sprint-funding-2016.txt index 0bd84c4fd..539887f5d 100644 --- a/doc/en/announce/sprint-funding-2016.txt +++ b/doc/en/announce/sprint-funding-2016.txt @@ -27,13 +27,14 @@ in 2016. Here is a short list of preliminary topics: fixtures (so you can make a choice of which fixtures come before others) -- fixing bugs and issues from the tracker (endless source :) +- fixing bugs and issues from the tracker, really an endless source :) The sprint is going to take place for several days with a break -day in between in the black forest town Freiburg in Germany. +day in between in the black forest town Freiburg in Germany +which also means we are going to do some hiking likely. -Here are some participants who said they could likely come, -given some funding:: +Here are preliminary participants who said they are likely to come, +given some expenses funding:: Andreas Pelme, Sweden Brianna Laughner, Australia @@ -46,15 +47,16 @@ given some funding:: Other contributors and newcomers are invited to join as well but please send a mail to the pytest-dev mailing list if you intend to do so -somewhat soon. If you are working for a company and using pytest heavily -you are welcome to join and we also encourage your company to provide -some funding for the sprint. They may see it, and rightfully so, as a -very cheap training which brings you together with the experts in the -field :) +somewhat soon, also how much funding you need if so. And if you are +working for a company and using pytest heavily you are welcome to join +and we encourage your company to provide some funding for the +sprint. They may see it, and rightfully so, as a very cheap and deep +training which brings you together with the experts in the field :) -The money we need to the travels and accommodation is estimated to -be around 6000 Euro currently. If you are a company and paying is easier -for you to process via an invoice, Holger's company http://merlinux.eu can -invoice you for the sprint and will channel the funds to the -participants. +The money we need for travels and accommodation is estimated to +sum up around 6000 Euro currently. If you are a company and paying is easier +for you to process after an invoice, Holger's company http://merlinux.eu +can invoice you for the sprint and will channel the funds to the +sprint budget. If we get excess money we'll use it for funding +future sprints. From c0024a723db2354c2b12fe518afcc36ac321492d Mon Sep 17 00:00:00 2001 From: holger krekel Date: Sat, 30 Jan 2016 19:12:41 +0100 Subject: [PATCH 5/6] fixed name --- doc/en/announce/sprint-funding-2016.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/en/announce/sprint-funding-2016.txt b/doc/en/announce/sprint-funding-2016.txt index 539887f5d..f2716a785 100644 --- a/doc/en/announce/sprint-funding-2016.txt +++ b/doc/en/announce/sprint-funding-2016.txt @@ -39,7 +39,7 @@ given some expenses funding:: Andreas Pelme, Sweden Brianna Laughner, Australia Bruno Oliveira, Brazil - Florian Bruhin, Switzerland + Floris Bruhin, Switzerland Florian Bruynooghe, UK Holger Krekel, Germany Omar Kohl, Germany From 30e61f277700891aa7ce1dd84aef4f6d4421279b Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Sat, 30 Jan 2016 20:48:15 -0200 Subject: [PATCH 6/6] Test with pypy and enable coveralls in AppVeyor * Install pypy using chocolatey * Enable coveralls test environment in AppVeyor * Suggest maintaining build matrix in .travis.yml by using "tox --listenvs" Fix #1254 --- .travis.yml | 22 +++++++++++----------- appveyor.yml | 29 +++++++++++++++++++---------- tox.ini | 4 ++-- 3 files changed, 32 insertions(+), 23 deletions(-) diff --git a/.travis.yml b/.travis.yml index c3e301ca5..d26ce3a8e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,25 +7,25 @@ install: "pip install -U tox" # # command to run tests env: matrix: + # coveralls is not listed in tox's envlist, but should run in travis - TESTENV=coveralls - - TESTENV=doctesting + # note: please use "tox --listenvs" to populate the build matrix below - TESTENV=flakes - TESTENV=py26 - TESTENV=py27 - - TESTENV=py27-cxfreeze - - TESTENV=py27-nobyte - - TESTENV=py27-pexpect - - TESTENV=py27-subprocess - - TESTENV=py27-trial - - TESTENV=py27-xdist - - TESTENV=py33 - TESTENV=py33 - TESTENV=py34 - - TESTENV=py35-pexpect - - TESTENV=py35-trial - - TESTENV=py35-xdist - TESTENV=py35 - TESTENV=pypy + - TESTENV=py27-pexpect + - TESTENV=py27-xdist + - TESTENV=py27-trial + - TESTENV=py35-pexpect + - TESTENV=py35-xdist + - TESTENV=py35-trial + - TESTENV=py27-nobyte + - TESTENV=doctesting + - TESTENV=py27-cxfreeze script: tox --recreate -e $TESTENV diff --git a/appveyor.yml b/appveyor.yml index 73948b5b6..13d53979b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,19 +1,28 @@ +environment: + COVERALLS_REPO_TOKEN: + secure: 2NJ5Ct55cHJ9WEg3xbSqCuv0rdgzzb6pnzOIG5OkMbTndw3wOBrXntWFoQrXiMFi + # this is pytest's token in coveralls.io, encrypted + # using pytestbot account as detailed here: + # https://www.appveyor.com/docs/build-configuration#secure-variables + install: - echo Installed Pythons - dir c:\Python* + # install pypy using choco (redirect to a file and write to console in case + # choco install returns non-zero, because choco install python.pypy is too + # noisy) + - choco install python.pypy > pypy-inst.log 2>&1 || (type pypy-inst.log & exit /b 1) + - set PATH=C:\tools\pypy\pypy;%PATH% # so tox can find pypy + - echo PyPy installed + - pypy --version + - C:\Python35\python -m pip install tox build: false # Not a C# project, build stuff at the test step instead. test_script: - - 'set TESTENVS= - flakes, - py26, - py27, - py33, - py34, - py27-xdist, - py35-xdist - ' - - C:\Python35\python -m tox -e "%TESTENVS%" + - C:\Python35\python -m tox + # coveralls is not in tox's envlist, plus for PRs the secure variable + # is not defined so we have to check for it + - if defined COVERALLS_REPO_TOKEN C:\Python35\python -m tox -e coveralls diff --git a/tox.ini b/tox.ini index 64d84b2f3..a828d3159 100644 --- a/tox.ini +++ b/tox.ini @@ -131,7 +131,7 @@ commands= [testenv:coveralls] -passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH +passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH COVERALLS_REPO_TOKEN usedevelop=True basepython=python3.4 changedir=. @@ -139,7 +139,7 @@ deps = {[testenv]deps} coveralls commands= - coverage run --source=_pytest {envdir}/bin/py.test testing + coverage run --source=_pytest -m pytest testing coverage report -m coveralls