b74c626026
switch changelog management to towncrier
2017-05-30 15:54:15 +02:00
6117930642
Merge pull request #2438 from nicoddemus/issue-2434
...
Fix unicode issue while running doctests in Python 2
2017-05-29 13:36:07 +02:00
7bb06b6dad
Merge pull request #2439 from nicoddemus/warnings-docs
...
Warn that warning-capture can break existing suites in the docs and CHANGELOG
2017-05-29 13:34:39 +02:00
836dc451f4
Fix unicode issue while running doctests in Python 2
...
Fix #2434
2017-05-26 07:35:14 -03:00
53add4435f
Add ChangeLog
2017-05-26 13:14:42 +08:00
313a884459
Warn that warning-capture can break existing suites in the docs and CHANGELOG
...
Related to discussion in #2430
2017-05-25 21:19:08 -03:00
bd065a12bb
Fix up 3.1 changelog
2017-05-23 07:40:39 +02:00
f9df750025
Update 3.1.0 release date
2017-05-22 19:39:17 -03:00
0ff7f5d0c6
Prepare CHANGELOG for version 3.1.0
2017-05-19 19:10:09 -03:00
d86c89e193
Revert refactor of old-style to new-style classes
...
As discussed in the mailing list, unfortunately this might break APIs
due to the subtle differences between new and old-style classes (see #2398 ).
This reverts commit d4afa1554b#2179 .
2017-05-17 18:20:51 -03:00
bd708068ab
Merge branch 'features' into regendoc-reduce-version-noise
2017-05-14 14:34:07 -03:00
783670b84e
Merge pull request #2274 from dmand/feat/junitxml/suite-name-option
...
Add `junit_suite_name` ini option
2017-05-13 19:10:29 +02:00
2ab8d12fe3
Update changelog and add usage info
2017-05-12 17:48:50 -03:00
204db4d1e2
Update Changelog
2017-05-12 17:48:50 -03:00
f1c4e2c032
regendoc: reduce version noise by replacing minor/patch with placeholders
2017-05-12 22:17:40 +02:00
a92e397011
add changelog for fixing #2391
2017-05-12 18:39:45 +02:00
f3b359f5b8
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
...
# Conflicts:
# _pytest/capture.py
# _pytest/compat.py
# _pytest/python.py
# testing/python/collect.py
# testing/test_mark.py
2017-05-03 19:04:53 -03:00
60b8339166
Issue #2383 - Show the correct error message when collect "parametrize" func with wrong args and add test for this case.
2017-04-29 14:32:09 +03:00
25371ddbfd
Merge pull request #2315 from RonnyPfannschmidt/namespace-hook
...
remove pytest internal usage of the namespace hook
2017-04-21 16:24:20 -03:00
dcefb287fc
Try not to assume a module's file extension is .py
2017-04-19 12:26:56 -07:00
83c508eea3
Verify hooks after collection completes
...
Fix #1821
2017-04-11 21:55:12 -03:00
08d83a5c6a
updated changelog and authors files
2017-04-10 17:50:18 +09:00
639c592f31
Add missing link in CHANGELOG
2017-04-06 22:59:24 -03:00
3aa4fb62d6
Merge branch 'master' into master
2017-04-06 16:35:38 -07:00
24ac923938
Add CHANGELOG entry
2017-04-06 12:42:17 -03:00
58ac4faf0c
Fix exception formatting while importing test modules
...
Fix #2336
2017-03-29 14:43:13 -03:00
809c36e1f6
add a changelog note for pytest_namespace
2017-03-28 11:45:06 +02:00
0c1c2580d0
Add CHANGELOG entry
2017-03-22 12:40:31 -03:00
e8a1b36c82
add changelog
2017-03-20 10:21:47 +01:00
aad4946fb6
Move CHANGELOG entry for #2276 to 3.0.8
2017-03-14 18:58:28 -03:00
9062fbb9cc
Add AUTHORS & CHANGELOG
2017-03-14 18:55:58 -03:00
6c9011c12f
Merge branch 'master' into merge-master-into-features-post-3.0.7
2017-03-14 18:10:23 -03:00
fa15ae7545
Post 3.0.7 release handling
2017-03-14 18:07:44 -03:00
b1ab2ca963
Bump to version 3.0.7 and update CHANGELOG
2017-03-13 18:37:49 -04:00
1e0cf5ce4d
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
...
# Conflicts:
# AUTHORS
# CHANGELOG.rst
# _pytest/pytester.py
2017-03-10 15:54:05 -03:00
cee578e327
Fix trailing whitespace in terminal output
2017-03-05 23:20:55 +03:00
f71467f5b1
added link to changelog
2017-03-04 10:55:59 +02:00
6aaf7ae18b
added to authors and changelog
2017-03-04 10:32:14 +02:00
26e50f1162
junitxml: adjust junitxml output file to comply with JUnit xsd
...
Change XML file structure in the manner that failures in call and errors
in teardown in one test will appear under separate testcase elements in
the XML report.
2017-03-02 15:10:25 +01:00
3aac3d0a00
Merge branch 'master' into anydbmfix
2017-03-01 14:41:18 -03:00
6ba3475448
Make capsys more like stdio streams in python3. Resolves #1407 .
2017-02-23 17:46:27 -08:00
d3a6be4130
junitxml: Fix double system-out tags per testcase
...
In the xml report we now have two occurences for the system-out tag if
the testcase writes to stdout both on call and teardown and fails in
teardown.
This behaviour is against the xsd.
This patch makes sure that the system-out section exists only
once per testcase.
2017-02-22 16:39:20 +01:00
fb0b90646e
New-style classes implemented for python 2.7 - #2147
2017-02-16 20:28:17 +01:00
9c809f5ad0
Merge pull request #2255 from scop/spelling
...
Spelling fixes
2017-02-15 18:41:49 -02:00
ede4e9171f
Spelling fixes
2017-02-15 17:00:58 +02:00
91c6bef77a
Add venv to the default norecursedirs
...
venv (without a dot) is commonly used as a name for a virtualenv directory, and
we don't want to collect that.
2017-02-15 14:55:12 +01:00
6b5566db66
Update changelog
2017-02-14 17:47:42 -08:00
49289fed52
Fix docs
2017-02-14 17:21:20 -08:00
00ec30353b
Update docs as requested
2017-02-14 17:08:42 -08:00
9eb1d73951
--override-ini now correctly overrides some fundamental options like "python_files"
...
#2238
2017-02-08 23:03:33 -02:00
6a097aa0f1
Merge branch 'master' into allow_skipping_unittests_with_pdb_active
2017-02-08 20:30:14 -02:00
3a0a0c2df9
Ignore errors raised from descriptors when collecting fixtures
...
Descriptors (e.g. properties) such as in the added test case are
triggered during collection, executing arbitrary code which can raise.
Previously, such exceptions were propagated and failed the collection.
Now these exceptions are caught and the corresponding attributes are
silently ignored.
A better solution would be to completely skip access to all custom
descriptors, such that the offending code doesn't even trigger. However
I think this requires manually going through the instance and all of its
MRO for each and every attribute checking if it might be a proper
fixture before accessing it. So I took the easy route here.
In other words, putting something like this in your test class is still
a bad idea...:
@property
def innocent(self):
os.system('rm -rf /')
Fixes #2234 .
2017-02-07 14:27:34 +02:00
ccf9877447
Merge pull request #2232 from vidartf/patch-1
...
Do not asssume `Item.obj` in 'skipping' plugin
2017-02-03 21:39:42 -02:00
a4d2a5785b
Merge pull request #2142 from barneygale/xfail_without_condition_getglobals
...
'xfail' markers without a condition no longer rely on the underlying `Item` objects deriving from `PyobjMixin`
2017-02-03 16:09:47 -02:00
1a88a91c7a
Update authors/history
2017-02-03 16:29:43 +01:00
43662ce789
allow error message matching in pytest.raises
2017-02-02 19:52:33 +01:00
176c680e19
Merge branch 'master' into allow_skipping_unittests_with_pdb_active
2017-02-01 15:53:14 -02:00
e1c5314d80
Replace 'raise StopIteration' usages in the code by 'return's in accordance to PEP-479
...
Fix #2160
2017-02-01 02:37:55 -02:00
d1c725078a
Allow to skip unittests if --pdb active
...
closes #2137
2017-01-31 04:47:31 +01:00
3b47cb45e6
Merge pull request #2222 from RonnyPfannschmidt/features
...
merge master into features
2017-01-26 13:48:10 +01:00
3f30c22894
fix changelog merge mistake
2017-01-26 13:03:29 +01:00
713bdc1f9f
merge master into features
2017-01-26 12:00:52 +01:00
beb77c1a38
Fix release date for 3.0.6
2017-01-23 13:51:12 -02:00
c9f327dc87
bump version to next dev
2017-01-22 22:21:08 +01:00
55f21bd2b9
bump version
2017-01-22 18:44:30 +01:00
0e58c3fa80
updates for PR review #2198
2017-01-21 16:47:49 +13:00
c848d0a771
Pass parameter name to `make_parametrize_id` hook function
2017-01-21 16:46:45 +13:00
15a3b57ec7
Merge pull request #2120 from RonnyPfannschmidt/fix-2118
...
fix #2118 - rework Node._getcustomclass and Node compat properties
2017-01-20 14:38:55 -02:00
6a96b464ab
update changelog as suggested
2017-01-20 15:26:59 +01:00
3766060893
Merge branch 'master' into trial-envs
2017-01-20 08:37:34 -02:00
e0c48b4fe7
Merge pull request #2212 from nicoddemus/pytester-rewrite
...
Assert statements of the pytester plugin again benefit from assertion rewriting
fixes #1920
2017-01-20 10:04:12 +01:00
7b4368f3f4
Merge pull request #2184 from eli-b/parseoutcomes-explicit-failure
...
Fail assert_outcomes() on missing terminal report
2017-01-19 21:38:54 -02:00
c477f09177
Assert statements of the pytester plugin again benefit from assertion rewriting
...
Fix #1920
2017-01-19 21:33:51 -02:00
2574da8d32
Fix pytester internal plugin to work correctly with latest versions of zope.interface
...
Fix #1989
2017-01-19 20:53:35 -02:00
123289a88e
fixes #2208 by introducing a iteration limit
2017-01-19 11:38:15 +01:00
043aadeaf2
Consider plugins loaded by PYTEST_PLUGINS for assertion rewrite
...
Fix #2185
2017-01-11 17:15:16 -02:00
e18b2a427a
Fail assert_outcomes() on missing terminal report
...
Currently if the terminal report of testdir.runpytest() is missing,
assert_outcomes() on its output fails because parseoutcomes()
returns an unexpected value (None).
It's better to fail parseoutcomes() directly.
2017-01-11 17:09:37 +02:00
e412ea1d5a
Added name to AUTHORS and change to CHANGELOG
2017-01-10 07:58:22 -06:00
3494dd06fe
Remove duplicate target in rst
2017-01-03 10:57:19 -02:00
56d1858ea2
Remove duplicate '@lesteve' link from CHANGELOG
2017-01-03 10:57:19 -02:00
6fd0394c63
pytest.warns checks for subclass relationship
...
rather than class equality. This makes it more similar to
pytest.raises.
2017-01-03 10:57:19 -02:00
df409a0c0e
Fix CHANGELOG.rst
2017-01-02 22:01:40 +00:00
8db9915374
Update AUTHORS, CHANGELOG
2017-01-02 22:01:04 +00:00
a9193a1531
No longer silently ignore errors in parametrize callable ids
2017-01-02 17:26:17 -02:00
03a7a2cd3e
Fix typos
2016-12-31 19:01:15 +01:00
402fbe503a
Merge branch 'master' into merge-master-into-features
2016-12-27 23:31:26 -02:00
7592c5b491
Sort issues and user references in CHANGELOG
2016-12-27 23:20:34 -02:00
718f0b0255
Merge pull request #2130 from malinoff/fix-2129
...
Use inspect to properly detect generators. Fixes #2129
2016-12-27 22:11:46 -02:00
0bb8a4a36d
Fixed #2148 - parse directory names properly when args contains ::.
...
This commit also improves readbility in get_dirs_from_args by using self
documenting local functions.
get_dirs_from_args also now only returns directories that actually exists,
and not files to avoid confusion.
This commit also removes redundant checks in get_common_ancestor that
was already performed in get_dirs_from_args..
2016-12-27 15:28:56 +01:00
bfada968d3
Update AUTHORS and CHANGELOG.rst
...
following contribution guidelines
2016-12-20 14:36:10 +01:00
1312b83866
Add CHANGELOG entry for #2129
2016-12-13 21:33:01 -02:00
9c285dfc1d
fix #2118 - rework Node._getcustomclass and Node compat properties
2016-12-06 09:13:25 +01:00
8afca5d0fa
Add release dates to CHANGELOG entry
...
Fix #721
2016-12-05 17:21:01 -02:00
3a0a1d2de3
Bump version to 3.0.6.dev0
2016-12-05 12:51:00 -02:00
833acb9d3c
Finalize CHANGELOG for 3.0.5
2016-12-05 10:07:37 -02:00
57c4489916
Use a simple ``+-`` ASCII string in the string representation of pytest.approx In Python 2
...
Fix #2111
2016-12-02 20:01:53 -02:00
81528ea81f
Remove hook proxy cache
...
Fix #2016
2016-12-02 07:32:11 -02:00
bc0f7e6243
Fix false-positive assert rewrite warnings when using 'pytest_plugins'
...
pytest would emit false positive warnings about assertion-rewrite when a
module appears multiple times in plugins which depend
on other plugins using the 'pytest_plugins' mechanism
2016-12-01 15:50:08 -02:00
c856537e71
Add warning for incorrect passing args to `-o`.
2016-12-01 13:20:42 +01:00
f8d195253e
Remove support code for earlier Python 3 version in Source.compile
...
This code leaves None in sys.modules as a side effect but is no longer needed in the Python 3 versions we support.
Fix #2103
2016-11-30 22:23:02 -02:00
669332b7e0
Merge pull request #2101 from wheerd/doctest-encoding
...
Added doctest encoding command line option
2016-11-30 17:43:42 -02:00
f5afd8cb54
Add missing `__test__` check for test discovery.
2016-11-30 17:05:42 +01:00
1f62e5b5a0
Added CHANGELOG entry and myself to AUTHORS.
2016-11-30 11:50:11 +01:00
8208a77a3e
Merge pull request #2098 from DuncanBetts/master
...
Improved description of functionality for Issue #687
2016-11-28 23:05:27 -02:00
6473c3d87e
Improved description of functionality for Issue #687
2016-11-28 14:30:25 +00:00
4e1609b12e
Add `type` validation.
...
Argparse driven argument type validation is added for the
`--junit-xml` and `--confcutdir` arguments.
The commit partially reverts #2080 . Closes #2089 .
2016-11-28 02:16:01 +01:00
b30a6d22c5
Merge branch 'master' into merge-master-into-features
2016-11-27 17:30:40 -02:00
2d7197926a
Improve CHANGELOG entry for #2034
2016-11-27 14:26:30 -02:00
0e6ad8e59f
update CHANGELOG and AUTHORS
2016-11-27 14:24:55 -02:00
1aa5bfea11
Add `:ref:` targets to `recwarn.rst`.
2016-11-26 18:41:38 +01:00
c1b83cdeea
Add hint of Issue #478 to error text
2016-11-26 10:47:15 +00:00
33c0b06fdf
Fix error in approx's repr with complex numbers
...
Fix #2082
2016-11-24 15:33:12 -02:00
629d8e9fd6
Show an error if --confcutdir is not a valid directory
...
Fixes #2078
2016-11-23 09:49:11 -02:00
5ce551e469
Merge pull request #2075 from pytest-dev/master
...
Merge master into features after fixing flake8 errors
2016-11-22 14:10:31 -02:00
06bb61bbe3
Don't fail if imp can't find the source for a .pyc file. #2038
2016-11-20 13:09:32 -05:00
0ba930a11d
Fix spelling mistakes
...
Signed-off-by: Sebastian Ramacher <sramacher@debian.org>
2016-11-15 23:05:58 +01:00
efc54b2e56
Merge branch 'master' into merge-master-features
2016-11-11 18:56:53 -02:00
3e01e83390
Bump version to 3.0.5.dev
2016-11-11 18:20:34 -02:00
ff72db2f1a
Version bump to 3.0.4, CHANGELOG, announcement
2016-11-09 19:38:11 -02:00
1130b9f742
Fix the stubborn test about cyclic references left by pytest.raises
...
In Python 2, a context manager's __exit__() leaves sys.exc_info with the exception values even when it was supposed
to suppress the exception, so we explicitly call sys.exc_clear() which removes the traceback and allow the object
to be released.
Also updated the test to not depend on the immediate destruction of the object but instead to ensure it is not being
tracked as a cyclic reference.
Fix #1965
2016-11-08 22:20:27 -02:00
552c7d4286
added test (thanks @nicoddemus) and added links in Changelog
2016-11-08 22:13:02 -02:00
1e5b21cd61
Fix memory leak with pytest.raises by using weakref
2016-11-08 22:12:23 -02:00
e46e653794
Clean up unittest TestCase objects after tests are complete ( #1649 ).
...
Fix #1649
Users of unittest style TestCases will create expensive objects
in setUp. We should clean up TestCase instances that are lying
around so that they don't fill up memory.
2016-11-07 18:32:56 -08:00
a190ad27f2
Change version to be in normal form according to PEP 440.
...
The version is changed from 3.0.4.dev to 3.0.4.dev0. Note that
according to PEP 440 these are considered equivalent, but 3.0.4.dev0 is
the normal form.
This standard was followed when the version was set to 3.0.3.dev0 in
commit ee284ec5a87b1c79
2016-11-06 09:00:04 +01:00
006a901b86
Properly handle exceptions in multiprocessing tasks
...
Fix #1984
2016-11-03 10:48:43 -02:00
e2bb4f893b
Fix teardown error message in generated xUnit XML
...
It was "test setup failure" even error happens on test teardown.
2016-11-02 15:50:32 +03:00
6f93ffb5d4
Report teardown output on test failure
...
Until now, teardown stdout/stderr output was not reported upon test failure.
However such output is sometime necessary to understand the failure.
fix #442
2016-10-30 09:52:46 +01:00
b3c337db00
add changelog entry and documentation note about RecordedWarning
2016-10-24 15:28:35 +02:00
377e649e61
local merge of #1967 - Change exception raised by capture.DontReadFromInput.fileno()
2016-10-24 12:47:55 +02:00
9d00615bbf
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
2016-10-20 21:51:42 -02:00
2a2b8cee09
Fix false-positive warnings from assertion rewrite hook
...
Fix #2005
2016-10-20 21:40:57 -02:00
620b384b69
Fix cmdline help message for custom options with two or more metavars
...
Fix #2004
2016-10-20 20:34:39 -02:00
bc1f8666aa
Fix link in CHANGELOG for #1853
2016-10-12 18:19:34 -03:00
78eec0d7f8
Handle import errors with non-ascii messages when importing plugins
...
Fix #1998
2016-10-12 18:19:32 -03:00
7d66e4eae1
Display full traceback from Import errors when collecting test modules
...
Fix #1976
2016-10-03 20:47:44 -03:00
4667b4decc
Merge branch 'master' into features
2016-09-29 19:03:26 -03:00
a87b1c79c1
post 3.0.3 release changes
2016-09-29 18:58:17 -03:00
dda17994ec
Prepare for 3.0.3 release
2016-09-28 16:33:38 -04:00
b0c78c867d
Update CHANGELOG.rst
2016-09-27 15:50:45 -07:00
1ab1962eb1
make issue #1934 reference a link
2016-09-27 13:53:31 -07:00
654af0ba25
Merge remote-tracking branch 'upstream/master' into features
2016-09-26 19:32:53 -03:00
acac78adc0
Add link to profile.
2016-09-26 16:09:25 +03:00
ff492ca73f
Thanked my self in the change log :)
2016-09-26 13:27:41 +03:00
835328d862
Vendor pluggy 0.4.0
...
Fix #1637
2016-09-25 23:36:02 -03:00
3fce78498f
Mention #1952 on the CHANGELOG
...
Also created "New Features" and "Changes" sections.
2016-09-25 20:31:03 -03:00
6db2f315fa
Explain a bad scope value to the user
2016-09-21 16:40:58 -04:00
6b56c36ae7
added to changelog and authors
2016-09-20 02:47:59 +07:00
4df74a5cfb
Add AUTHORS and CHANGELOG for #1512
2016-09-19 15:29:37 +01:00
dc16fe2bb9
Merge junit-xml url attribute branch
...
Merge branch 'url_attr' of https://github.com/fushi/pytest into junitxml-url
2016-09-19 12:57:05 +01:00
8639bf7554
fixup! Merge pkg_resources workaround
2016-09-19 10:20:36 +01:00
f484e7c9ca
Merge pkg_resources workaround
...
Merge branch 'pkg_resources_bugfix' of github.com:raquel-ucl/pytest into pkg-resources
This is an odd case and doesn't really make sense, it is working around a bug
in maven/jython and the old version or weird packaging of setuptools they use.
But we used to do this in the past so might as well keep doing this.
2016-09-19 10:14:41 +01:00
f1faaea3fd
Update CHANGELOG.rst
2016-09-15 15:22:53 -07:00
04cf5e1df4
Fixed assertion rewriting for plugins in development mode
...
Fix #1934
2016-09-14 21:59:33 -03:00
8a41b26f56
Merge pull request #1908 from nicoddemus/parametrize-unicode-id
...
The "ids" argument to "parametrize" again accepts unicode strings in Python 2
2016-09-05 15:09:12 +02:00
ceeb5149f3
Mention register_assert_rewrite explicitly
...
It helps mentioning this explicitly in the changelog.
Fixes #1871 .
2016-09-05 13:09:36 +01:00
1e10de574d
The "ids" argument to "parametrize" again accepts unicode strings in Python 2
...
Fixes #1905
2016-09-02 18:38:15 -03:00
f5d900d972
Merge remote-tracking branch 'upstream/master' into features
2016-09-01 23:07:49 -03:00
ee284ec587
Set version to 3.0.3.dev0
...
Also, using "dev0" as development suffix otherwise distutils gives a warning during "setup.py develop":
UserWarning: Normalizing '3.0.3.dev' to '3.0.3.dev0'
normalized_version,
2016-09-01 21:34:54 -03:00
4e58c9a7d0
Fix use of deprecated getfuncargvalue method in the internal doctest plugin
...
Fix #1898
2016-09-01 07:19:11 -04:00
4c45b93007
Changes for 3.0.2 release
2016-08-31 20:28:38 -04:00
696a9112be
integrating review commets of @nicoddemus
...
plus small scale refactoring
2016-08-31 22:33:47 +02:00
be08223d5a
Merge branch 'master' into disable_tearDown_and_cleanups_for_post_mortem_debugging
...
Conflicts:
CHANGELOG.rst
2016-08-31 20:35:31 +02:00
10b3274924
adding corresponding test, authors and changelog
2016-08-31 20:22:54 +02:00
edf8283bd8
Add CHANGELOG entry for #1888
2016-08-30 23:13:27 -03:00
9d2149d9c0
Merge pull request #1884 from pytest-dev/master
...
merge master into features
2016-08-30 18:47:57 -03:00
86b8801470
Update AUTHORS and CHANGELOG
2016-08-26 09:42:17 +09:00
1b259f70f3
Testcase reports with a url attribute will now properly write this to junitxml
2016-08-25 13:08:51 -07:00
a152ea2dbb
Add buffer attribute to stdin stub
2016-08-24 16:26:34 -07:00
c5675d3efc
Remove merge-conflict marker merged by accident
...
Unfortunately rst-lint didn't catch that
2016-08-23 23:43:05 -03:00
972a5fb5d5
Improve error message when passing non-string ids to pytest.mark.parametrize
...
Fix #1857
2016-08-23 23:31:45 -03:00
7704f73db9
Merge branch 'master' into merge-master-into-features
2016-08-23 21:36:42 -03:00
ea0febad28
Updates for new patch version 3.0.2
2016-08-23 21:33:57 -03:00
49fc4e5e4c
Changes for 3.0.1 release
2016-08-23 18:15:43 -04:00
df200297e2
Fix internal error when parametrizing using and empty list of ids()
...
Fix #1849
2016-08-23 18:18:46 -03:00
d3f4b3d14a
mend
2016-08-23 16:50:00 +01:00
a1597aca89
Added #1853 to changelog as requested on PR.
2016-08-23 16:48:24 +01:00
53a0e2b118
Fix code which guesses parametrized scope based on arguments
...
Fix #1832
2016-08-22 21:05:41 -03:00
b54ea74d4d
Update AUTHORS and CHANGELOG for #1837
2016-08-22 17:59:42 -03:00
a20c3f9c44
Merge pull request #1827 from blueyed/Fix-spelling-s-outside-a-outside-of-a-
...
Fix spelling: s/outside a/outside of a/
2016-08-20 20:04:58 +02:00
e306a53999
Fix spelling: s/outside a/outside of a/
2016-08-20 18:43:39 +02:00
90fb8cb08b
Merge pull request #1823 from nicoddemus/importorskip-regression
...
Fix regression when using importorskip at module level
2016-08-20 18:37:14 +02:00
87d2d1d838
Remove duplicate entry for #717 in CHANGELOG
2016-08-20 15:12:08 +02:00
63dc71c57e
Fix regression when using importorskip at module level
...
Fix #1822
2016-08-19 18:21:25 -03:00
db922403cc
Bump version to 3.1.0.dev
2016-08-19 17:44:07 -03:00
3a200b75c9
Bump version to 3.0.1.dev
2016-08-19 17:41:45 -03:00
745c8c17f1
Merge remote-tracking branch 'upstream/master'
2016-08-19 17:38:21 -03:00
b85a3b0d71
Merge pull request #1820 from The-Compiler/changelog-duplicates
...
Remove duplicate CHANGELOG messages
2016-08-19 17:35:23 -03:00
31ede2432c
Remove duplicate CHANGELOG messages
...
Those are both already mentioned in the breaking changes at the top.
2016-08-19 17:05:02 +02:00
3455dfc804
add missing @matthiasha link
2016-08-19 14:01:07 +02:00
cd39cc1eec
Mention doc update in CHANGELOG
2016-08-19 09:08:11 +02:00
7f18367582
Finalize CHANGELOG
2016-08-18 11:43:21 -04:00
56df9fcc72
Tweak CHANGELOG: move "change" entry to the proper place
2016-08-17 23:08:13 -03:00
030c42203d
Fix conflicts in CHANGELOG
2016-08-17 22:58:12 -03:00
463e6572c5
Merge branch 'master' into merge-master-into-features
...
Preparing for 3.0
2016-08-17 22:39:23 -03:00
0fb34cd2a1
Update CHANGELOG entries
2016-08-17 21:32:07 -03:00
789e4670e7
Merge pull request #1813 from nicoddemus/pytest-setup.cfg
...
Support [tool:pytest] in setup.cfg files
2016-08-17 20:33:57 +02:00
c8ab79402c
Merge pull request #1811 from nicoddemus/revert-invocation-fixtures
...
Revert invocation-fixtures code
2016-08-17 20:32:54 +02:00
ab86dea529
Support [tool:pytest] in setup.cfg files
...
Also deprecate [pytest] usage in setup.cfg files
Fix #567
2016-08-17 08:19:38 -03:00
707b6b5e3f
Revert all invocation-fixtures code
...
Due to a serious regression found in #1794 , it was decided to pull off
invocation features from 3.0 so it can be (hopefully) re-introduced
in 3.1
2016-08-17 08:12:55 -03:00
f25771a101
Deprecate --resultlog cmdline option
...
Fix #830
2016-08-16 21:40:34 -03:00
Ronny Pfannschmidt
Floris Bruynooghe
Bruno Oliveira
wanghui
Florian Bruhin
Ronny Pfannschmidt
Dmitri Pribysh
Vitaly Lashmanov
Kodi Arfer
Jonas Obrist
Skylar Downes
Xander Johnson
fbjorn
Omer Hadari
Katerina Koukiou
Anthony Sottile
Michal Wajszczuk
Ville Skyttä
Patrick Hayes
Ran Benita
Vidar Tonaas Fauske
Thomas Kriechbaumer
mbyt
Ravi Chandra
Eli Boyarski
mandeep
Loïc Estève
Barney Gale
Rafael Bertoldi
Jakub Wilk
Andreas Pelme
Luke Murphy
Manuel Krebber
Duncan Betts
nmundar
Ned Batchelder
Sebastian Ramacher
Michael Seifert
Dan Wandschneider
Manuel Jacob
Georgy Dyuldin
Mathieu Clabaut
Vlad Dragos
Tyler Goodlet
Lev Maximov
Matthew Duck
Florian Bruhin
Ahn Ki-Wook
John Towler
Jordan Guymon
Raquel Alegre
Daniel Hahler
matthiasha