repo_name
stringclasses
5 values
task_num
int64
1.48k
57.7k
autocomplete_prompts
stringlengths
210
1.61k
gold_patch
stringlengths
717
987k
commit
stringlengths
40
40
edit_prompt
stringlengths
37
322
prompt
stringlengths
442
21.9k
edit_patch
stringlengths
415
6.38k
autocomplete_patch
stringlengths
415
5.55k
test_patch
stringlengths
573
27.4k
wagtail
12,562
diff --git a/wagtail/fields.py b/wagtail/fields.py index 79eae7a66eb8..cfacc3c2582b 100644 --- a/wagtail/fields.py +++ b/wagtail/fields.py @@ -239,6 +239,9 @@ def formfield(self, **kwargs): def get_default(
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index af11687f0936..d42ae5cc9e7a 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -15,6 +15,7 @@ Changelog * Fix: Fix animation overflow transition when navigating through subpages in the sidebar page explorer (manu) * Fix: Ensure form builder supports custom admin form v...
210f35f7ec42d8ead1508cde52f421631f8621b8
Normalize StreamField.get_default using the stream_block.
The following is the text of a github issue and related comments for this repository: Complex StreamField default values fail on snippet creation form ### Issue Summary Passing a list of (block_type, value) tuples as the default value of a StreamField on a snippet model causes the snippet creation view to fail with `...
diff --git a/wagtail/fields.py b/wagtail/fields.py index 79eae7a66eb8..cfacc3c2582b 100644 --- a/wagtail/fields.py +++ b/wagtail/fields.py @@ -239,6 +239,9 @@ def formfield(self, **kwargs): defaults.update(kwargs) return super().formfield(**defaults) + def get_default(self): + return self....
diff --git a/wagtail/fields.py b/wagtail/fields.py index 79eae7a66eb8..cfacc3c2582b 100644 --- a/wagtail/fields.py +++ b/wagtail/fields.py @@ -239,6 +239,9 @@ def formfield(self, **kwargs): defaults.update(kwargs) return super().formfield(**defaults) + def get_default(self): + return self....
diff --git a/wagtail/tests/test_streamfield.py b/wagtail/tests/test_streamfield.py index 461986ba565c..36173ac299a9 100644 --- a/wagtail/tests/test_streamfield.py +++ b/wagtail/tests/test_streamfield.py @@ -297,6 +297,18 @@ def test_default_value(self): self.assertEqual(self.page.body[1].value[1].block_type, "...
wagtail
12,750
null
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 4631b5a8daa..fa0abb8ce5e 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -41,6 +41,7 @@ Changelog * Fix: Return never-cache HTTP headers when serving pages and documents with view restrictions (Krystian Magdziarz, Dawid Bugajewski) * Fix: Implement `get_block_by_co...
a2407c002770ab7f50997d37571de3cf43f0d455
Create PanelPlaceholder classes that can temporarily stand in for panel types from wagtail.admin.panels, with CommentPanelPlaceholder being a special case that only constructs if comments are enabled.
The following is the text of a github issue and related comments for this repository: Omitting import of `wagtail.admin.panels` causes page title field to be absent ### Issue Summary As of #12557 it is possible to define a page model's `content_panels` as a list of strings, without referring to any panel classes such...
diff --git a/wagtail/models/panels.py b/wagtail/models/panels.py new file mode 100644 index 00000000000..8e3c6066328 --- /dev/null +++ b/wagtail/models/panels.py @@ -0,0 +1,37 @@ +# Placeholder for panel types defined in wagtail.admin.panels. +# These are needed because we wish to define properties such as `content_pan...
null
diff --git a/wagtail/admin/tests/pages/test_create_page.py b/wagtail/admin/tests/pages/test_create_page.py index 733ac26c263..6bf874e868c 100644 --- a/wagtail/admin/tests/pages/test_create_page.py +++ b/wagtail/admin/tests/pages/test_create_page.py @@ -427,6 +427,26 @@ def test_cannot_create_page_with_wrong_subpage_typ...
wagtail
12,670
null
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index a6de5e45cc07..7313103766e6 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -14,6 +14,7 @@ Changelog * Allow plain strings in panel definitions as shorthand for `FieldPanel` / `InlinePanel` (Matt Westcott) * Only allow selection of valid new parents within the copy ...
32417f9adca1d507bb4ca4880ee4d8879062de04
Add a third `default_params` parameter to the function that allows customizing URL parameters, with a default value of `{"d": "mp"}`, and rewrite the function to properly handle URL parsing and parameter merging.
The following is the text of a github issue and related comments for this repository: Enhance capabilities for `WAGTAIL_GRAVATAR_PROVIDER_URL` URL to support merging of URL params ### Is your proposal related to a problem? Currently, there is no simple way to [`WAGTAIL_GRAVATAR_PROVIDER_URL`](https://docs.wagtail.org...
diff --git a/wagtail/users/utils.py b/wagtail/users/utils.py index b3eee7970d07..9c4b59bc83f5 100644 --- a/wagtail/users/utils.py +++ b/wagtail/users/utils.py @@ -1,3 +1,5 @@ +from urllib.parse import parse_qs, urlparse, urlunparse + from django.conf import settings from django.utils.http import urlencode from djang...
null
diff --git a/wagtail/admin/tests/ui/test_sidebar.py b/wagtail/admin/tests/ui/test_sidebar.py index f2e160144651..823064359c80 100644 --- a/wagtail/admin/tests/ui/test_sidebar.py +++ b/wagtail/admin/tests/ui/test_sidebar.py @@ -283,7 +283,7 @@ def test_adapt(self): ], { ...
wagtail
12,622
null
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 464edbb79ec8..800be03010b3 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -22,6 +22,7 @@ Changelog * Fix: Prevent out-of-order migrations from skipping creation of image/document choose permissions (Matt Westcott) * Fix: Use correct connections on multi-database s...
7566fb84e0709b9dd1139161c244ea5c49d3b4c0
Store the parent page in the panel instance and add it to the context if available.
The following is the text of a github issue and related comments for this repository: New page shows incorrect privacy info <!-- Found a bug? Please fill out the sections below. 👍 --> ### Issue Summary When creating a new page that is a child of a private page the info section shows "Visible to all" but it should be...
diff --git a/wagtail/admin/ui/side_panels.py b/wagtail/admin/ui/side_panels.py index 2aa6167652e7..ddd064cd6a76 100644 --- a/wagtail/admin/ui/side_panels.py +++ b/wagtail/admin/ui/side_panels.py @@ -241,6 +241,7 @@ def get_context_data(self, parent_context): class PageStatusSidePanel(StatusSidePanel): def __ini...
null
diff --git a/wagtail/admin/tests/pages/test_create_page.py b/wagtail/admin/tests/pages/test_create_page.py index 6f5b1d5f57ea..6ad7f6c6df8d 100644 --- a/wagtail/admin/tests/pages/test_create_page.py +++ b/wagtail/admin/tests/pages/test_create_page.py @@ -9,7 +9,13 @@ from django.utils import timezone from django.util...
wagtail
12,671
diff --git a/wagtail/admin/forms/pages.py b/wagtail/admin/forms/pages.py index 47e5f18cd9a6..a7a930ac7871 100644 --- a/wagtail/admin/forms/pages.py +++ b/wagtail/admin/forms/pages.py @@ -30,7 +30,11 @@ def __init__(self, *args, **kwargs): widget=
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 98757878477c..04b31ec25ef2 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -12,6 +12,7 @@ Changelog * Limit tags autocompletion to 10 items and add delay to avoid performance issues with large number of matching tags (Aayushman Singh) * Add the ability to restrict ...
547e4d3731a6492eb4b9d088ee268720224713d1
Add target models to the page chooser to only allow selection of valid parent page types based on the page's allowed parent models.
The following is the text of a github issue and related comments for this repository: Improve page chooser (widgets.AdminChooser) when copying a page ### Is your proposal related to a problem? When a user is in the form to copy a page (`CopyForm`), some pages appear as available destinations when in fact it is not a ...
diff --git a/wagtail/admin/forms/pages.py b/wagtail/admin/forms/pages.py index 47e5f18cd9a6..a7a930ac7871 100644 --- a/wagtail/admin/forms/pages.py +++ b/wagtail/admin/forms/pages.py @@ -30,7 +30,11 @@ def __init__(self, *args, **kwargs): self.fields["new_parent_page"] = forms.ModelChoiceField( in...
diff --git a/wagtail/admin/forms/pages.py b/wagtail/admin/forms/pages.py index 47e5f18cd9a6..a7a930ac7871 100644 --- a/wagtail/admin/forms/pages.py +++ b/wagtail/admin/forms/pages.py @@ -30,7 +30,11 @@ def __init__(self, *args, **kwargs): self.fields["new_parent_page"] = forms.ModelChoiceField( in...
diff --git a/wagtail/admin/tests/test_page_chooser.py b/wagtail/admin/tests/test_page_chooser.py index 5ec5cfbdba00..eaa52d5b5199 100644 --- a/wagtail/admin/tests/test_page_chooser.py +++ b/wagtail/admin/tests/test_page_chooser.py @@ -249,6 +249,35 @@ def test_with_multiple_page_types(self): self.assertIn(even...
wagtail
12,569
null
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index d73e9511bea8..6c4de8502305 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -52,6 +52,8 @@ Changelog * Maintenance: Various performance optimizations to page publishing (Jake Howard) * Maintenance: Remove unnecessary DOM canvas.toBlob polyfill (LB (Ben) Johnston) ...
b9575f3498bba69fa2a8f53be110ec11ea3746f0
Add drag and drop event handling to the document upload zone, showing the "hovered" class during dragover with a 10ms delay, and prevent default browser drag/drop behavior.
The following is the text of a github issue and related comments for this repository: 🎛️ Create a new `ZoneController` to remove reliance on jQuery for toggling classes based on DOM events ### Is your proposal related to a problem? Currently we use jQuery for common behaviour such as 'add this class when hovered' or...
diff --git a/wagtail/documents/templates/wagtaildocs/multiple/add.html b/wagtail/documents/templates/wagtaildocs/multiple/add.html index 2b2becfd51be..dcab9aa31d5c 100644 --- a/wagtail/documents/templates/wagtaildocs/multiple/add.html +++ b/wagtail/documents/templates/wagtaildocs/multiple/add.html @@ -10,7 +10,13 @@ {...
null
diff --git a/client/src/controllers/ZoneController.test.js b/client/src/controllers/ZoneController.test.js new file mode 100644 index 000000000000..238798c0af8a --- /dev/null +++ b/client/src/controllers/ZoneController.test.js @@ -0,0 +1,169 @@ +import { Application } from '@hotwired/stimulus'; +import { ZoneController...
wagtail
12,643
diff --git a/client/src/entrypoints/admin/page-chooser-modal.js b/client/src/entrypoints/admin/page-chooser-modal.js index 381bcc3074d2..a7ee3539f9a7 100644 --- a/client/src/entrypoints/admin/page-chooser-modal.js +++ b/client/src/entrypoints/admin/page-chooser-modal.js @@ -69,6 +69,16 @@ const PAGE_CHOOSER_MODAL_ONLOA...
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 602d849422ba..0eef17a620a1 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -29,6 +29,7 @@ Changelog * Fix: Ensure the accessible labels and tooltips reflect the correct private/public status on the live link button within pages after changing the privacy (Ayaan Qadri...
c2676af857a41440e05e03038d85a540dcca3ce2
Enable/disable the submit button based on checkbox selections and attach change event handlers to checkboxes in search results.
The following is the text of a github issue and related comments for this repository: Uncaught TypeError in page-editor.js - MultipleChooserPanel <!-- Found a bug? Please fill out the sections below. 👍 --> ### Issue Summary I have selection of authors for a book in my site ![Screenshot 2024-05-14 at 15 51 11](htt...
diff --git a/client/src/entrypoints/admin/page-chooser-modal.js b/client/src/entrypoints/admin/page-chooser-modal.js index 381bcc3074d2..a7ee3539f9a7 100644 --- a/client/src/entrypoints/admin/page-chooser-modal.js +++ b/client/src/entrypoints/admin/page-chooser-modal.js @@ -69,6 +69,16 @@ const PAGE_CHOOSER_MODAL_ONLOA...
diff --git a/client/src/entrypoints/admin/page-chooser-modal.js b/client/src/entrypoints/admin/page-chooser-modal.js index 381bcc3074d2..a7ee3539f9a7 100644 --- a/client/src/entrypoints/admin/page-chooser-modal.js +++ b/client/src/entrypoints/admin/page-chooser-modal.js @@ -69,6 +69,16 @@ const PAGE_CHOOSER_MODAL_ONLOA...
diff --git a/wagtail/admin/tests/test_page_chooser.py b/wagtail/admin/tests/test_page_chooser.py index d054f8b22723..5ec5cfbdba00 100644 --- a/wagtail/admin/tests/test_page_chooser.py +++ b/wagtail/admin/tests/test_page_chooser.py @@ -65,12 +65,20 @@ def test_multiple_chooser_view(self): checkbox_value = str...
wagtail
12,619
null
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index cfeea825126a..4411028ac2b8 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -60,6 +60,7 @@ Changelog * Maintenance: Migrate jQuery class toggling & drag/drop event handling within the multiple upload views to the Stimulus ZoneController usage (Ayaan Qadri) * Mainten...
9cacfe0dc2b30053f4bd028236316e7248a1074c
Replace arrow functions with regular functions to maintain the correct `this` binding in form submissions.
The following is the text of a github issue and related comments for this repository: Page choosers no longer working on `main` <!-- Found a bug? Please fill out the sections below. 👍 --> ### Issue Summary The page chooser modal will not respond to any clicks when choosing a page, and an error is thrown in the cons...
diff --git a/client/src/entrypoints/admin/modal-workflow.js b/client/src/entrypoints/admin/modal-workflow.js index 2955f763eee3..54737ed19369 100644 --- a/client/src/entrypoints/admin/modal-workflow.js +++ b/client/src/entrypoints/admin/modal-workflow.js @@ -91,15 +91,15 @@ function ModalWorkflow(opts) { }; sel...
null
diff --git a/client/src/entrypoints/admin/__snapshots__/modal-workflow.test.js.snap b/client/src/entrypoints/admin/__snapshots__/modal-workflow.test.js.snap index a5f1675e428f..42497f9a15d6 100644 --- a/client/src/entrypoints/admin/__snapshots__/modal-workflow.test.js.snap +++ b/client/src/entrypoints/admin/__snapshots...
wagtail
12,666
null
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 0eef17a620a1..98757878477c 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -87,6 +87,7 @@ Changelog * Maintenance: Use the Stimulus `ZoneController` (`w-zone`) to remove ad-hoc jQuery for the privacy switch when toggling visibility of private/public elements (Ayaan Q...
23275a4cef4d36bb311abe315eb9ddfc43868e8b
Update default profile image to "mp".
The following is the text of a github issue and related comments for this repository: Default URL param value for Gravatar URL have been deprecated (`mm` -> `mp`) ### Issue Summary We currently pass in `mm` to the `d` (default) param, this is used to determine what avatar will show if there's no matching avatar. Howe...
diff --git a/wagtail/users/utils.py b/wagtail/users/utils.py index ef3f0e6bb9c1..b3eee7970d07 100644 --- a/wagtail/users/utils.py +++ b/wagtail/users/utils.py @@ -26,7 +26,7 @@ def user_can_delete_user(current_user, user_to_delete): def get_gravatar_url(email, size=50): - default = "mm" + default = "mp" ...
null
diff --git a/wagtail/admin/tests/ui/test_sidebar.py b/wagtail/admin/tests/ui/test_sidebar.py index e5c21bc7f049..f2e160144651 100644 --- a/wagtail/admin/tests/ui/test_sidebar.py +++ b/wagtail/admin/tests/ui/test_sidebar.py @@ -283,7 +283,7 @@ def test_adapt(self): ], { ...
wagtail
12,605
diff --git a/wagtail/admin/views/generic/models.py b/wagtail/admin/views/generic/models.py index 636f7d13ef44..eac1265bb50a 100644 --- a/wagtail/admin/views/generic/models.py +++ b/wagtail/admin/views/generic/models.py @@ -677,6 +677,16 @@ def setup(self, request, *args, **kwargs): @cached_property def object_p...
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 4a5ad0704f70..20898fa5ff89 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -23,6 +23,7 @@ Changelog * Fix: Use correct connections on multi-database setups in database search backends (Jake Howard) * Fix: Ensure Cloudfront cache invalidation is called with a list, ...
ffe294bc7bb3fe49674a4b6eb87fe223b3348e01
Cache the unquoted primary key to prevent double unquoting, and update both `get_object` methods to properly use the cached value.
The following is the text of a github issue and related comments for this repository: Snippets EditView unexpected double unquote ### Issue Summary In case of EditView code snippets (I think this happens with all views as well), the get_object() method in wagtail/wagtail/admin/views/generic/models.py/EditView is call...
diff --git a/wagtail/admin/views/generic/models.py b/wagtail/admin/views/generic/models.py index 636f7d13ef44..eac1265bb50a 100644 --- a/wagtail/admin/views/generic/models.py +++ b/wagtail/admin/views/generic/models.py @@ -677,6 +677,16 @@ def setup(self, request, *args, **kwargs): super().setup(request, *args...
diff --git a/wagtail/admin/views/generic/models.py b/wagtail/admin/views/generic/models.py index 636f7d13ef44..eac1265bb50a 100644 --- a/wagtail/admin/views/generic/models.py +++ b/wagtail/admin/views/generic/models.py @@ -677,6 +677,16 @@ def setup(self, request, *args, **kwargs): super().setup(request, *args...
diff --git a/wagtail/admin/tests/test_views_generic.py b/wagtail/admin/tests/test_views_generic.py index 5f3a425ac82a..9dc605f17153 100644 --- a/wagtail/admin/tests/test_views_generic.py +++ b/wagtail/admin/tests/test_views_generic.py @@ -15,7 +15,7 @@ def test_non_integer_primary_key(self): response = self.ge...
wagtail
12,741
diff --git a/wagtail/documents/models.py b/wagtail/documents/models.py index e4ed73ae4b2..8495650374d 100644 --- a/wagtail/documents/models.py +++ b/wagtail/documents/models.py @@ -57,6 +57,7 @@ class AbstractDocument(CollectionMember, index.Indexed, models.Model): i
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 5cdc27de7fb..0f943ca6ab2 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -46,6 +46,7 @@ Changelog * Fix: Fix crash when loading the dashboard with only the "unlock" or "bulk delete" page permissions (Unyime Emmanuel Udoh, Sage Abdullah) * Fix: Improve deprecation w...
0bba5da337283ff594bf4701072fc2f02177e40b
Add a filter field for the "created_at" property to enable filtering documents by creation date.
The following is the text of a github issue and related comments for this repository: Ordering documents in search causes error <!-- Found a bug? Please fill out the sections below. 👍 --> ### Issue Summary Issue was discovered by editors when searching through uploaded documents with similar names. Attempt to order...
diff --git a/wagtail/documents/models.py b/wagtail/documents/models.py index e4ed73ae4b2..8495650374d 100644 --- a/wagtail/documents/models.py +++ b/wagtail/documents/models.py @@ -57,6 +57,7 @@ class AbstractDocument(CollectionMember, index.Indexed, models.Model): ], ), index.FilterField...
diff --git a/wagtail/documents/models.py b/wagtail/documents/models.py index e4ed73ae4b2..8495650374d 100644 --- a/wagtail/documents/models.py +++ b/wagtail/documents/models.py @@ -57,6 +57,7 @@ class AbstractDocument(CollectionMember, index.Indexed, models.Model): ], ), index.FilterField...
diff --git a/wagtail/documents/tests/test_admin_views.py b/wagtail/documents/tests/test_admin_views.py index 4711ae8ccad..1554bfd5061 100644 --- a/wagtail/documents/tests/test_admin_views.py +++ b/wagtail/documents/tests/test_admin_views.py @@ -30,6 +30,7 @@ ) from wagtail.test.utils import WagtailTestUtils from wag...
junit5
4,201
null
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java index 8aed7644f2d8..023dd6fea6d2 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTe...
16c6f72c1c728c015e35cb739ea75884f19f990c
Check that there is at least one arguments source configured, and fail with the message "Configuration error: You must configure at least one arguments source for this @ParameterizedTest" if none are found.
The following is the text of a github issue and related comments for this repository: Fail `@ParameterizedTest` if there is no registered `ArgumentProvider` Not declaring any `@...Source` annotation on a `@ParameterizedTest` method is most likely a user error and should be surfaced as a test failure rather than being ...
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java index 8aed7644f2d8..023dd6fea6d2 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTe...
null
diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/params/ParameterizedTestExtensionTests.java index 638cdbf95e1f..fbdf70e080c7 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/params/ParameterizedTestExtension...
junit5
4,004
null
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.11.1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.11.1.adoc index 8dc92f6310d9..f720d245b68b 100644 --- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.11.1.adoc +++ b/documentation/src/docs/asciidoc/relea...
40907ee498318782839ed93d3dea9941be894eb0
Split tasks into three groups: isolated tasks (using GlobalReadWriteLock), same-thread tasks, and concurrent tasks, then execute them in order with concurrent tasks in the middle to maximize parallelism.
The following is the text of a github issue and related comments for this repository: Poor thread utilization when using ExclusiveResource.GLOBAL_KEY When executing in parallel using a fixed number of threads, when several tests attempt to acquire a read/write lock against the `GLOBAL_KEY`, threads are likely to be as...
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorService.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorService.java index 4b2e332fd07a..c6ed2cb4b585 100644 -...
null
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionIntegrationTests.java index dbd5d519be63..b556240bc295 100644 --- a/platform-tests/src/test/java/...
junit5
4,044
null
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.12.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.12.0-M1.adoc index 5f8f864a4a6b..c9a3569af431 100644 --- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.12.0-M1.adoc +++ b/documentation/src/docs/ascii...
35d3dd71662beda795e3ce3c428b9a1215d8c9e4
Parse line and column numbers from URI query parameters when converting file and classpath resource selectors.
The following is the text of a github issue and related comments for this repository: Add support for passing line and column number to ConsoleLauncher via `--select-file` and `--select-resource` This should be done using the same syntax that is supported for the URI argument of dynamic tests (`?line=...&column=...`)....
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/SelectorConverter.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/SelectorConverter.java index 7c18320eba67..6f1803185706 100644 --- a/junit-platform-console/src/main/java/org/junit/platform/console/optio...
null
diff --git a/platform-tests/src/test/java/org/junit/platform/console/options/CommandLineOptionsParsingTests.java b/platform-tests/src/test/java/org/junit/platform/console/options/CommandLineOptionsParsingTests.java index 3b9b10935c9f..acb491afa48f 100644 --- a/platform-tests/src/test/java/org/junit/platform/console/opt...
junit5
3,924
null
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.11.0.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.11.0.adoc index f25bb175f4d9..862e81213d53 100644 --- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.11.0.adoc +++ b/documentation/src/docs/asciidoc/relea...
0b10f86dd2e0a7fd232c1de032d1e2fbe312f615
Allow -1 as a valid value for maxCharsPerColumn by updating the precondition check and its error message.
The following is the text of a github issue and related comments for this repository: @CsvFileSource is unusable for datasets involving very long lines # Description If you want to use a CSV file-based dataset, that contains very long values in the columns, you have to increase the `maxCharsPerColumn` property from t...
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java index 0efb81b3252b..d7ffee880cbc 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParse...
null
diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/params/provider/CsvArgumentsProviderTests.java index 0ea40f9c70e9..4aec498e9eca 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/params/provider/CsvArgument...
junit5
3,948
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/AnsiColorOptionMixin.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/AnsiColorOptionMixin.java index bfd1bdbf1474..19a29afac5e7 100644 --- a/junit-platform-console/src/main/java/org/junit/platform/console...
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.12.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.12.0-M1.adoc index 89a1753a5280..b935ad8a9832 100644 --- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.12.0-M1.adoc +++ b/documentation/src/docs/ascii...
26d4dbe863bff6a3b05cd9f7fd561dfe3a02c1cf
Initialize ANSI colors to be disabled when the NO_COLOR environment variable exists.
The following is the text of a github issue and related comments for this repository: Console launcher should support `NO_COLOR` environment variable Support `NO_COLOR` environment variable as described by https://no-color.org in JUnit's console launcher. Team decision: Check if picocli supports this already and, if ...
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/AnsiColorOptionMixin.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/AnsiColorOptionMixin.java index bfd1bdbf1474..19a29afac5e7 100644 --- a/junit-platform-console/src/main/java/org/junit/platform/console...
diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/AnsiColorOptionMixin.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/AnsiColorOptionMixin.java index bfd1bdbf1474..19a29afac5e7 100644 --- a/junit-platform-console/src/main/java/org/junit/platform/console...
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/StandaloneTests.java index 98f3bb5104a4..e033b3e62e97 100644 --- a/platform-tooling-support-tests/src/test/java/platform/tooling/sup...
junit5
4,191
null
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.12.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.12.0-M1.adoc index 90112bdc7455..4b3b26d38b76 100644 --- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.12.0-M1.adoc +++ b/documentation/src/docs/ascii...
16c6f72c1c728c015e35cb739ea75884f19f990c
Use the ClasspathScannerLoader to get a ClasspathScanner instance and update resource creation to use DefaultResource instead of ClasspathResource.
The following is the text of a github issue and related comments for this repository: Allow third parties to provide a custom `ClasspathScanner` implementation The Jupiter and Vintage engines use `org.junit.platform.commons.util.ClasspathScanner` to discover test classes in the classpath. The `ClasspathScanner` scans ...
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java index 2dafd46d5344..3f8a23d2857d 100644 --- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/Reflection...
null
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/util/CloseablePathTests.java b/platform-tests/src/test/java/org/junit/platform/commons/support/scanning/CloseablePathTests.java similarity index 90% rename from platform-tests/src/test/java/org/junit/platform/commons/util/CloseablePathTests.java renam...
junit5
4,039
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeExecutionAdvisor.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeExecutionAdvisor.java index c3863a049342..eb95daab0237 100644 --- a/junit-platform-engine/src/main/java/org/j...
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.11.2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.11.2.adoc index 36d267b0e339..fcf7313a6354 100644 --- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.11.2.adoc +++ b/documentation/src/docs/asciidoc/relea...
daec7959e7c0d7dd60109bb088216c91601c5e11
Skip processing nodes when a global read-write lock is already being enforced, and when enforcing a global read-write lock, remove any existing locks from descendants.
The following is the text of a github issue and related comments for this repository: Declaring the global read-write lock on a leaf node should not fail execution I've upgraded my Cucumber test framework with JUnit 5.11.1 and I get a new error: ``` [ERROR] Task was deferred but should have been executed synchronous...
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalker.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTreeWalker.java index 8e47d006849c..ada030923b76 100644 --- a/junit-platform-engine/src/main/java/org/junit/platfor...
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeExecutionAdvisor.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeExecutionAdvisor.java index c3863a049342..eb95daab0237 100644 --- a/junit-platform-engine/src/main/java/org/j...
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionIntegrationTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ParallelExecutionIntegrationTests.java index b556240bc295..4634c4c94f57 100644 --- a/platform-tests/src/test/java/...
junit5
4,266
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java index 810d180e3da8..89f7784d8c57 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java +++ b/junit-jupiter...
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.12.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.12.0-M1.adoc index 5d6ceaea5dc0..0abbde8c9af2 100644 --- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.12.0-M1.adoc +++ b/documentation/src/docs/ascii...
6d260dadaa8416305fb2d80104827e916bc1f617
Modify the display name utility methods to accept and use a list of enclosing instance types when generating display names for methods and nested classes.
The following is the text of a github issue and related comments for this repository: `DisplayNameGenerator` cannot access runtime enclosing type for `@Nested` test class ## Overview A `DisplayNameGenerator` can access the type of a `@Nested` test class as well as the enclosing class in which a `@Nested` test class i...
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DisplayNameUtils.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DisplayNameUtils.java index ebe3d127bf0c..76b65ef5e49a 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/Di...
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java index 810d180e3da8..89f7784d8c57 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisplayNameGenerator.java +++ b/junit-jupiter...
diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/api/DisplayNameGenerationTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/api/DisplayNameGenerationTests.java index 8dbea0cdb42d..c7a1fe90efc6 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/api/DisplayNameGenerationTests.java +++ b/jupiter...
junit5
4,082
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extensions.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extensions.java index 652c606d63cb..3607def6d0aa 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extensions.java +++ b/junit-jupiter...
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.11.3.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.11.3.adoc index 55fcc69e76fd..d364b73b4739 100644 --- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.11.3.adoc +++ b/documentation/src/docs/asciidoc/relea...
bd46bf8045e7df97e241611329842e8190d1fbda
Make Extensions annotation applicable to fields and parameters in addition to types and methods.
The following is the text of a github issue and related comments for this repository: `@ExtendWith` cannot be used as a repeatable annotation directly on fields and parameters ## Overview When I introduced support for declarative extension registration on fields and parameters in JUnit Jupiter 5.8, I neglected to syn...
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extensions.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extensions.java index 652c606d63cb..3607def6d0aa 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extensions.java +++ b/junit-jupiter...
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extensions.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extensions.java index 652c606d63cb..3607def6d0aa 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/Extensions.java +++ b/junit-jupiter...
diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java index 9e934c3a9875..a9f04addddd6 100644 --- a/jupiter-tests/src/test/ja...
junit5
4,025
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java index f625faac7f17..aefbba1f2adc 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTe...
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.12.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.12.0-M1.adoc index c37680f13b5d..e23dcb707c34 100644 --- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.12.0-M1.adoc +++ b/documentation/src/docs/ascii...
54a6cb16e53f31885ede29e002d171bd588d558c
Use the `ParameterizedTestSpiInstantiator` to create argument converters and aggregators instead of directly instantiating them, and pass the extension context to the resolver creation methods.
The following is the text of a github issue and related comments for this repository: Add constructor injection support for `ArgumentsProvider`, `ArgumentConverter`, and `ArgumentsAggregator` It is possible to provide parameters to the constructor of a test class, and also to a method used by `@ParameterizedTest`/`@Me...
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestMethodContext.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestMethodContext.java index 1b88b3a14467..a7469d4f4003 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/Paramet...
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java index f625faac7f17..aefbba1f2adc 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTe...
diff --git a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc index 463faad468c8..2dc985d9a872 100644 --- a/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc +++ b/documentation/src/docs/asciidoc/user-guide/writing-tests.adoc @@ -1...
junit5
4,077
null
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.11.3.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.11.3.adoc index c8ed02a67ceb..55fcc69e76fd 100644 --- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.11.3.adoc +++ b/documentation/src/docs/asciidoc/relea...
91924ec1f18066f8c36890882a9c321cf7a50841
Use the getPackageName utility function to safely compare package names of declaring classes.
The following is the text of a github issue and related comments for this repository: Test discovery failing with NullPointerException when trying to find methods of a test class ## Context We observe test discovery failing with a `NullPointerException` when trying to find test class methods (stacktrace is attached b...
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java index 26bd8e1698cf..77e270376854 100644 --- a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/Reflection...
null
diff --git a/platform-tooling-support-tests/projects/vintage/src/test/java/DefaultPackageTest.java b/platform-tooling-support-tests/projects/vintage/src/test/java/DefaultPackageTest.java new file mode 100644 index 000000000000..beebfdd5fd54 --- /dev/null +++ b/platform-tooling-support-tests/projects/vintage/src/test/ja...
json
4,512
diff --git a/include/nlohmann/detail/iterators/iter_impl.hpp b/include/nlohmann/detail/iterators/iter_impl.hpp index 4447091347..106c23fb2e 100644 --- a/include/nlohmann/detail/iterators/iter_impl.hpp +++ b/include/nlohmann/detail/iterators/iter_impl.hpp @@ -474,7 +474,11 @@ class iter_impl // NOLINT(cppcoreguidelines-...
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 152a4514b9..4ba491a831 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -35,28 +35,29 @@ jobs: # - name: Test # run: cd build ; ctest -j 10 --output-on-failure - macos-12: - runs-on: macos-12 # ...
ee32bfc1c263900d5c31cf8a8c5429048719e42a
Handle default-initialized iterators by considering them equal: if both iterators have `m_object == nullptr`, return `true` for equality and `false` for less-than comparison.
The following is the text of a github issue and related comments for this repository: Default initialized iterators are not comparable ### Description I have a use-case where I iterate over collections in a generic manner (using templates). However, iteration over basic_json fails due to the statement: ``` JS...
diff --git a/include/nlohmann/detail/iterators/iter_impl.hpp b/include/nlohmann/detail/iterators/iter_impl.hpp index 4447091347..106c23fb2e 100644 --- a/include/nlohmann/detail/iterators/iter_impl.hpp +++ b/include/nlohmann/detail/iterators/iter_impl.hpp @@ -463,7 +463,7 @@ class iter_impl // NOLINT(cppcoreguidelines-s...
diff --git a/include/nlohmann/detail/iterators/iter_impl.hpp b/include/nlohmann/detail/iterators/iter_impl.hpp index 4447091347..106c23fb2e 100644 --- a/include/nlohmann/detail/iterators/iter_impl.hpp +++ b/include/nlohmann/detail/iterators/iter_impl.hpp @@ -474,7 +474,11 @@ class iter_impl // NOLINT(cppcoreguidelines-...
diff --git a/tests/src/unit-iterators3.cpp b/tests/src/unit-iterators3.cpp new file mode 100644 index 0000000000..4b5cff7e21 --- /dev/null +++ b/tests/src/unit-iterators3.cpp @@ -0,0 +1,35 @@ +// __ _____ _____ _____ +// __| | __| | | | JSON for Modern C++ (supporting code) +// | | |__ | | | | | | ...
json
4,525
null
diff --git a/docs/mkdocs/docs/api/basic_json/get_ptr.md b/docs/mkdocs/docs/api/basic_json/get_ptr.md index 2441e1156e..b1ecf44d82 100644 --- a/docs/mkdocs/docs/api/basic_json/get_ptr.md +++ b/docs/mkdocs/docs/api/basic_json/get_ptr.md @@ -35,7 +35,35 @@ Constant. !!! danger "Undefined behavior" - Writing data t...
1b9a9d1f2122e73b69f5d62d0ce3ebda8cd41ff0
Check specifically for signed integer type instead of using the more general number check when getting a pointer to an integer value.
The following is the text of a github issue and related comments for this repository: Invalid union access for get_ref/get_ptr with unsigned integer ### Description When a JSON value is stored as unsigned integer, it is possible to call `get_ref<number_integer_t>()` or `get_ptr<number_integer_t>()` without error, whi...
diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp index e004e83082..763fd95783 100644 --- a/include/nlohmann/json.hpp +++ b/include/nlohmann/json.hpp @@ -1463,13 +1463,13 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec /// get a pointer to the value (integer num...
null
diff --git a/tests/src/unit-pointer_access.cpp b/tests/src/unit-pointer_access.cpp index 6b1a6f8a83..b5734559bc 100644 --- a/tests/src/unit-pointer_access.cpp +++ b/tests/src/unit-pointer_access.cpp @@ -326,7 +326,7 @@ TEST_CASE("pointer access") CHECK(value.get_ptr<json::array_t*>() == nullptr); CHEC...
json
4,536
diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp index 763fd95783..0d67c1abeb 100644 --- a/include/nlohmann/json.hpp +++ b/include/nlohmann/json.hpp @@ -4839,8 +4840,8 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec const auto get_value = @@ -4874,8 +48...
diff --git a/include/nlohmann/detail/iterators/iteration_proxy.hpp b/include/nlohmann/detail/iterators/iteration_proxy.hpp index e2d57c5dcf..d3b6b760f4 100644 --- a/include/nlohmann/detail/iterators/iteration_proxy.hpp +++ b/include/nlohmann/detail/iterators/iteration_proxy.hpp @@ -10,7 +10,6 @@ #include <cstddef> /...
e6cafa573aac6ed9227f752a5371c0b3f436307d
Replace all usages of `std::string` with the template parameter `string_t` in the patching and diffing operations.
The following is the text of a github issue and related comments for this repository: patch_inplace assumes StringType is std::string ### Description `patch_inplace` has several instances of `get<std::string>`, which breaks the build if you're using a custom string. ### Reproduction steps - Instantiate a nlohmann::...
diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp index 763fd95783..0d67c1abeb 100644 --- a/include/nlohmann/json.hpp +++ b/include/nlohmann/json.hpp @@ -4702,7 +4703,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec // the valid JSON Patch operations ...
diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp index 763fd95783..0d67c1abeb 100644 --- a/include/nlohmann/json.hpp +++ b/include/nlohmann/json.hpp @@ -4839,8 +4840,8 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec for (const auto& val : json_patch) ...
diff --git a/tests/src/unit-alt-string.cpp b/tests/src/unit-alt-string.cpp index 53dcd80c8d..2999959798 100644 --- a/tests/src/unit-alt-string.cpp +++ b/tests/src/unit-alt-string.cpp @@ -35,10 +35,21 @@ class alt_string alt_string(size_t count, char chr): str_impl(count, chr) {} alt_string() = default; - ...
json
4,537
diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp index 763fd95783..8ec9720ee7 100644 --- a/include/nlohmann/json.hpp +++ b/include/nlohmann/json.hpp @@ -3401,6 +3401,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec s
diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp index 763fd95783..8ec9720ee7 100644 --- a/include/nlohmann/json.hpp +++ b/include/nlohmann/json.hpp @@ -3401,6 +3401,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec } m_data.m_value.object->inser...
e6cafa573aac6ed9227f752a5371c0b3f436307d
Set parent pointers for all elements after inserting elements into the JSON object.
The following is the text of a github issue and related comments for this repository: JSON_DIAGNOSTICS trigger assertion ### Description Hi, I have activated the JSON_DIAGNOSTICS=1 globally in my project and ASSERTION are now fired at runtime. I tested it on with 3.10.5 and then with latest release 3.11.2. I have d...
diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp index 763fd95783..8ec9720ee7 100644 --- a/include/nlohmann/json.hpp +++ b/include/nlohmann/json.hpp @@ -3401,6 +3401,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec } m_data.m_value.object->inser...
diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp index 763fd95783..8ec9720ee7 100644 --- a/include/nlohmann/json.hpp +++ b/include/nlohmann/json.hpp @@ -3401,6 +3401,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec } m_data.m_value.object->inser...
diff --git a/tests/src/unit-diagnostics.cpp b/tests/src/unit-diagnostics.cpp index 345d6eee29..472d11e283 100644 --- a/tests/src/unit-diagnostics.cpp +++ b/tests/src/unit-diagnostics.cpp @@ -242,4 +242,24 @@ TEST_CASE("Regression tests for extended diagnostics") json const j_arr_copy = j_arr; } ...
json
3,685
diff --git a/include/nlohmann/detail/json_pointer.hpp b/include/nlohmann/detail/json_pointer.hpp index 28de450280..ce593e8430 100644 --- a/include/nlohmann/detail/json_pointer.hpp +++ b/include/nlohmann/detail/json_pointer.hpp @@ -862,6 +862,13 @@ class json_pointer /// @brief 3-way compares two JSON pointers ...
diff --git a/include/nlohmann/detail/json_pointer.hpp b/include/nlohmann/detail/json_pointer.hpp index 28de450280..ce593e8430 100644 --- a/include/nlohmann/detail/json_pointer.hpp +++ b/include/nlohmann/detail/json_pointer.hpp @@ -847,7 +847,7 @@ class json_pointer } public: -#ifdef JSON_HAS_CPP_20 +#if JSON_...
b0422f8013ae3cb11faad01700b58f8fc3654311
Add a spaceship operator for three-way comparison when THREE_WAY_COMPARISON is available, and add a less-than operator otherwise, both comparing reference_tokens directly.
The following is the text of a github issue and related comments for this repository: Add operator<(json_pointer, json_pointer) and operator<=>(json_pointer) (C++20) to make json_pointer usable as a map key. Gate based on #if JSON_HAS_THREE_WAY_COMPARISON rather than -#ifdef JSON_HAS_CPP_20. Resolve the issue describ...
diff --git a/include/nlohmann/detail/json_pointer.hpp b/include/nlohmann/detail/json_pointer.hpp index 28de450280..ce593e8430 100644 --- a/include/nlohmann/detail/json_pointer.hpp +++ b/include/nlohmann/detail/json_pointer.hpp @@ -847,7 +847,7 @@ class json_pointer } public: -#ifdef JSON_HAS_CPP_20 +#if JSON_...
diff --git a/include/nlohmann/detail/json_pointer.hpp b/include/nlohmann/detail/json_pointer.hpp index 28de450280..ce593e8430 100644 --- a/include/nlohmann/detail/json_pointer.hpp +++ b/include/nlohmann/detail/json_pointer.hpp @@ -862,6 +862,13 @@ class json_pointer { return *this == json_pointer(rhs); ...
diff --git a/tests/src/unit-json_pointer.cpp b/tests/src/unit-json_pointer.cpp index f6e2b00c00..cbe13bbde1 100644 --- a/tests/src/unit-json_pointer.cpp +++ b/tests/src/unit-json_pointer.cpp @@ -15,6 +15,7 @@ using nlohmann::json; using namespace nlohmann::literals; // NOLINT(google-build-using-namespace) #endif ...
json
3,678
null
diff --git a/include/nlohmann/detail/conversions/to_json.hpp b/include/nlohmann/detail/conversions/to_json.hpp index ba24c118d0..f10a7393ef 100644 --- a/include/nlohmann/detail/conversions/to_json.hpp +++ b/include/nlohmann/detail/conversions/to_json.hpp @@ -267,9 +267,15 @@ inline void to_json(BasicJsonType& j, T b) n...
b0422f8013ae3cb11faad01700b58f8fc3654311
Add a template parameter for the boolean reference type and modify the enable_if conditions to handle both regular and const vector<bool> references without causing reference qualifier warnings.
The following is the text of a github issue and related comments for this repository: Fix -Wignored-reference-qualifiers In certain STLs, `std::vector<bool>::reference` is just `bool&`. Prepending `const` causes the following warning: ``` include/nlohmann/detail/conversions/to_json.hpp:271:42: error: 'const' qualifier...
diff --git a/include/nlohmann/detail/conversions/to_json.hpp b/include/nlohmann/detail/conversions/to_json.hpp index ba24c118d0..f10a7393ef 100644 --- a/include/nlohmann/detail/conversions/to_json.hpp +++ b/include/nlohmann/detail/conversions/to_json.hpp @@ -267,9 +267,15 @@ inline void to_json(BasicJsonType& j, T b) n...
null
diff --git a/tests/src/unit-constructor1.cpp b/tests/src/unit-constructor1.cpp index f294e5cd64..9e62a09f87 100644 --- a/tests/src/unit-constructor1.cpp +++ b/tests/src/unit-constructor1.cpp @@ -454,10 +454,19 @@ TEST_CASE("constructors") CHECK(j.type() == json::value_t::boolean); } - SEC...
json
3,664
diff --git a/include/nlohmann/json_fwd.hpp b/include/nlohmann/json_fwd.hpp index c7ad236602..be197359cd 100644 --- a/include/nlohmann/json_fwd.hpp +++ b/include/nlohmann/json_fwd.hpp @@ -51,7 +51,7 @@ class basic_json; t
diff --git a/docs/examples/json_pointer__operator__equal.cpp b/docs/examples/json_pointer__operator__equal.cpp new file mode 100644 index 0000000000..dce6df03c3 --- /dev/null +++ b/docs/examples/json_pointer__operator__equal.cpp @@ -0,0 +1,19 @@ +#include <iostream> +#include <nlohmann/json.hpp> + +using json = nlohman...
e839f58a2ac1bfe966ebf17a1971167e17b6921d
Add comparison operators (==, !=) between JSON pointers and strings, properly handling both pre-C++20 and C++20 cases.
The following is the text of a github issue and related comments for this repository: Regression: no match for 'operator!=' comparing json_pointer and const char */string_t ### Description Comparing a `json_pointer` and `const char *`/`const char[N]`/`json_pointer::string_t` fails to compile. v3.10.5 compiles. ### ...
diff --git a/include/nlohmann/detail/json_pointer.hpp b/include/nlohmann/detail/json_pointer.hpp index 5b76326766..28de450280 100644 --- a/include/nlohmann/detail/json_pointer.hpp +++ b/include/nlohmann/detail/json_pointer.hpp @@ -846,55 +846,118 @@ class json_pointer return result; } - /*! - @bri...
diff --git a/include/nlohmann/json_fwd.hpp b/include/nlohmann/json_fwd.hpp index c7ad236602..be197359cd 100644 --- a/include/nlohmann/json_fwd.hpp +++ b/include/nlohmann/json_fwd.hpp @@ -51,7 +51,7 @@ class basic_json; /// @brief JSON Pointer defines a string syntax for identifying a specific value within a JSON doc...
diff --git a/tests/src/unit-json_pointer.cpp b/tests/src/unit-json_pointer.cpp index 93559eb31e..f6e2b00c00 100644 --- a/tests/src/unit-json_pointer.cpp +++ b/tests/src/unit-json_pointer.cpp @@ -651,11 +651,50 @@ TEST_CASE("JSON pointers") SECTION("equality comparison") { - auto ptr1 = json::json_poi...
json
4,505
diff --git a/include/nlohmann/detail/input/lexer.hpp b/include/nlohmann/detail/input/lexer.hpp index 059a080739..6ed7912eaf 100644 --- a/include/nlohmann/detail/input/lexer.hpp +++ b/include/nlohmann/detail/input/lexer.hpp @@ -1049,6 +1049,7 @@ class lexer : public lexer_base<BasicJsonType> decimal_poin...
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index ccc07626aa..31ba37060e 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -104,23 +104,29 @@ jobs: ci_test_coverage: runs-on: ubuntu-latest - container: ghcr.io/nlohmann/json-ci:v2.4.0 permissio...
378e091795a70fced276cd882bd8a6a428668fe5
Track the position of the decimal point in numbers and restore it to '.' before returning the string representation.
The following is the text of a github issue and related comments for this repository: SAX interface unexpectedly gets locale-altered float representation. ### Description I didn't expect (neither from experience, nor from the documentation) that the float string representation would be altered according to the locale...
diff --git a/include/nlohmann/detail/input/lexer.hpp b/include/nlohmann/detail/input/lexer.hpp index 059a080739..6ed7912eaf 100644 --- a/include/nlohmann/detail/input/lexer.hpp +++ b/include/nlohmann/detail/input/lexer.hpp @@ -1049,6 +1049,7 @@ class lexer : public lexer_base<BasicJsonType> case '.': ...
diff --git a/include/nlohmann/detail/input/lexer.hpp b/include/nlohmann/detail/input/lexer.hpp index 059a080739..6ed7912eaf 100644 --- a/include/nlohmann/detail/input/lexer.hpp +++ b/include/nlohmann/detail/input/lexer.hpp @@ -1049,6 +1049,7 @@ class lexer : public lexer_base<BasicJsonType> case '.': ...
diff --git a/tests/src/unit-locale-cpp.cpp b/tests/src/unit-locale-cpp.cpp new file mode 100644 index 0000000000..846b450c6a --- /dev/null +++ b/tests/src/unit-locale-cpp.cpp @@ -0,0 +1,161 @@ +// __ _____ _____ _____ +// __| | __| | | | JSON for Modern C++ (supporting code) +// | | |__ | | | | | |...
freeCodeCamp
54,346
null
diff --git a/client/src/client-only-routes/show-certification.tsx b/client/src/client-only-routes/show-certification.tsx index 280662b6710c2c..aaaafc9d4bfbbb 100644 --- a/client/src/client-only-routes/show-certification.tsx +++ b/client/src/client-only-routes/show-certification.tsx @@ -35,8 +35,10 @@ import { import {...
f2917738fc33edc330e24fb4d8c3b29b675c24c5
Create a credential ID by combining the username and certification abbreviation from `linkedInCredentialIds`, and add it to the LinkedIn share URL parameter list.
The following is the text of a github issue and related comments for this repository: Add LinkedIn Credential ID parameter to LinkedIn button LinkedIn recently added a "Credential ID" field to their form. We want to automatically generate this and populate it, as it will add an additional line of information to the Li...
diff --git a/client/src/client-only-routes/show-certification.tsx b/client/src/client-only-routes/show-certification.tsx index 280662b6710c2c..aaaafc9d4bfbbb 100644 --- a/client/src/client-only-routes/show-certification.tsx +++ b/client/src/client-only-routes/show-certification.tsx @@ -35,8 +35,10 @@ import { import {...
null
diff --git a/e2e/certification.spec.ts b/e2e/certification.spec.ts index f82b516190c9fe..cb8a3bb1de77f4 100644 --- a/e2e/certification.spec.ts +++ b/e2e/certification.spec.ts @@ -55,7 +55,7 @@ test.describe('Certification page - Non Microsoft', () => { await expect(linkedinLink).toBeVisible(); await expect(li...
freeCodeCamp
54,128
null
diff --git a/client/src/pages/update-email.css b/client/src/client-only-routes/show-update-email.css similarity index 100% rename from client/src/pages/update-email.css rename to client/src/client-only-routes/show-update-email.css diff --git a/client/src/client-only-routes/show-update-email.tsx b/client/src/client-only...
9bcf70206d3111eefae7c5e1b9b0556470c0cb07
Remove the existing UpdateEmail implementation and instead implement the component using a Router to ShowUpdateEmail or RedirectHome. In addition, update display name to "UpdateEmail".
The following is the text of a github issue and related comments for this repository: Update email page should be gated behind authentication ### Describe the Issue The update email page is currently accessible even if the user is signed out. ### Affected Page https://www.freecodecamp.org/update-email ### Steps to...
diff --git a/client/src/pages/update-email.tsx b/client/src/pages/update-email.tsx index 1d9745d4f5cc0f..5ed95699ba1820 100644 --- a/client/src/pages/update-email.tsx +++ b/client/src/pages/update-email.tsx @@ -1,131 +1,20 @@ -import { Link } from 'gatsby'; -import { isString } from 'lodash-es'; -import React, { useSta...
null
diff --git a/e2e/update-email.spec.ts b/e2e/update-email.spec.ts index 9bf96a61de516d..0ed02e8f9d64b8 100644 --- a/e2e/update-email.spec.ts +++ b/e2e/update-email.spec.ts @@ -1,33 +1,24 @@ -import { test, expect, type Page } from '@playwright/test'; +import { test, expect } from '@playwright/test'; import translations...
freeCodeCamp
54,529
null
diff --git a/api/src/routes/donate.ts b/api/src/routes/donate.ts index e7ba329754be10..82b82cde2d4b0d 100644 --- a/api/src/routes/donate.ts +++ b/api/src/routes/donate.ts @@ -102,6 +102,17 @@ export const donateRoutes: FastifyPluginCallbackTypebox = ( }); const { email, name } = user; + const...
f8426e617eb277e62e123fc538dda5ea2c42bb62
If the user has not completed at least 3 challenges, return a 400 status code with a MethodRestrictionError and the message "Donate using another method".
The following is the text of a github issue and related comments for this repository: POST /donate/charge-stripe-card Update charge stripe card endpoint with the recent changes in api-server/src/server/utils/donation.js, which blocks donations if the user has not completed three challenges. The error should be: type...
diff --git a/api/src/routes/donate.ts b/api/src/routes/donate.ts index e7ba329754be10..82b82cde2d4b0d 100644 --- a/api/src/routes/donate.ts +++ b/api/src/routes/donate.ts @@ -102,6 +102,17 @@ export const donateRoutes: FastifyPluginCallbackTypebox = ( }); const { email, name } = user; + const...
null
diff --git a/api/src/routes/donate.test.ts b/api/src/routes/donate.test.ts index ff1a35f15d4c4b..78b87824873f35 100644 --- a/api/src/routes/donate.test.ts +++ b/api/src/routes/donate.test.ts @@ -1,9 +1,12 @@ +import type { Prisma } from '@prisma/client'; import { createSuperRequest, devLogin, setupServer, - ...
freeCodeCamp
54,715
diff --git a/client/src/templates/Challenges/components/completion-modal.tsx b/client/src/templates/Challenges/components/completion-modal.tsx index ecdb17835e3925..f3c2f76ba159ba 100644 --- a/client/src/templates/Challenges/components/completion-modal.tsx +++ b/client/src/templates/Challenges/components/completion-mod...
diff --git a/client/src/templates/Challenges/components/completion-modal.tsx b/client/src/templates/Challenges/components/completion-modal.tsx index ecdb17835e3925..f3c2f76ba159ba 100644 --- a/client/src/templates/Challenges/components/completion-modal.tsx +++ b/client/src/templates/Challenges/components/completion-mod...
1b24cee57d74f87ebc6a82d254b7370e07d9cc25
Show " (Command + Enter)" instead of " (Ctrl + Enter)" in the button text when the user is on MacOS.
The following is the text of a github issue and related comments for this repository: For MacOS, the submit button of the completion modal should display Command + Enter ## Description The submit button on the completion modal always displays Ctrl + Enter, but it should be Command + Enter if the user is on MacOS. ht...
diff --git a/client/src/templates/Challenges/components/completion-modal.tsx b/client/src/templates/Challenges/components/completion-modal.tsx index ecdb17835e3925..f3c2f76ba159ba 100644 --- a/client/src/templates/Challenges/components/completion-modal.tsx +++ b/client/src/templates/Challenges/components/completion-mod...
diff --git a/client/src/templates/Challenges/components/completion-modal.tsx b/client/src/templates/Challenges/components/completion-modal.tsx index ecdb17835e3925..f3c2f76ba159ba 100644 --- a/client/src/templates/Challenges/components/completion-modal.tsx +++ b/client/src/templates/Challenges/components/completion-mod...
diff --git a/e2e/completion-modal.spec.ts b/e2e/completion-modal.spec.ts index c85db1b4520cb8..05b242faef48cf 100644 --- a/e2e/completion-modal.spec.ts +++ b/e2e/completion-modal.spec.ts @@ -33,6 +33,33 @@ test.describe('Challenge Completion Modal Tests (Signed Out)', () => { await expect(page.getByTestId('complet...
freeCodeCamp
54,261
diff --git a/client/src/utils/solution-display-type.ts b/client/src/utils/solution-display-type.ts index c15c123e56c753..e84839b0bbdf42 100644 --- a/client/src/utils/solution-display-type.ts +++ b/client/src/utils/solution-display-type.ts @@ -19,8 +19,7 @@ export const getSolutionDisplayType = ({ return
diff --git a/client/src/utils/solution-display-type.ts b/client/src/utils/solution-display-type.ts index c15c123e56c753..e84839b0bbdf42 100644 --- a/client/src/utils/solution-display-type.ts +++ b/client/src/utils/solution-display-type.ts @@ -19,8 +19,7 @@ export const getSolutionDisplayType = ({ }: CompletedChallenge...
002212c43786f3f2ad85f39a2228d0aefb31b923
Do not show multifile project solutions for Python certification projects.
The following is the text of a github issue and related comments for this repository: Viewing multifile Python cert project solutions show blank page ### Describe the Issue After submitting one of the new multifile Python cert projects, when you try to view the **project** on your settings page - it shows a blank pag...
diff --git a/client/src/utils/solution-display-type.ts b/client/src/utils/solution-display-type.ts index c15c123e56c753..e84839b0bbdf42 100644 --- a/client/src/utils/solution-display-type.ts +++ b/client/src/utils/solution-display-type.ts @@ -19,8 +19,7 @@ export const getSolutionDisplayType = ({ }: CompletedChallenge...
diff --git a/client/src/utils/solution-display-type.ts b/client/src/utils/solution-display-type.ts index c15c123e56c753..e84839b0bbdf42 100644 --- a/client/src/utils/solution-display-type.ts +++ b/client/src/utils/solution-display-type.ts @@ -19,8 +19,7 @@ export const getSolutionDisplayType = ({ }: CompletedChallenge...
diff --git a/client/src/utils/solution-display-type.test.ts b/client/src/utils/solution-display-type.test.ts index aeb541fb1676c7..9eed5971a17223 100644 --- a/client/src/utils/solution-display-type.test.ts +++ b/client/src/utils/solution-display-type.test.ts @@ -23,7 +23,7 @@ describe('getSolutionDisplayType', () => { ...
freeCodeCamp
55,414
null
diff --git a/client/i18n/locales/english/translations.json b/client/i18n/locales/english/translations.json index 760b5862ae73cb..86670b1af5fcd8 100644 --- a/client/i18n/locales/english/translations.json +++ b/client/i18n/locales/english/translations.json @@ -732,6 +732,7 @@ "last-page": "Go to last page", "pr...
48dd77160499fc36b0e9cbc2295db5840dd022b9
Replace the hard-coded aria-label for the nav element with the translation key and remove the redundant role attribute.
The following is the text of a github issue and related comments for this repository: Use translation string in timeline pagination ## Description The `aria-label` is being hard-coded with an English string, we should change this to use a translation string instead. Additionally, the `role='navigation'` attribute is ...
diff --git a/client/src/components/profile/components/timeline-pagination.tsx b/client/src/components/profile/components/timeline-pagination.tsx index 41a94bde84e4b7..737483d34f5603 100644 --- a/client/src/components/profile/components/timeline-pagination.tsx +++ b/client/src/components/profile/components/timeline-pagi...
null
diff --git a/client/src/components/profile/components/__snapshots__/timeline-buttons.test.js.snap b/client/src/components/profile/components/__snapshots__/timeline-buttons.test.js.snap index 9ed4b0075264e0..fc10d652fcc61e 100644 --- a/client/src/components/profile/components/__snapshots__/timeline-buttons.test.js.snap ...
freeCodeCamp
57,104
diff --git a/client/src/redux/settings/actions.js b/client/src/redux/settings/actions.js index bb451ca2d96fbd..466e74dfa22ae5 100644 --- a/client/src/redux/settings/actions.js +++ b/client/src/redux/settings/actions.js @@ -105,5 +105,13 @@ export const verifyCertError = createAction(types.verifyCertError); export const...
diff --git a/client/i18n/locales/english/translations.json b/client/i18n/locales/english/translations.json index f086b5ea6508e3..e3872e81b6b6b0 100644 --- a/client/i18n/locales/english/translations.json +++ b/client/i18n/locales/english/translations.json @@ -238,6 +238,8 @@ "sound-mode": "This adds the pleasant so...
9904520aabd87a44e64b266bd8adb5b99b4a7ff8
Add a button labeled "Reset Editor Layout" (with id "reset-layout-btn") that is disabled when there is no custom editor layout, and show a tooltip explaining that it resets the editor layout to its default state. Make sure to use the correct text from the translation file.
The following is the text of a github issue and related comments for this repository: Reset editor layout option ### Is your feature request related to a problem? Please describe. We fairly frequently get support threads with campers that have gotten the editor into some unusable state by dragging the layout around. ...
diff --git a/client/src/components/settings/misc-settings.tsx b/client/src/components/settings/misc-settings.tsx index e5c4eab557c1bc..2518cf35a4dc85 100644 --- a/client/src/components/settings/misc-settings.tsx +++ b/client/src/components/settings/misc-settings.tsx @@ -1,6 +1,6 @@ import React from 'react'; import {...
diff --git a/client/src/redux/settings/actions.js b/client/src/redux/settings/actions.js index bb451ca2d96fbd..466e74dfa22ae5 100644 --- a/client/src/redux/settings/actions.js +++ b/client/src/redux/settings/actions.js @@ -105,5 +105,13 @@ export const verifyCertError = createAction(types.verifyCertError); export cons...
diff --git a/e2e/reset-editor-layout.spec.ts b/e2e/reset-editor-layout.spec.ts new file mode 100644 index 00000000000000..11af13d2b95b49 --- /dev/null +++ b/e2e/reset-editor-layout.spec.ts @@ -0,0 +1,48 @@ +import { test, expect } from '@playwright/test'; +test.use({ storageState: 'playwright/.auth/certified-user.json'...
freeCodeCamp
57,084
diff --git a/client/src/components/profile/components/portfolio.tsx b/client/src/components/profile/components/portfolio.tsx index 987277134c2e30..7d45bae306b12a 100644 --- a/client/src/components/profile/components/portfolio.tsx +++ b/client/src/components/profile/components/portfolio.tsx @@ -33,6 +33,7 @@ type Portfo...
diff --git a/client/src/components/profile/components/portfolio.tsx b/client/src/components/profile/components/portfolio.tsx index 987277134c2e30..7d45bae306b12a 100644 --- a/client/src/components/profile/components/portfolio.tsx +++ b/client/src/components/profile/components/portfolio.tsx @@ -33,6 +33,7 @@ type Portfo...
50f0c23d15d40dafb22c0251665750be1edb759a
Track whether images are valid by actually loading them and checking for errors, displaying "URL must link directly to an image file" if loading fails.
The following is the text of a github issue and related comments for this repository: Weird validation for portfolio inputs in the setting page ### Describe the Issue Validations are weirdly strict in imageUrl, but can still accept broken result, but lenient on URL section, although it doesn't accept broken URL. ###...
diff --git a/client/src/components/profile/components/portfolio.tsx b/client/src/components/profile/components/portfolio.tsx index 987277134c2e30..7d45bae306b12a 100644 --- a/client/src/components/profile/components/portfolio.tsx +++ b/client/src/components/profile/components/portfolio.tsx @@ -33,6 +33,7 @@ type Portfo...
diff --git a/client/src/components/profile/components/portfolio.tsx b/client/src/components/profile/components/portfolio.tsx index 987277134c2e30..7d45bae306b12a 100644 --- a/client/src/components/profile/components/portfolio.tsx +++ b/client/src/components/profile/components/portfolio.tsx @@ -33,6 +33,7 @@ type Portfo...
diff --git a/e2e/portfolio.spec.ts b/e2e/portfolio.spec.ts index 5bd3fb0ebfdaa1..631daba3f7734a 100644 --- a/e2e/portfolio.spec.ts +++ b/e2e/portfolio.spec.ts @@ -63,12 +63,21 @@ test.describe('Add Portfolio Item', () => { test('The image has validation', async ({ page }) => { await page.getByLabel(translations...
freeCodeCamp
57,666
diff --git a/api/src/schemas/certificate/cert-slug.ts b/api/src/schemas/certificate/cert-slug.ts index 402fb2fac408f0..9880b6f5232527 100644 --- a/api/src/schemas/certificate/cert-slug.ts +++ b/api/src/schemas/certificate/cert-slug.ts @@ -85,14 +85,7 @@ export const certSlug = { name:
diff --git a/api/src/schemas/certificate/cert-slug.ts b/api/src/schemas/certificate/cert-slug.ts index 402fb2fac408f0..9880b6f5232527 100644 --- a/api/src/schemas/certificate/cert-slug.ts +++ b/api/src/schemas/certificate/cert-slug.ts @@ -85,14 +85,7 @@ export const certSlug = { certSlug: Type.Enum(Certificati...
2563c61b2eab703210db99327f6ec33cff8d2965
Combine the two object schemas into one, making the `name` field optional.
The following is the text of a github issue and related comments for this repository: [Staging] Username is displayed instead of name on certification ### Describe the Issue On https://www.freecodecamp.dev site, certifications are showing the username instead of real name, even if I set the name to public. I'm not s...
diff --git a/api/src/schemas/certificate/cert-slug.ts b/api/src/schemas/certificate/cert-slug.ts index 402fb2fac408f0..9880b6f5232527 100644 --- a/api/src/schemas/certificate/cert-slug.ts +++ b/api/src/schemas/certificate/cert-slug.ts @@ -85,14 +85,7 @@ export const certSlug = { certSlug: Type.Enum(Certificati...
diff --git a/api/src/schemas/certificate/cert-slug.ts b/api/src/schemas/certificate/cert-slug.ts index 402fb2fac408f0..9880b6f5232527 100644 --- a/api/src/schemas/certificate/cert-slug.ts +++ b/api/src/schemas/certificate/cert-slug.ts @@ -85,14 +85,7 @@ export const certSlug = { certSlug: Type.Enum(Certificati...
diff --git a/api/src/routes/public/certificate.test.ts b/api/src/routes/public/certificate.test.ts index 568c6155e96fa4..e4f2163d0751d2 100644 --- a/api/src/routes/public/certificate.test.ts +++ b/api/src/routes/public/certificate.test.ts @@ -7,11 +7,24 @@ import { } from '../../../jest.utils'; import { getFallbackFu...
freeCodeCamp
54,276
diff --git a/client/src/templates/Challenges/classic/lower-jaw.tsx b/client/src/templates/Challenges/classic/lower-jaw.tsx index 58ce7923c9ea20..2c3064b5a599f2 100644 --- a/client/src/templates/Challenges/classic/lower-jaw.tsx +++ b/client/src/templates/Challenges/classic/lower-jaw.tsx @@ -285,10 +285,13 @@ const Lower...
diff --git a/client/i18n/locales/english/translations.json b/client/i18n/locales/english/translations.json index 1f364d3fc7d88f..a275ef92732948 100644 --- a/client/i18n/locales/english/translations.json +++ b/client/i18n/locales/english/translations.json @@ -57,6 +57,7 @@ "run-test": "Run the Tests (Ctrl + Enter)"...
5a98936981569620b1ec596250716f2b903804a5
Show "Check Your Code (Command + Enter)" for desktop MacOS users, "Check Your Code (Ctrl + Enter)" for other desktop users, and just "Check Your Code" for mobile users. Use the correct text from the translation file depending on the user's operating system.
The following is the text of a github issue and related comments for this repository: Enhancement Request: For MacOS, add text that says “Command + Enter to submit lesson" ### Is your feature request related to a problem? Please describe. SUMMARY: On MacOS platform, it’s not made clear that Command+Enter can be used ...
diff --git a/client/src/templates/Challenges/classic/lower-jaw.tsx b/client/src/templates/Challenges/classic/lower-jaw.tsx index 58ce7923c9ea20..2c3064b5a599f2 100644 --- a/client/src/templates/Challenges/classic/lower-jaw.tsx +++ b/client/src/templates/Challenges/classic/lower-jaw.tsx @@ -285,10 +285,13 @@ const Lower...
diff --git a/client/src/templates/Challenges/classic/lower-jaw.tsx b/client/src/templates/Challenges/classic/lower-jaw.tsx index 58ce7923c9ea20..2c3064b5a599f2 100644 --- a/client/src/templates/Challenges/classic/lower-jaw.tsx +++ b/client/src/templates/Challenges/classic/lower-jaw.tsx @@ -285,10 +285,13 @@ const Lower...
diff --git a/e2e/lower-jaw.spec.ts b/e2e/lower-jaw.spec.ts index 0936e93b380801..232490a14d51d2 100644 --- a/e2e/lower-jaw.spec.ts +++ b/e2e/lower-jaw.spec.ts @@ -19,7 +19,7 @@ test('Check the initial states of submit button and "check your code" button', a }); test('Click on the "check your code" button', async ({...
freeCodeCamp
55,075
diff --git a/client/src/components/helpers/avatar-renderer.tsx b/client/src/components/helpers/avatar-renderer.tsx index 1b9a8fa325888b..b65d612bff043d 100644 --- a/client/src/components/helpers/avatar-renderer.tsx +++ b/client/src/components/helpers/avatar-renderer.tsx @@ -44,7 +44,7 @@ function AvatarRenderer({ ...
diff --git a/client/src/assets/icons/default-avatar.tsx b/client/src/assets/icons/default-avatar.tsx index 441ee8ca099b35..6cf3370e336ffb 100644 --- a/client/src/assets/icons/default-avatar.tsx +++ b/client/src/assets/icons/default-avatar.tsx @@ -8,7 +8,6 @@ function DefaultAvatar( return ( <svg - classN...
05a962b6a9380d0006541e171c84abe88c26d7e9
Remove the 'default-avatar' class from DefaultAvatar
The following is the text of a github issue and related comments for this repository: Remove unused avatar class ## Description The `default-avatar` class is not used and can be removed. ## Changes needed Remove `default-avatar` class from: - https://github.com/freeCodeCamp/freeCodeCamp/blob/ebf8d8fda9c48e3d77ae377...
diff --git a/client/src/components/helpers/avatar-renderer.tsx b/client/src/components/helpers/avatar-renderer.tsx index 1b9a8fa325888b..b65d612bff043d 100644 --- a/client/src/components/helpers/avatar-renderer.tsx +++ b/client/src/components/helpers/avatar-renderer.tsx @@ -44,7 +44,7 @@ function AvatarRenderer({ ...
diff --git a/client/src/components/helpers/avatar-renderer.tsx b/client/src/components/helpers/avatar-renderer.tsx index 1b9a8fa325888b..b65d612bff043d 100644 --- a/client/src/components/helpers/avatar-renderer.tsx +++ b/client/src/components/helpers/avatar-renderer.tsx @@ -44,7 +44,7 @@ function AvatarRenderer({ ...
diff --git a/client/src/components/profile/__snapshots__/profile.test.tsx.snap b/client/src/components/profile/__snapshots__/profile.test.tsx.snap index 42582a2b75ff77..05afc656a65272 100644 --- a/client/src/components/profile/__snapshots__/profile.test.tsx.snap +++ b/client/src/components/profile/__snapshots__/profile...
freeCodeCamp
55,444
diff --git a/client/src/templates/Challenges/fill-in-the-blank/parse-blanks.ts b/client/src/templates/Challenges/fill-in-the-blank/parse-blanks.ts index 84a018df0aa6f4..ddd6cb678d1467 100644 --- a/client/src/templates/Challenges/fill-in-the-blank/parse-blanks.ts +++ b/client/src/templates/Challenges/fill-in-the-blank/p...
diff --git a/client/src/templates/Challenges/fill-in-the-blank/parse-blanks.ts b/client/src/templates/Challenges/fill-in-the-blank/parse-blanks.ts index 84a018df0aa6f4..ddd6cb678d1467 100644 --- a/client/src/templates/Challenges/fill-in-the-blank/parse-blanks.ts +++ b/client/src/templates/Challenges/fill-in-the-blank/p...
2dbddbc59d101c033e6af3edfd5c89efbc923727
Use BLANK instead of _ to indicate the blank in the code.
The following is the text of a github issue and related comments for this repository: Don't use underscores in fill in the blank challenges ### Describe the Issue The fill in the blank challenges use an underscore to represent blanks. [Here's an example](https://github.com/freeCodeCamp/freeCodeCamp/blob/main/curricul...
diff --git a/client/src/templates/Challenges/fill-in-the-blank/parse-blanks.ts b/client/src/templates/Challenges/fill-in-the-blank/parse-blanks.ts index 84a018df0aa6f4..ddd6cb678d1467 100644 --- a/client/src/templates/Challenges/fill-in-the-blank/parse-blanks.ts +++ b/client/src/templates/Challenges/fill-in-the-blank/p...
diff --git a/client/src/templates/Challenges/fill-in-the-blank/parse-blanks.ts b/client/src/templates/Challenges/fill-in-the-blank/parse-blanks.ts index 84a018df0aa6f4..ddd6cb678d1467 100644 --- a/client/src/templates/Challenges/fill-in-the-blank/parse-blanks.ts +++ b/client/src/templates/Challenges/fill-in-the-blank/p...
diff --git a/client/src/templates/Challenges/fill-in-the-blank/parse-blanks.test.ts b/client/src/templates/Challenges/fill-in-the-blank/parse-blanks.test.ts index a0de29f6814378..2b2193e3bcded7 100644 --- a/client/src/templates/Challenges/fill-in-the-blank/parse-blanks.test.ts +++ b/client/src/templates/Challenges/fill...
torchtune
1,806
diff --git a/torchtune/models/mistral/_tokenizer.py b/torchtune/models/mistral/_tokenizer.py index b541c993d9..c3bbc8a4a7 100644 --- a/torchtune/models/mistral/_tokenizer.py +++ b/torchtune/models/mistral/_tokenizer.py @@ -122,7 +122,10 @@ def decode( s
diff --git a/torchtune/models/gemma/_tokenizer.py b/torchtune/models/gemma/_tokenizer.py index d4655c5f48..e5eb89e230 100644 --- a/torchtune/models/gemma/_tokenizer.py +++ b/torchtune/models/gemma/_tokenizer.py @@ -99,6 +99,8 @@ def decode( def tokenize_messages( self, messages: List[Message], + ...
c5b738681ef0c2541344aff1063e5f85720b3c1f
Add an optional parameter `add_eos` (defaulting to True) to control whether the EOS token is appended when tokenizing messages.
The following is the text of a github issue and related comments for this repository: Ensure all tokenizers have add_eos parameter and ensure eos_token is not added if add_eos=False - Phi3 tokenizer - Gemma tokenizer - Mistral tokenizer - Qwen2 tokenizer Resolve the issue described above. Do not modify tests or u...
diff --git a/torchtune/models/mistral/_tokenizer.py b/torchtune/models/mistral/_tokenizer.py index b541c993d9..c3bbc8a4a7 100644 --- a/torchtune/models/mistral/_tokenizer.py +++ b/torchtune/models/mistral/_tokenizer.py @@ -122,7 +122,10 @@ def decode( return self._spm_model.decode(token_ids) def tokeniz...
diff --git a/torchtune/models/mistral/_tokenizer.py b/torchtune/models/mistral/_tokenizer.py index b541c993d9..c3bbc8a4a7 100644 --- a/torchtune/models/mistral/_tokenizer.py +++ b/torchtune/models/mistral/_tokenizer.py @@ -122,7 +122,10 @@ def decode( return self._spm_model.decode(token_ids) def tokeniz...
diff --git a/tests/torchtune/models/gemma/test_gemma_tokenizer.py b/tests/torchtune/models/gemma/test_gemma_tokenizer.py index 205f0fae1f..41a6ef79fd 100644 --- a/tests/torchtune/models/gemma/test_gemma_tokenizer.py +++ b/tests/torchtune/models/gemma/test_gemma_tokenizer.py @@ -242,3 +242,232 @@ def test_tokenize_messa...
torchtune
1,697
diff --git a/torchtune/datasets/_packed.py b/torchtune/datasets/_packed.py index 8cee72eed9..69127f646e 100644 --- a/torchtune/datasets/_packed.py +++ b/torchtune/datasets/_packed.py @@ -150,8 +153,7 @@ def _pack(self) -> None: i @@ -161,6 +163,13 @@ def _pack(self) -> None: def _should_stop_packing(
diff --git a/torchtune/datasets/_packed.py b/torchtune/datasets/_packed.py index 8cee72eed9..69127f646e 100644 --- a/torchtune/datasets/_packed.py +++ b/torchtune/datasets/_packed.py @@ -136,12 +136,15 @@ def _pack(self) -> None: # Update the current pack current_pack["tokens"] += tokens ...
3fddc56942846220b39945559f4b5e695873bb43
Wrap long sequences to max_seq_len and continuously split packs until either reaching max_packs or having a valid-length pack.
The following is the text of a github issue and related comments for this repository: PackedDataset cannot handle long sequence whose length is larger than 2*max_seq_len when using split_across_pack=True As the title, it reports a runtime error in the self._pad_pack() ``` f = {"tokens":list(range(121)),"labels":list(r...
diff --git a/torchtune/datasets/_packed.py b/torchtune/datasets/_packed.py index 8cee72eed9..69127f646e 100644 --- a/torchtune/datasets/_packed.py +++ b/torchtune/datasets/_packed.py @@ -136,12 +136,15 @@ def _pack(self) -> None: # Update the current pack current_pack["tokens"] += tokens ...
diff --git a/torchtune/datasets/_packed.py b/torchtune/datasets/_packed.py index 8cee72eed9..69127f646e 100644 --- a/torchtune/datasets/_packed.py +++ b/torchtune/datasets/_packed.py @@ -150,8 +153,7 @@ def _pack(self) -> None: # Keep track of previous sample boundary self.previous_sample_boun...
diff --git a/tests/torchtune/datasets/test_packed_dataset.py b/tests/torchtune/datasets/test_packed_dataset.py index 208ac333f5..4d587dc98f 100644 --- a/tests/torchtune/datasets/test_packed_dataset.py +++ b/tests/torchtune/datasets/test_packed_dataset.py @@ -147,6 +147,34 @@ def test_packed_dataset( torch.test...
torchtune
1,781
null
diff --git a/docs/source/api_ref_datasets.rst b/docs/source/api_ref_datasets.rst index cc0f6da466..40def346e4 100644 --- a/docs/source/api_ref_datasets.rst +++ b/docs/source/api_ref_datasets.rst @@ -64,8 +64,6 @@ Class representations for the above dataset builders. :toctree: generated/ :nosignatures: - ...
60864e3d1a72b0f1ed852c4ed3188602e8e9c6f2
null
The following is the text of a github issue and related comments for this repository: Delete `ChatDataset` and `InstructDataset` These have been deprecated for a cycle and can now be removed. Resolve the issue described above. Do not modify tests or user code. The issue can be resolved by modifying the actual libra...
null
null
diff --git a/tests/torchtune/datasets/test_chat_dataset.py b/tests/torchtune/datasets/test_chat_dataset.py index 23db9569fe..8e99ad92ae 100644 --- a/tests/torchtune/datasets/test_chat_dataset.py +++ b/tests/torchtune/datasets/test_chat_dataset.py @@ -7,9 +7,8 @@ import pytest from tests.common import ASSETS from tes...
torchtune
1,591
null
diff --git a/docs/source/api_ref_modules.rst b/docs/source/api_ref_modules.rst index d1fb60144a..76dae8600d 100644 --- a/docs/source/api_ref_modules.rst +++ b/docs/source/api_ref_modules.rst @@ -113,20 +113,3 @@ Functions used for preprocessing images. transforms.Transform transforms.VisionCrossAttentionMas...
68200894da3dc9d0e3276b3d91e13758f884ad7a
null
The following is the text of a github issue and related comments for this repository: Move `torchtune.modules.rlhf` to `torchtune.rlhf` Make sure to update all imports and usages. Resolve the issue described above. Do not modify tests or user code. The issue can be resolved by modifying the actual library/application...
null
null
diff --git a/tests/torchtune/modules/rlhf/loss/test_dpo_loss.py b/tests/torchtune/modules/rlhf/loss/test_dpo_loss.py index ef82aad873..e56621f3ed 100644 --- a/tests/torchtune/modules/rlhf/loss/test_dpo_loss.py +++ b/tests/torchtune/modules/rlhf/loss/test_dpo_loss.py @@ -6,7 +6,7 @@ import pytest import torch -from ...
torchtune
2,110
null
diff --git a/torchtune/data/_messages.py b/torchtune/data/_messages.py index a6b356b0ca..bbd3ae5981 100644 --- a/torchtune/data/_messages.py +++ b/torchtune/data/_messages.py @@ -170,6 +170,7 @@ class InputOutputToMessages(Transform): Raises: ValueError: If ``column_map`` is provided and ``input`` not in ...
e9b9ea568e169aea13ae2d03c0eb92ee241f47a1
Add validation to raise a ValueError with message "image_dir is specified as {image_dir} but 'image' is not in column_map. Please specify an 'image' key in column_map" when image_dir is provided but 'image' is not in column_map. Also, convert the image path to a Path object before combining with image_dir.
The following is the text of a github issue and related comments for this repository: TypeError: unsupported operand type(s) for /: 'str' and 'str' in torchtune/data/_messages.py Hello, I am trying to run torchtune on a vqa multimodal dataset. When trying to run the torchtune script I ran into this error: " File "/ho...
diff --git a/torchtune/data/_messages.py b/torchtune/data/_messages.py index a6b356b0ca..bbd3ae5981 100644 --- a/torchtune/data/_messages.py +++ b/torchtune/data/_messages.py @@ -170,6 +170,7 @@ class InputOutputToMessages(Transform): Raises: ValueError: If ``column_map`` is provided and ``input`` not in ...
null
diff --git a/tests/torchtune/data/test_messages.py b/tests/torchtune/data/test_messages.py index a46cfd9349..86b7d7319f 100644 --- a/tests/torchtune/data/test_messages.py +++ b/tests/torchtune/data/test_messages.py @@ -9,6 +9,7 @@ import pytest from PIL import Image +from tests.common import ASSETS from tests.test...
torchtune
1,777
null
diff --git a/recipes/eleuther_eval.py b/recipes/eleuther_eval.py index ce07497899..ad6ba41e74 100644 --- a/recipes/eleuther_eval.py +++ b/recipes/eleuther_eval.py @@ -28,6 +28,7 @@ from torchtune.modules.tokenizers import ModelTokenizer from torchtune.modules.transforms import Transform from torchtune.recipe_interfa...
8d96d6cdf429e0bd864d5170fa090d97e0bb6531
null
The following is the text of a github issue and related comments for this repository: model eval error: NameError: name 'model_state_dict' is not defined i use this commend to run evaluation ``` tune run eleuther_eval --config eleuther_evaluation \ > tasks="[hellaswag, wikitext]" \ > model._component_=torchtun...
null
null
diff --git a/tests/recipes/test_eleuther_eval.py b/tests/recipes/test_eleuther_eval.py index 32eaee4b1b..f09daf2309 100644 --- a/tests/recipes/test_eleuther_eval.py +++ b/tests/recipes/test_eleuther_eval.py @@ -14,7 +14,7 @@ import pytest from tests.common import TUNE_PATH -from tests.recipes.utils import llama2_te...
torchtune
2,139
diff --git a/torchtune/modules/peft/lora.py b/torchtune/modules/peft/lora.py index f6303b798c..4c30c7503a 100644 --- a/torchtune/modules/peft/lora.py +++ b/torchtune/modules/peft/lora.py @@ -93,6 +93,12 @@ def __init__( def to_empty(
diff --git a/recipes/knowledge_distillation_distributed.py b/recipes/knowledge_distillation_distributed.py index 76dc5e3e7d..7bf76b93bf 100644 --- a/recipes/knowledge_distillation_distributed.py +++ b/recipes/knowledge_distillation_distributed.py @@ -28,7 +28,6 @@ get_adapter_state_dict, get_lora_module_names...
f2bd4bc25b24587aef40f486087412b9da8f1d94
Add checks to prevent initializing DoRA magnitude if weights are still on meta device, and raise a RuntimeError with the message "Cannot initialize DoRA magnitude if base or LoRA parameters are still on meta device." if not. Also, implement a `to_empty` method that moves the loras and the magnitude to the correct devic...
The following is the text of a github issue and related comments for this repository: Distributed DoRA training is broken Reported by @SLR722. Repro: ``` tune run --nnodes 1 --nproc_per_node 2 lora_finetune_distributed --config llama3/8B_dora ... [rank1]: File "/data/users/ebs/ebs-torchtune-alt/recipes/lora_finetun...
diff --git a/torchtune/modules/peft/dora.py b/torchtune/modules/peft/dora.py index 6f097da6d0..04a9d5beca 100644 --- a/torchtune/modules/peft/dora.py +++ b/torchtune/modules/peft/dora.py @@ -5,7 +5,7 @@ # LICENSE file in the root directory of this source tree. import math -from typing import List +from typing impor...
diff --git a/torchtune/modules/peft/lora.py b/torchtune/modules/peft/lora.py index f6303b798c..4c30c7503a 100644 --- a/torchtune/modules/peft/lora.py +++ b/torchtune/modules/peft/lora.py @@ -93,6 +93,12 @@ def __init__( self.merged = False self.initialize_parameters() + def to_empty( + sel...
diff --git a/tests/recipes/test_lora_finetune_distributed.py b/tests/recipes/test_lora_finetune_distributed.py index 5ffa07abb3..ef2686aeba 100644 --- a/tests/recipes/test_lora_finetune_distributed.py +++ b/tests/recipes/test_lora_finetune_distributed.py @@ -215,15 +215,15 @@ def test_training_state_on_resume( @...
torchtune
1,936
null
diff --git a/torchtune/training/_activation_offloading.py b/torchtune/training/_activation_offloading.py index bee9adce6d..6880c78f9b 100644 --- a/torchtune/training/_activation_offloading.py +++ b/torchtune/training/_activation_offloading.py @@ -289,19 +289,43 @@ def wait_and_del_remaining_references() -> None: ...
f560cbb21567ebf4852267681f7202526fa249ca
null
The following is the text of a github issue and related comments for this repository: `OffloadActivations(use_streams=True)` producing NaN gradients: a tensor deletion data race **cc**: @janeyx99 When attempting to use `OffloadActivations(use_streams=True)` on my particular use case, I get NaN gradients. Here is a s...
null
null
diff --git a/tests/torchtune/training/test_activation_offloading.py b/tests/torchtune/training/test_activation_offloading.py index 5d4c968e96..286a949e77 100644 --- a/tests/torchtune/training/test_activation_offloading.py +++ b/tests/torchtune/training/test_activation_offloading.py @@ -10,6 +10,8 @@ from torch import ...
torchtune
1,909
diff --git a/torchtune/modules/peft/dora.py b/torchtune/modules/peft/dora.py index 52ad9c7321..9e1428418f 100644 --- a/torchtune/modules/peft/dora.py +++ b/torchtune/modules/peft/dora.py @@ -79,6 +79,7 @@ def initialize_parameters(self): @ @@ -87,7 +88,7 @@ def initialize_dora_magnitude(self): self.
diff --git a/recipes/lora_finetune_single_device.py b/recipes/lora_finetune_single_device.py index bc4018b810..7b8ffd45d8 100644 --- a/recipes/lora_finetune_single_device.py +++ b/recipes/lora_finetune_single_device.py @@ -120,7 +120,6 @@ class LoRAFinetuneRecipeSingleDevice(FTRecipeInterface): """ def __in...
e99b8900726b55bf85690221828f779f0277280b
Update the key mapping logic to handle DoRA magnitude parameters specially, using the correct output key format without the ".weight" suffix for magnitude parameters.
The following is the text of a github issue and related comments for this repository: [bug] DoRA is broken Two separate DoRA bugs I just noticed: (1) Llama 3.2 1B config with DoRA errors on state dict load. Repro: ``` tune run lora_finetune_single_device --config llama3_2/1B_lora_single_device \ gradient_accumulatio...
diff --git a/torchtune/models/convert_weights.py b/torchtune/models/convert_weights.py index c0cf2f10fc..b96006d33a 100644 --- a/torchtune/models/convert_weights.py +++ b/torchtune/models/convert_weights.py @@ -6,7 +6,7 @@ import re -from typing import Any, Dict +from typing import Any, Dict, Optional import to...
diff --git a/torchtune/modules/peft/dora.py b/torchtune/modules/peft/dora.py index 52ad9c7321..9e1428418f 100644 --- a/torchtune/modules/peft/dora.py +++ b/torchtune/modules/peft/dora.py @@ -79,6 +79,7 @@ def initialize_parameters(self): _lora_a_init_params(self.lora_a) _lora_b_init_params(self.lora_b...
diff --git a/tests/recipes/test_lora_finetune_single_device.py b/tests/recipes/test_lora_finetune_single_device.py index ca10076f5f..d2521e4821 100644 --- a/tests/recipes/test_lora_finetune_single_device.py +++ b/tests/recipes/test_lora_finetune_single_device.py @@ -259,8 +259,9 @@ def test_training_state_on_resume( ...
torchtune
1,477
diff --git a/torchtune/models/llama3/_tokenizer.py b/torchtune/models/llama3/_tokenizer.py index 3334dd0e8d..3b765ae864 100644 --- a/torchtune/models/llama3/_tokenizer.py +++ b/torchtune/models/llama3/_tokenizer.py @@ -272,8 +272,10 @@ def tokenize_messages( tokens = mask =
diff --git a/torchtune/models/llama3/_tokenizer.py b/torchtune/models/llama3/_tokenizer.py index 3334dd0e8d..3b765ae864 100644 --- a/torchtune/models/llama3/_tokenizer.py +++ b/torchtune/models/llama3/_tokenizer.py @@ -272,8 +272,10 @@ def tokenize_messages( tokens = tokens + [self.eos_id] mas...
069bc4dcd9e7d6795efd042dbc64d145e8a785d3
Don't pass eos values to the truncate function or mask eos when `add_eos` is False.
The following is the text of a github issue and related comments for this repository: Llama3 Tokenizer always appends "eos_id" for tokenize_messages Llama3Tokenizer `tokenize_messages` method calls `truncate(tokens, self.max_seq_len, self.eos_id)` at the end of the method regardless of whether add_eos is True or False...
diff --git a/torchtune/models/llama3/_tokenizer.py b/torchtune/models/llama3/_tokenizer.py index 3334dd0e8d..3b765ae864 100644 --- a/torchtune/models/llama3/_tokenizer.py +++ b/torchtune/models/llama3/_tokenizer.py @@ -272,8 +272,10 @@ def tokenize_messages( tokens = tokens + [self.eos_id] mas...
diff --git a/torchtune/models/llama3/_tokenizer.py b/torchtune/models/llama3/_tokenizer.py index 3334dd0e8d..3b765ae864 100644 --- a/torchtune/models/llama3/_tokenizer.py +++ b/torchtune/models/llama3/_tokenizer.py @@ -272,8 +272,10 @@ def tokenize_messages( tokens = tokens + [self.eos_id] mas...
diff --git a/tests/torchtune/models/llama3/test_llama3_tokenizer.py b/tests/torchtune/models/llama3/test_llama3_tokenizer.py index 5643a40c2d..e2f7fd0410 100644 --- a/tests/torchtune/models/llama3/test_llama3_tokenizer.py +++ b/tests/torchtune/models/llama3/test_llama3_tokenizer.py @@ -17,6 +17,7 @@ def tokenizer(self)...
torchtune
1,643
null
diff --git a/docs/source/api_ref_data.rst b/docs/source/api_ref_data.rst index cdc5b06fcc..b487db8cdf 100644 --- a/docs/source/api_ref_data.rst +++ b/docs/source/api_ref_data.rst @@ -62,7 +62,7 @@ Converts data from common schema and conversation JSON formats into a list of to InputOutputToMessages ShareGPT...
d684a2dd705b6c32ae7ab9b5d5ddd0760bb25ff3
Rename JSONToMessages to OpenAIToMessages and add support for multimodal content by converting OpenAI's format to torchtune's format: convert "text" type content by mapping "text" field to "content", and convert "image_url" type content by loading the image from the URL and storing it with type "image".
The following is the text of a github issue and related comments for this repository: Rename JSONToMessages to OpenAIToMessages and change related occurrences of "json" to "openai" The __call__ method should now convert any chat sample adhering to the OpenAI chat completion JSON structure to torchtune.data.Message. It...
diff --git a/torchtune/data/_messages.py b/torchtune/data/_messages.py index 6794243537..ce2155350e 100644 --- a/torchtune/data/_messages.py +++ b/torchtune/data/_messages.py @@ -6,6 +6,8 @@ from typing import Any, Dict, List, Literal, Mapping, Optional, Union +from torchtune.data._utils import load_image + from ...
null
diff --git a/tests/torchtune/data/test_data_utils.py b/tests/torchtune/data/test_data_utils.py index 4ea29cbc19..c7361eccc1 100644 --- a/tests/torchtune/data/test_data_utils.py +++ b/tests/torchtune/data/test_data_utils.py @@ -10,15 +10,7 @@ from PIL import Image from tests.common import ASSETS -from torchtune.data...