e890d60459
appveyor badge
2015-06-16 03:28:12 +02:00
5dbe565b6d
Merge branch 'master' of github.com:pytest-dev/pytest
2015-06-16 03:25:39 +02:00
8f09904c06
appveyor scripts
2015-06-16 03:25:28 +02:00
c0db143d4a
Merge pull request #777 from bubenkoff/appveyor-integration
...
appveyor integration
2015-06-16 03:05:14 +02:00
534dbacc80
appveyor integration
2015-06-16 02:58:07 +02:00
af439e7d74
Merge pull request #775 from bubenkoff/pass-coveralls-env
...
pass coveralls env
2015-06-16 02:39:17 +02:00
b38cadbecd
pass coveralls env
2015-06-16 02:38:52 +02:00
edfadf3a7c
pass coveralls env
2015-06-16 01:12:24 +02:00
ae66683998
Merge pull request #773 from pytest-dev/remove-hg-files
...
Remove hgignore and hgtags files
2015-06-16 01:06:47 +02:00
4a8a4cb21b
Merge pull request #770 from bubenkoff/add-travis-badge
...
add travis badge
2015-06-15 20:04:32 -03:00
ccebf8e1d6
add travis badge
2015-06-16 01:03:38 +02:00
8663be34b4
Remove hgignore and hgtags files
2015-06-15 20:02:41 -03:00
502a372405
Merge pull request #771 from pytest-dev/use-travis-containers
...
use travis containers
2015-06-15 19:56:34 -03:00
088ead2477
Merge pull request #772 from bubenkoff/split-travis-jobs
...
split travis jobs
2015-06-15 19:56:20 -03:00
f2494ecb3d
split travis jobs
2015-06-16 00:49:55 +02:00
e9e01f2c9c
use travis containers
2015-06-16 00:22:16 +02:00
d4e77faea7
Update sidebar links from Bitbucket to GitHub
2015-06-15 19:18:03 -03:00
ff58ae66c0
Update CONTRIBUTING documentation with GitHub instructions
2015-06-15 18:54:44 -03:00
b40f760cc3
Change links from bitbucket to GitHub
2015-06-15 18:28:31 -03:00
42e7456780
Merged in RonnyPfannschmidt/pytest/regendoc-upgrade (pull request #303 )
...
use regendoc normalization and regenerate docs
2015-06-10 10:44:38 +01:00
43d27ec7ed
use regendoc normalization and regenerate docs
...
--HG--
branch : regendoc-upgrade
2015-06-06 23:30:49 +02:00
645ddc917f
make regendoc a direct requirement
2015-06-06 14:15:23 +02:00
33a7f03ccc
sort AUTHORS and add Janne
2015-06-06 13:38:25 +02:00
8b53a72dde
add Janne`s changes to CHANGELOG
2015-06-06 11:53:34 +02:00
8ee73e028f
Merged in jpvanhal/pytest/include-setup-teardown-duration-in-junitxml (pull request #287 )
...
Include setup and teardown in junitxml test durations
2015-06-06 11:50:37 +02:00
ca44e88e54
backport fixed issue735
...
--HG--
branch : pytest-2.7
2015-06-04 07:52:25 +02:00
304fc4f222
Merged in issue735 (pull request #302 )
...
use NameConstant node when it exists (fixes #735 )
2015-06-04 07:48:53 +02:00
09edb813bc
Close branch issue735
...
--HG--
branch : issue735
2015-06-04 07:48:53 +02:00
f3ad2e4ad2
use NameConstant node when it exists ( fixes #735 )
...
--HG--
branch : issue735
2015-06-03 18:07:10 -05:00
a2bb2ff164
port typo fix
2015-06-03 23:43:12 +02:00
b5fd3cfb84
fix typo
...
--HG--
branch : pytest-2.7
2015-06-03 23:42:38 +02:00
c037f52878
fix issue741: make running output from testdir.run copy/pasteable
2015-06-03 23:40:42 +02:00
584cccf7ec
Merged in nicoddemus/pytest/issue-741-pytester-output (pull request #293 )
...
Make "running" output from testdir.run copy/pastable
2015-06-03 23:40:08 +02:00
c92467df2f
add changelog for latest merge
2015-06-03 23:39:00 +02:00
ad08bf79e7
Merged in The-Compiler/pytest (pull request #298 )
...
Fix monkeypatch.setenv with string and raising=False.
2015-06-03 23:37:26 +02:00
dc727832a0
Close branch pytest-2.7
...
--HG--
branch : pytest-2.7
2015-06-03 23:34:38 +02:00
22c62dbd90
Merged in flub/pytest (pull request #299 )
...
Ignore emacs' .dir-locals.el file
2015-06-03 23:34:13 +02:00
d220be8468
Use platform.python_version() to show Python version number
...
This results in something like "3.5.0b2" for non-final releases
while still being "3.5.0" for final releases.
2015-05-31 20:31:31 +01:00
b09be4e3ef
Merged in flub/pytest (pull request #297 )
...
Merge 2.7.1 release changes into default
2015-05-31 20:27:13 +01:00
efce2ababa
add in missing finalizer to doc example
2015-05-21 19:15:52 -07:00
773b8b69dd
Ignore emacs' .dir-locals.el file
...
This can be used to e.g. automatically set a specific syntax
checker or virtualenv to activate.
2015-05-20 10:33:13 +01:00
ff8d787cd5
Fix monkeypatch.setenv with string and raising=False.
...
Fixes #746 .
2015-05-19 22:59:49 +02:00
d299f0d99f
Merge changes from 2.7.1 release
...
This is mostly doc examples regeneration, other changes are:
- Add 2.7.1 tag to .hgtags
- Update changelog to use real versions
- Update HOWTORELEASE.rst
- Fix rst in doc/en/adopt.txt
- Fix CHANGELOG and release-2.7.0 rst formatting
2015-05-19 21:43:50 +01:00
bf837164b4
Add how to upload a wheel and tag the release
...
--HG--
branch : pytest-2.7
2015-05-19 09:32:21 +01:00
f6d589caa1
Added tag 2.7.1 for changeset edc1d080bab5
...
--HG--
branch : pytest-2.7
2015-05-19 09:26:59 +01:00
738c8762df
Regenerate docs using 2.7.1
...
--HG--
branch : pytest-2.7
2015-05-19 01:54:24 +01:00
3d990a6237
Fix rest formatting and set final version number
...
--HG--
branch : pytest-2.7
2015-05-19 01:53:06 +01:00
b024dbe794
Remove unused link
...
--HG--
branch : pytest-2.7
2015-05-19 01:52:33 +01:00
83a93e5e9a
More updates/fixes to release process
...
Some of this is temporary, but this is how I got things to work.
--HG--
branch : pytest-2.7
2015-05-19 01:52:06 +01:00
504b6b72a9
Set 2.7.1 version number
...
--HG--
branch : pytest-2.7
2015-05-19 01:50:32 +01:00
Anatoly Bubenkov
Bruno Oliveira
Floris Bruynooghe
Ronny Pfannschmidt
holger krekel
Benjamin Peterson
Darren Yin
Florian Bruhin