From 15222ceca275e2949da115ff6c54d8b80e8ca8b1 Mon Sep 17 00:00:00 2001 From: Xuan Luong Date: Sat, 9 Sep 2017 18:20:43 -0400 Subject: [PATCH 1/2] Fix typo in example of passing a callable to markers --- changelog/xxxx.trivial | 1 + doc/en/example/markers.rst | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog/xxxx.trivial diff --git a/changelog/xxxx.trivial b/changelog/xxxx.trivial new file mode 100644 index 000000000..01110b852 --- /dev/null +++ b/changelog/xxxx.trivial @@ -0,0 +1 @@ +Fix typo in example of passing a callable to markers (in example/markers.rst) \ No newline at end of file diff --git a/doc/en/example/markers.rst b/doc/en/example/markers.rst index 0dbc67310..e3082f279 100644 --- a/doc/en/example/markers.rst +++ b/doc/en/example/markers.rst @@ -435,7 +435,7 @@ The output is as follows:: . 1 passed in 0.12 seconds -We can see that the custom marker has its argument set extended with the function ``hello_world``. This is the key different between creating a custom marker as a callable, which invokes ``__call__`` behind the scenes, and using ``with_args``. +We can see that the custom marker has its argument set extended with the function ``hello_world``. This is the key difference between creating a custom marker as a callable, which invokes ``__call__`` behind the scenes, and using ``with_args``. Reading markers which were set from multiple places From e27a0d69aafb4612dbe236e5577e4e6ea45cffca Mon Sep 17 00:00:00 2001 From: Xuan Luong Date: Sat, 9 Sep 2017 18:24:26 -0400 Subject: [PATCH 2/2] Rename changelog file to PR id number --- changelog/{xxxx.trivial => 2765.trivial} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename changelog/{xxxx.trivial => 2765.trivial} (100%) diff --git a/changelog/xxxx.trivial b/changelog/2765.trivial similarity index 100% rename from changelog/xxxx.trivial rename to changelog/2765.trivial