From 4adf5e98577d033657603cb342a6c3b6e6655cdf Mon Sep 17 00:00:00 2001 From: joshhn Date: Tue, 19 Dec 2023 19:36:51 -0600 Subject: [PATCH 1/4] Improve code example in marbles.core.TestCase docstring --- marbles/core/marbles/core/marbles.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/marbles/core/marbles/core/marbles.py b/marbles/core/marbles/core/marbles.py index 61a1278..ecafe16 100644 --- a/marbles/core/marbles/core/marbles.py +++ b/marbles/core/marbles/core/marbles.py @@ -526,7 +526,7 @@ class TestCase(unittest.TestCase): Example: .. literalinclude:: examples/getting_started.py.annotated - :lines: 1-4,26-43 + :lines: 1-4,23-43 ''' failureException = ContextualAssertionError From 00486dc1c99913f8682aa0ba0a4c526f36a1cca0 Mon Sep 17 00:00:00 2001 From: joshhn Date: Tue, 19 Dec 2023 19:37:58 -0600 Subject: [PATCH 2/4] Fix typo in marbles.core --- marbles/core/marbles/core/marbles.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/marbles/core/marbles/core/marbles.py b/marbles/core/marbles/core/marbles.py index ecafe16..d1b02f0 100644 --- a/marbles/core/marbles/core/marbles.py +++ b/marbles/core/marbles/core/marbles.py @@ -171,7 +171,7 @@ class AnnotationError(Exception): class ContextualAssertionError(AssertionError): - '''Extends :class:`AssertionError` to accept and display additiona + '''Extends :class:`AssertionError` to accept and display additional information beyond the static ``msg`` parameter provided by :mod:`unittest` assertions. From 255263fb00084f95f431684ae11403c0a6aaaad1 Mon Sep 17 00:00:00 2001 From: joshhn Date: Tue, 19 Dec 2023 19:40:05 -0600 Subject: [PATCH 3/4] Add .DS_Store to .gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 904e7ee..d09194c 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,5 @@ dist/ coverage.xml *.pyc .eggs -.tox/ \ No newline at end of file +.tox/ +**/.DS_Store \ No newline at end of file From 82e29bd2ad14b158e3652727003e28fd6720b95a Mon Sep 17 00:00:00 2001 From: Duy Huynh Date: Thu, 28 Dec 2023 12:40:44 -0600 Subject: [PATCH 4/4] Update marbles/core/marbles/core/marbles.py Co-authored-by: Leif Walsh --- marbles/core/marbles/core/marbles.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/marbles/core/marbles/core/marbles.py b/marbles/core/marbles/core/marbles.py index df789b0..5c747fa 100644 --- a/marbles/core/marbles/core/marbles.py +++ b/marbles/core/marbles/core/marbles.py @@ -526,7 +526,7 @@ class TestCase(unittest.TestCase): Example: .. literalinclude:: examples/getting_started.py.annotated - :lines: 1-4,23-43 + :lines: 1-4,33-44 ''' failureException = ContextualAssertionError