From b89f379b1f7a57d2d3c7093b91d519f8b7148a71 Mon Sep 17 00:00:00 2001 From: Sarina Canelake Date: Sat, 10 Sep 2022 16:21:23 -0400 Subject: [PATCH 1/4] chore: run `edx_lint` update with the current version of the repo. --- .editorconfig | 22 ++++++++++++++-------- pylintrc | 8 ++++---- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/.editorconfig b/.editorconfig index 94d3e718..5cf5aed0 100644 --- a/.editorconfig +++ b/.editorconfig @@ -2,12 +2,16 @@ # ** DO NOT EDIT THIS FILE ** # *************************** # -# This file was generated by edx-lint: http://github.com/edx/edx-lint +# This file was generated by edx-lint: https://github.com/openedx/edx-lint # # If you want to change this file, you have two choices, depending on whether # you want to make a local change that applies only to this repo, or whether # you want to make a central change that applies to all repos using edx-lint. # +# Note: If your .editorconfig file is simply out-of-date relative to the latest +# .editorconfig in edx-lint, ensure you have the latest edx-lint installed +# and then follow the steps for a "LOCAL CHANGE". +# # LOCAL CHANGE: # # 1. Edit the local .editorconfig_tweaks file to add changes just to this @@ -24,7 +28,7 @@ # CENTRAL CHANGE: # # 1. Edit the .editorconfig file in the edx-lint repo at -# https://github.com/edx/edx-lint/blob/master/edx_lint/files/.editorconfig +# https://github.com/openedx/edx-lint/blob/master/edx_lint/files/.editorconfig # # 2. install the updated version of edx-lint (in edx-lint): # @@ -32,19 +36,16 @@ # # 3. Run (in edx-lint): # -# # uses .editorconfig_tweaks from edx-lint for linting in edx-lint -# # NOTE: Use Python 3.x, which no longer includes comments in the output file # $ edx_lint write .editorconfig # # 4. Make a new version of edx_lint, submit and review a pull request with the -# .editorconfig update, and after merging, update the edx-lint version by -# creating a new tag in the repo (uses pbr). +# .editorconfig update, and after merging, update the edx-lint version and +# publish the new version. # # 5. In your local repo, install the newer version of edx-lint. # # 6. Run: # -# # uses local .editorconfig_tweaks # $ edx_lint write .editorconfig # # 7. This will modify the local file. Submit a pull request to get it @@ -63,6 +64,8 @@ # SERIOUSLY. # # ------------------------------ +# Generated by edx-lint version: 5.2.5 +# ------------------------------ [*] end_of_line = lf insert_final_newline = true @@ -88,7 +91,10 @@ trim_trailing_whitespace = false [.git/*] trim_trailing_whitespace = false +[COMMIT_EDITMSG] +max_line_length = 72 + [*.rst] max_line_length = 79 -# 01d24285b953f74272f86b1e42a0235315085e59 +# f2f02689fced7a2e0c62c2f9803184114dc2ae4b diff --git a/pylintrc b/pylintrc index 7866ba07..0f382171 100644 --- a/pylintrc +++ b/pylintrc @@ -2,7 +2,7 @@ # ** DO NOT EDIT THIS FILE ** # *************************** # -# This file was generated by edx-lint: https://github.com/edx/edx-lint +# This file was generated by edx-lint: https://github.com/openedx/edx-lint # # If you want to change this file, you have two choices, depending on whether # you want to make a local change that applies only to this repo, or whether @@ -28,7 +28,7 @@ # CENTRAL CHANGE: # # 1. Edit the pylintrc file in the edx-lint repo at -# https://github.com/edx/edx-lint/blob/master/edx_lint/files/pylintrc +# https://github.com/openedx/edx-lint/blob/master/edx_lint/files/pylintrc # # 2. install the updated version of edx-lint (in edx-lint): # @@ -64,7 +64,7 @@ # SERIOUSLY. # # ------------------------------ -# Generated by edx-lint version: 5.2.4 +# Generated by edx-lint version: 5.2.5 # ------------------------------ [MASTER] ignore = migrations @@ -383,4 +383,4 @@ int-import-graph = [EXCEPTIONS] overgeneral-exceptions = Exception -# aa442a51132906fecf155bfe1119b94245a2fa29 +# 6076f75771fc24c52dcc7314fbed2a99eacaf5f0 From 044852bcc206e77be6ca9301de7c9a772e4c268e Mon Sep 17 00:00:00 2001 From: Sarina Canelake Date: Sat, 10 Sep 2022 16:21:23 -0400 Subject: [PATCH 2/4] fix: fix github url strings (org edx -> openedx) --- README.rst | 10 +++---- docs/decisions/0001-purpose-of-this-repo.rst | 2 +- .../0003-router-configurations-storage.rst | 4 +-- .../decisions/0005-PII-leakage-prevention.rst | 2 +- docs/getting_started.rst | 28 +++++++++---------- docs/howto/how_to_test.rst | 4 +-- docs/xapi-extensions/eventVersion.rst | 2 +- .../processors/xapi/constants.py | 2 +- .../fixtures/expected/complete_video.json | 2 +- ...ourse.enrollment.activated.enterprise.json | 2 +- .../edx.course.enrollment.activated.json | 2 +- ...rollment.activated.required.only.data.json | 2 +- .../edx.course.enrollment.deactivated.json | 2 +- .../expected/edx.course.grade.now_failed.json | 2 +- .../expected/edx.course.grade.now_passed.json | 2 +- .../edx.course.grade.passed.first_time.json | 2 +- .../edx.grades.problem.submitted.json | 2 +- .../edx.problem.completed(proposed).json | 2 +- ...edx.problem.hint.demandhint_displayed.json | 2 +- ...x.ui.lms.link_clicked(anonymous_user).json | 2 +- .../expected/edx.ui.lms.link_clicked.json | 2 +- ...i.lms.link_clicked.required.only.data.json | 2 +- .../expected/edx.ui.lms.outline.selected.json | 2 +- .../edx.ui.lms.sequence.next_selected.json | 2 +- ...edx.ui.lms.sequence.previous_selected.json | 2 +- .../edx.ui.lms.sequence.tab_selected.json | 2 +- .../tests/fixtures/expected/load_video.json | 2 +- .../load_video.required.only.data.json | 2 +- .../tests/fixtures/expected/pause_video.json | 2 +- .../tests/fixtures/expected/play_video.json | 2 +- .../expected/problem_check(browser).json | 2 +- ...lem_check(browser).required.only.data.json | 2 +- .../problem_check(browser)legacy.json | 2 +- .../expected/problem_check(server).json | 2 +- ...roblem_check(server)_no_response_type.json | 2 +- .../problem_check(server,string_anwers).json | 2 +- ...heck(server,unsupported_responsetype).json | 2 +- .../tests/fixtures/expected/seek_video.json | 2 +- .../tests/fixtures/expected/showanswer.json | 2 +- .../tests/fixtures/expected/stop_video.json | 2 +- setup.py | 2 +- 41 files changed, 60 insertions(+), 60 deletions(-) diff --git a/README.rst b/README.rst index 0df40934..a7e17ecb 100644 --- a/README.rst +++ b/README.rst @@ -15,7 +15,7 @@ Currently work to support xAPI and Caliper event formats is in progress. See `OEP 26`_ for background; the xAPI and Caliper subdocuments in particular include a specification of how LMS events will be translated to the format of the respective protocols. -.. _event-tracking: https://github.com/edx/event-tracking +.. _event-tracking: https://github.com/openedx/event-tracking .. _OEP 26: https://open-edx-proposals.readthedocs.io/en/latest/oep-0026-arch-realtime-events.html Documentation @@ -35,7 +35,7 @@ How To Contribute ----------------- Contributions are very welcome. -Please read `How To Contribute `__ for details. +Please read `How To Contribute `__ for details. Even though they were written with ``edx-platform`` in mind, the guidelines should be followed for all Open edX projects. @@ -66,8 +66,8 @@ For more information about these options, see the `Getting Help `__) while the +`event-tracking `__) while the other components, i.e. Caliper transformer backend, xAPI transformer backend and router, will be added in the current repo. diff --git a/docs/decisions/0003-router-configurations-storage.rst b/docs/decisions/0003-router-configurations-storage.rst index 66dae715..6453351e 100644 --- a/docs/decisions/0003-router-configurations-storage.rst +++ b/docs/decisions/0003-router-configurations-storage.rst @@ -25,13 +25,13 @@ Decision Keeping in mind a large number of enterprise clients, we will store router configurations in `Django configuration models -`__. +`__. Consequences ------------ Storing configurations in `Django configuration -models `__ will keep the +models `__ will keep the settings files cleaner. Django configuration models have built-in caching support which would diff --git a/docs/decisions/0005-PII-leakage-prevention.rst b/docs/decisions/0005-PII-leakage-prevention.rst index 5556af74..ba773a46 100644 --- a/docs/decisions/0005-PII-leakage-prevention.rst +++ b/docs/decisions/0005-PII-leakage-prevention.rst @@ -26,4 +26,4 @@ Benefits #. Only the instances where this accessor is called, will need to be reviewed during code review, in order to check for potential PII leakage. -.. _method: https://github.com/edx/event-routing-backends/blob/f430d4cf58bdab01e42fcc944241898606873d82/event_routing_backends/processors/mixins/base_transformer.py#L139 +.. _method: https://github.com/openedx/event-routing-backends/blob/f430d4cf58bdab01e42fcc944241898606873d82/event_routing_backends/processors/mixins/base_transformer.py#L139 diff --git a/docs/getting_started.rst b/docs/getting_started.rst index 741a5f0d..944d33d3 100644 --- a/docs/getting_started.rst +++ b/docs/getting_started.rst @@ -44,7 +44,7 @@ Version information of mapping Version of mapping of edx event onto xAPI or Caliper format, for each event, is included in the statement and event respectively. Version is a string of format "X.Y" where increment in X represents breaking changes and increment in Y represents addition of fields in the event json, both starting with zero. -In xAPI statement, version is in value of the key ``https://github.com/edx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst`` in ``extensions`` of ``Context`` of the statement. +In xAPI statement, version is in value of the key ``https://github.com/openedx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst`` in ``extensions`` of ``Context`` of the statement. In Caliper event, version is in value of the key ``eventVersion`` in ``extensions`` of the event. @@ -216,28 +216,28 @@ A sample override for ``xapi`` backend is presented below. Here we are allowing } } -.. _event-tracking: https://github.com/edx/event-tracking +.. _event-tracking: https://github.com/openedx/event-tracking -.. _NameWhitelist: https://github.com/edx/event-tracking/blob/master/eventtracking/processors/whitelist.py +.. _NameWhitelist: https://github.com/openedx/event-tracking/blob/master/eventtracking/processors/whitelist.py -.. _RegexFilter: https://github.com/edx/event-tracking/blob/master/eventtracking/processors/regex_filter.py +.. _RegexFilter: https://github.com/openedx/event-tracking/blob/master/eventtracking/processors/regex_filter.py -.. _save_statement: https://github.com/edx/event-routing-backends/blob/2ec15d054b3b1dd6072689aa470f3d805486526e/event_routing_backends/utils/xapi_lrs_client.py#L70 +.. _save_statement: https://github.com/openedx/event-routing-backends/blob/2ec15d054b3b1dd6072689aa470f3d805486526e/event_routing_backends/utils/xapi_lrs_client.py#L70 -.. _post: https://github.com/edx/event-routing-backends/blob/2ec15d054b3b1dd6072689aa470f3d805486526e/event_routing_backends/utils/http_client.py#L67 +.. _post: https://github.com/openedx/event-routing-backends/blob/2ec15d054b3b1dd6072689aa470f3d805486526e/event_routing_backends/utils/http_client.py#L67 -.. _AsyncRoutingBackend: https://github.com/edx/event-tracking/blob/fccad3d118f594fe304ec48517e896447f15e782/eventtracking/backends/async_routing.py#L13 +.. _AsyncRoutingBackend: https://github.com/openedx/event-tracking/blob/fccad3d118f594fe304ec48517e896447f15e782/eventtracking/backends/async_routing.py#L13 -.. _CaliperProcessor: https://github.com/edx/event-routing-backends/blob/ac192ab6b4d1452ada37302d1481eea2f58aef19/event_routing_backends/processors/caliper/transformer_processor.py#L16 +.. _CaliperProcessor: https://github.com/openedx/event-routing-backends/blob/ac192ab6b4d1452ada37302d1481eea2f58aef19/event_routing_backends/processors/caliper/transformer_processor.py#L16 -.. _XApiProcessor: https://github.com/edx/event-routing-backends/blob/ac192ab6b4d1452ada37302d1481eea2f58aef19/event_routing_backends/processors/xapi/transformer_processor.py#L16 +.. _XApiProcessor: https://github.com/openedx/event-routing-backends/blob/ac192ab6b4d1452ada37302d1481eea2f58aef19/event_routing_backends/processors/xapi/transformer_processor.py#L16 -.. _CaliperEnvelopeProcessor: https://github.com/edx/event-routing-backends/blob/ac192ab6b4d1452ada37302d1481eea2f58aef19/event_routing_backends/processors/caliper/envelope_processor.py#L12 +.. _CaliperEnvelopeProcessor: https://github.com/openedx/event-routing-backends/blob/ac192ab6b4d1452ada37302d1481eea2f58aef19/event_routing_backends/processors/caliper/envelope_processor.py#L12 -.. _EventsRouter: https://github.com/edx/event-routing-backends/blob/ac192ab6b4d1452ada37302d1481eea2f58aef19/event_routing_backends/backends/events_router.py#L15 +.. _EventsRouter: https://github.com/openedx/event-routing-backends/blob/ac192ab6b4d1452ada37302d1481eea2f58aef19/event_routing_backends/backends/events_router.py#L15 -.. _business_critical_events: https://github.com/edx/event-routing-backends/blob/e375674156b347be833ad8c2479be2c4ff4b073f/event_routing_backends/helpers.py#L197 +.. _business_critical_events: https://github.com/openedx/event-routing-backends/blob/e375674156b347be833ad8c2479be2c4ff4b073f/event_routing_backends/helpers.py#L197 -.. _edx-celeryutils: https://github.com/edx/edx-celeryutils +.. _edx-celeryutils: https://github.com/openedx/edx-celeryutils -.. _commands: https://github.com/edx/edx-celeryutils/tree/master/celery_utils/management/commands +.. _commands: https://github.com/openedx/edx-celeryutils/tree/master/celery_utils/management/commands diff --git a/docs/howto/how_to_test.rst b/docs/howto/how_to_test.rst index 1a4e2878..ab87e70f 100644 --- a/docs/howto/how_to_test.rst +++ b/docs/howto/how_to_test.rst @@ -2,7 +2,7 @@ How To Test =========== -This is a rough guide of how to go about testing backends in edx-platform. It assumes you have devstack already up and running. If not, see `devstack docs `_. +This is a rough guide of how to go about testing backends in edx-platform. It assumes you have devstack already up and running. If not, see `devstack docs `_. Add edx-event-routing-backends to requirements @@ -70,7 +70,7 @@ There are two ways you can filter events: - Event types can be filtered using `RegexFilter`_ in EVENT_TRACKING_BACKENDS.${backend_name}.OPTIONS.processors.OPTIONS -.. _RegexFilter: https://github.com/edx/event-tracking/blob/master/eventtracking/processors/regex_filter.py +.. _RegexFilter: https://github.com/openedx/event-tracking/blob/master/eventtracking/processors/regex_filter.py - Particular instances of event types can be filtered based on key, value pair in the serialized event dict. When setting up router in django admin, add key, value pair you want to match_params. If you want all instances of events to be sent, set match_params to empty dict: `match_params: {}` diff --git a/docs/xapi-extensions/eventVersion.rst b/docs/xapi-extensions/eventVersion.rst index 2e918d5f..e4d7fda2 100644 --- a/docs/xapi-extensions/eventVersion.rst +++ b/docs/xapi-extensions/eventVersion.rst @@ -1,5 +1,5 @@ +-------------------------------------------------------------------------------------------------+--------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ | Extensions | Title | Description | +=================================================================================================+====================+================================================================================================================================================================================================================================================================================+ -| https://github.com/edx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst | "event version"@en | "This version represents version of mapping of a single edx event onto xapi format. Value should be a string of format "X.Y" where increment in X represents breaking changes and increment in Y represents addition of fields in the event json, both starting with 0 (zero)" | +| https://github.com/openedx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst | "event version"@en | "This version represents version of mapping of a single edx event onto xapi format. Value should be a string of format "X.Y" where increment in X represents breaking changes and increment in Y represents addition of fields in the event json, both starting with 0 (zero)" | +-------------------------------------------------------------------------------------------------+--------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ diff --git a/event_routing_backends/processors/xapi/constants.py b/event_routing_backends/processors/xapi/constants.py index 15ce3346..57cb6afa 100644 --- a/event_routing_backends/processors/xapi/constants.py +++ b/event_routing_backends/processors/xapi/constants.py @@ -55,7 +55,7 @@ XAPI_RESULT_VIDEO_PROGRESS = 'https://w3id.org/xapi/video/extensions/progress' XAPI_TRANSFORMER_VERSION = '1.0.3' XAPI_EVENT_VERSION_KEY = \ - 'https://github.com/edx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst' + 'https://github.com/openedx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst' # Languages EN = 'en' diff --git a/event_routing_backends/processors/xapi/tests/fixtures/expected/complete_video.json b/event_routing_backends/processors/xapi/tests/fixtures/expected/complete_video.json index e3e82a30..871e18b5 100644 --- a/event_routing_backends/processors/xapi/tests/fixtures/expected/complete_video.json +++ b/event_routing_backends/processors/xapi/tests/fixtures/expected/complete_video.json @@ -20,7 +20,7 @@ ] }, "extensions": { - "https://github.com/edx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0", + "https://github.com/openedx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0", "https://w3id.org/xapi/video/extensions/length": 195.0 } }, diff --git a/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.course.enrollment.activated.enterprise.json b/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.course.enrollment.activated.enterprise.json index c00d3bbc..906413e7 100644 --- a/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.course.enrollment.activated.enterprise.json +++ b/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.course.enrollment.activated.enterprise.json @@ -6,7 +6,7 @@ }, "context": { "extensions": { - "https://github.com/edx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" + "https://github.com/openedx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" } }, "object": { diff --git a/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.course.enrollment.activated.json b/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.course.enrollment.activated.json index c00d3bbc..906413e7 100644 --- a/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.course.enrollment.activated.json +++ b/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.course.enrollment.activated.json @@ -6,7 +6,7 @@ }, "context": { "extensions": { - "https://github.com/edx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" + "https://github.com/openedx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" } }, "object": { diff --git a/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.course.enrollment.activated.required.only.data.json b/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.course.enrollment.activated.required.only.data.json index 3308414c..fee2a3e3 100644 --- a/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.course.enrollment.activated.required.only.data.json +++ b/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.course.enrollment.activated.required.only.data.json @@ -6,7 +6,7 @@ }, "context": { "extensions": { - "https://github.com/edx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" + "https://github.com/openedx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" } }, "object": { diff --git a/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.course.enrollment.deactivated.json b/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.course.enrollment.deactivated.json index a3cfd134..c4d92358 100644 --- a/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.course.enrollment.deactivated.json +++ b/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.course.enrollment.deactivated.json @@ -6,7 +6,7 @@ }, "context": { "extensions": { - "https://github.com/edx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" + "https://github.com/openedx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" } }, "object": { diff --git a/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.course.grade.now_failed.json b/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.course.grade.now_failed.json index 0dc8b669..2196a2a2 100644 --- a/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.course.grade.now_failed.json +++ b/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.course.grade.now_failed.json @@ -6,7 +6,7 @@ }, "context": { "extensions": { - "https://github.com/edx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" + "https://github.com/openedx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" } }, "object": { diff --git a/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.course.grade.now_passed.json b/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.course.grade.now_passed.json index 595ace65..25b5062f 100644 --- a/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.course.grade.now_passed.json +++ b/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.course.grade.now_passed.json @@ -6,7 +6,7 @@ }, "context": { "extensions": { - "https://github.com/edx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" + "https://github.com/openedx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" } }, "object": { diff --git a/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.course.grade.passed.first_time.json b/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.course.grade.passed.first_time.json index 595ace65..25b5062f 100644 --- a/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.course.grade.passed.first_time.json +++ b/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.course.grade.passed.first_time.json @@ -6,7 +6,7 @@ }, "context": { "extensions": { - "https://github.com/edx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" + "https://github.com/openedx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" } }, "object": { diff --git a/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.grades.problem.submitted.json b/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.grades.problem.submitted.json index f537ac9b..31561c7b 100644 --- a/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.grades.problem.submitted.json +++ b/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.grades.problem.submitted.json @@ -20,7 +20,7 @@ ] }, "extensions": { - "https://github.com/edx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" + "https://github.com/openedx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" } }, "object": { diff --git a/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.problem.completed(proposed).json b/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.problem.completed(proposed).json index 17b48a71..539c0bd7 100644 --- a/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.problem.completed(proposed).json +++ b/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.problem.completed(proposed).json @@ -20,7 +20,7 @@ ] }, "extensions": { - "https://github.com/edx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" + "https://github.com/openedx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" } }, "object": { diff --git a/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.problem.hint.demandhint_displayed.json b/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.problem.hint.demandhint_displayed.json index e06d2f11..8789139a 100644 --- a/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.problem.hint.demandhint_displayed.json +++ b/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.problem.hint.demandhint_displayed.json @@ -20,7 +20,7 @@ ] }, "extensions": { - "https://github.com/edx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" + "https://github.com/openedx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" } }, "object": { diff --git a/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.ui.lms.link_clicked(anonymous_user).json b/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.ui.lms.link_clicked(anonymous_user).json index e7c76c9e..7eaa9c23 100644 --- a/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.ui.lms.link_clicked(anonymous_user).json +++ b/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.ui.lms.link_clicked(anonymous_user).json @@ -20,7 +20,7 @@ ] }, "extensions": { - "https://github.com/edx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" + "https://github.com/openedx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" } }, "object": { diff --git a/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.ui.lms.link_clicked.json b/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.ui.lms.link_clicked.json index dbec2f25..3de2107e 100644 --- a/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.ui.lms.link_clicked.json +++ b/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.ui.lms.link_clicked.json @@ -20,7 +20,7 @@ ] }, "extensions": { - "https://github.com/edx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" + "https://github.com/openedx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" } }, "object": { diff --git a/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.ui.lms.link_clicked.required.only.data.json b/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.ui.lms.link_clicked.required.only.data.json index 997311b3..0aa45d36 100644 --- a/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.ui.lms.link_clicked.required.only.data.json +++ b/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.ui.lms.link_clicked.required.only.data.json @@ -6,7 +6,7 @@ }, "context": { "extensions": { - "https://github.com/edx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" + "https://github.com/openedx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" } }, "object": { diff --git a/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.ui.lms.outline.selected.json b/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.ui.lms.outline.selected.json index 79662ec2..15b28206 100644 --- a/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.ui.lms.outline.selected.json +++ b/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.ui.lms.outline.selected.json @@ -20,7 +20,7 @@ ] }, "extensions": { - "https://github.com/edx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" + "https://github.com/openedx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" } }, "object": { diff --git a/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.ui.lms.sequence.next_selected.json b/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.ui.lms.sequence.next_selected.json index b8e9e329..e71ecfff 100644 --- a/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.ui.lms.sequence.next_selected.json +++ b/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.ui.lms.sequence.next_selected.json @@ -20,7 +20,7 @@ ] }, "extensions": { - "https://github.com/edx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0", + "https://github.com/openedx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0", "http://id.tincanapi.com/extension/ending-point": "next unit", "http://id.tincanapi.com/extension/starting-position": 4 } diff --git a/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.ui.lms.sequence.previous_selected.json b/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.ui.lms.sequence.previous_selected.json index d1c3735e..e5caebca 100644 --- a/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.ui.lms.sequence.previous_selected.json +++ b/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.ui.lms.sequence.previous_selected.json @@ -20,7 +20,7 @@ ] }, "extensions": { - "https://github.com/edx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0", + "https://github.com/openedx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0", "http://id.tincanapi.com/extension/ending-point": "previous unit", "http://id.tincanapi.com/extension/starting-position": 5 } diff --git a/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.ui.lms.sequence.tab_selected.json b/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.ui.lms.sequence.tab_selected.json index 633018dc..cff954e8 100644 --- a/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.ui.lms.sequence.tab_selected.json +++ b/event_routing_backends/processors/xapi/tests/fixtures/expected/edx.ui.lms.sequence.tab_selected.json @@ -20,7 +20,7 @@ ] }, "extensions": { - "https://github.com/edx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0", + "https://github.com/openedx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0", "http://id.tincanapi.com/extension/starting-position": 4, "http://id.tincanapi.com/extension/ending-point": 8 } diff --git a/event_routing_backends/processors/xapi/tests/fixtures/expected/load_video.json b/event_routing_backends/processors/xapi/tests/fixtures/expected/load_video.json index ec393849..e1b1f4a8 100644 --- a/event_routing_backends/processors/xapi/tests/fixtures/expected/load_video.json +++ b/event_routing_backends/processors/xapi/tests/fixtures/expected/load_video.json @@ -27,7 +27,7 @@ ] }, "extensions": { - "https://github.com/edx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0", + "https://github.com/openedx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0", "https://w3id.org/xapi/video/extensions/length": 0.0 } }, diff --git a/event_routing_backends/processors/xapi/tests/fixtures/expected/load_video.required.only.data.json b/event_routing_backends/processors/xapi/tests/fixtures/expected/load_video.required.only.data.json index f0af8706..6f6d068d 100644 --- a/event_routing_backends/processors/xapi/tests/fixtures/expected/load_video.required.only.data.json +++ b/event_routing_backends/processors/xapi/tests/fixtures/expected/load_video.required.only.data.json @@ -27,7 +27,7 @@ ] }, "extensions": { - "https://github.com/edx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" + "https://github.com/openedx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" } }, "timestamp": "2020-07-15T06:43:07.277053+00:00", diff --git a/event_routing_backends/processors/xapi/tests/fixtures/expected/pause_video.json b/event_routing_backends/processors/xapi/tests/fixtures/expected/pause_video.json index 9f346168..4c0064ec 100644 --- a/event_routing_backends/processors/xapi/tests/fixtures/expected/pause_video.json +++ b/event_routing_backends/processors/xapi/tests/fixtures/expected/pause_video.json @@ -20,7 +20,7 @@ ] }, "extensions": { - "https://github.com/edx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0", + "https://github.com/openedx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0", "https://w3id.org/xapi/video/extensions/length": 195.0 } }, diff --git a/event_routing_backends/processors/xapi/tests/fixtures/expected/play_video.json b/event_routing_backends/processors/xapi/tests/fixtures/expected/play_video.json index 4262fb31..56cfb81a 100644 --- a/event_routing_backends/processors/xapi/tests/fixtures/expected/play_video.json +++ b/event_routing_backends/processors/xapi/tests/fixtures/expected/play_video.json @@ -20,7 +20,7 @@ ] }, "extensions": { - "https://github.com/edx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0", + "https://github.com/openedx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0", "https://w3id.org/xapi/video/extensions/length": 195.0 } }, diff --git a/event_routing_backends/processors/xapi/tests/fixtures/expected/problem_check(browser).json b/event_routing_backends/processors/xapi/tests/fixtures/expected/problem_check(browser).json index df138f3f..7f0c0b88 100644 --- a/event_routing_backends/processors/xapi/tests/fixtures/expected/problem_check(browser).json +++ b/event_routing_backends/processors/xapi/tests/fixtures/expected/problem_check(browser).json @@ -20,7 +20,7 @@ ] }, "extensions": { - "https://github.com/edx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" + "https://github.com/openedx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" } }, "object": { diff --git a/event_routing_backends/processors/xapi/tests/fixtures/expected/problem_check(browser).required.only.data.json b/event_routing_backends/processors/xapi/tests/fixtures/expected/problem_check(browser).required.only.data.json index b577f39e..477199b6 100644 --- a/event_routing_backends/processors/xapi/tests/fixtures/expected/problem_check(browser).required.only.data.json +++ b/event_routing_backends/processors/xapi/tests/fixtures/expected/problem_check(browser).required.only.data.json @@ -6,7 +6,7 @@ }, "context": { "extensions": { - "https://github.com/edx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" + "https://github.com/openedx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" } }, "object": { diff --git a/event_routing_backends/processors/xapi/tests/fixtures/expected/problem_check(browser)legacy.json b/event_routing_backends/processors/xapi/tests/fixtures/expected/problem_check(browser)legacy.json index 422b0c45..d2b41f2d 100644 --- a/event_routing_backends/processors/xapi/tests/fixtures/expected/problem_check(browser)legacy.json +++ b/event_routing_backends/processors/xapi/tests/fixtures/expected/problem_check(browser)legacy.json @@ -20,7 +20,7 @@ ] }, "extensions": { - "https://github.com/edx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" + "https://github.com/openedx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" } }, "object": { diff --git a/event_routing_backends/processors/xapi/tests/fixtures/expected/problem_check(server).json b/event_routing_backends/processors/xapi/tests/fixtures/expected/problem_check(server).json index c24582c0..990b3fdc 100644 --- a/event_routing_backends/processors/xapi/tests/fixtures/expected/problem_check(server).json +++ b/event_routing_backends/processors/xapi/tests/fixtures/expected/problem_check(server).json @@ -20,7 +20,7 @@ ] }, "extensions": { - "https://github.com/edx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" + "https://github.com/openedx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" } }, "object": { diff --git a/event_routing_backends/processors/xapi/tests/fixtures/expected/problem_check(server)_no_response_type.json b/event_routing_backends/processors/xapi/tests/fixtures/expected/problem_check(server)_no_response_type.json index 91333d83..989d5fdf 100644 --- a/event_routing_backends/processors/xapi/tests/fixtures/expected/problem_check(server)_no_response_type.json +++ b/event_routing_backends/processors/xapi/tests/fixtures/expected/problem_check(server)_no_response_type.json @@ -20,7 +20,7 @@ ] }, "extensions": { - "https://github.com/edx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" + "https://github.com/openedx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" } }, "object": { diff --git a/event_routing_backends/processors/xapi/tests/fixtures/expected/problem_check(server,string_anwers).json b/event_routing_backends/processors/xapi/tests/fixtures/expected/problem_check(server,string_anwers).json index a499944e..f2b395aa 100644 --- a/event_routing_backends/processors/xapi/tests/fixtures/expected/problem_check(server,string_anwers).json +++ b/event_routing_backends/processors/xapi/tests/fixtures/expected/problem_check(server,string_anwers).json @@ -20,7 +20,7 @@ ] }, "extensions": { - "https://github.com/edx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" + "https://github.com/openedx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" } }, "object": { diff --git a/event_routing_backends/processors/xapi/tests/fixtures/expected/problem_check(server,unsupported_responsetype).json b/event_routing_backends/processors/xapi/tests/fixtures/expected/problem_check(server,unsupported_responsetype).json index 6d0e6ed7..ea21711b 100644 --- a/event_routing_backends/processors/xapi/tests/fixtures/expected/problem_check(server,unsupported_responsetype).json +++ b/event_routing_backends/processors/xapi/tests/fixtures/expected/problem_check(server,unsupported_responsetype).json @@ -20,7 +20,7 @@ ] }, "extensions": { - "https://github.com/edx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" + "https://github.com/openedx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" } }, "object": { diff --git a/event_routing_backends/processors/xapi/tests/fixtures/expected/seek_video.json b/event_routing_backends/processors/xapi/tests/fixtures/expected/seek_video.json index 810aaf8f..bf76e6ea 100644 --- a/event_routing_backends/processors/xapi/tests/fixtures/expected/seek_video.json +++ b/event_routing_backends/processors/xapi/tests/fixtures/expected/seek_video.json @@ -20,7 +20,7 @@ ] }, "extensions": { - "https://github.com/edx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0", + "https://github.com/openedx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0", "https://w3id.org/xapi/video/extensions/length": 195.0 } }, diff --git a/event_routing_backends/processors/xapi/tests/fixtures/expected/showanswer.json b/event_routing_backends/processors/xapi/tests/fixtures/expected/showanswer.json index c78dd3ad..33b52509 100644 --- a/event_routing_backends/processors/xapi/tests/fixtures/expected/showanswer.json +++ b/event_routing_backends/processors/xapi/tests/fixtures/expected/showanswer.json @@ -20,7 +20,7 @@ ] }, "extensions": { - "https://github.com/edx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" + "https://github.com/openedx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0" } }, "object": { diff --git a/event_routing_backends/processors/xapi/tests/fixtures/expected/stop_video.json b/event_routing_backends/processors/xapi/tests/fixtures/expected/stop_video.json index e21d8700..702bee62 100644 --- a/event_routing_backends/processors/xapi/tests/fixtures/expected/stop_video.json +++ b/event_routing_backends/processors/xapi/tests/fixtures/expected/stop_video.json @@ -20,7 +20,7 @@ ] }, "extensions": { - "https://github.com/edx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0", + "https://github.com/openedx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst": "1.0", "https://w3id.org/xapi/video/extensions/length": 195.0 } }, diff --git a/setup.py b/setup.py index 75e5505e..06baeead 100644 --- a/setup.py +++ b/setup.py @@ -113,7 +113,7 @@ def is_requirement(line): long_description_content_type='text/x-rst', author='edX', author_email='oscm@edx.org', - url='https://github.com/edx/event-routing-backends', + url='https://github.com/openedx/event-routing-backends', packages=[ 'event_routing_backends', ], From 51421c37dc2ecc8c4c0d0249dc7873825851d644 Mon Sep 17 00:00:00 2001 From: Sarina Canelake Date: Sat, 10 Sep 2022 18:14:47 -0400 Subject: [PATCH 3/4] fix: update path to .github workflows to read from openedx org --- .github/workflows/commitlint.yml | 2 +- .github/workflows/upgrade-python-requirements.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/commitlint.yml b/.github/workflows/commitlint.yml index e2b06615..fec11d6c 100644 --- a/.github/workflows/commitlint.yml +++ b/.github/workflows/commitlint.yml @@ -7,4 +7,4 @@ on: jobs: commitlint: - uses: edx/.github/.github/workflows/commitlint.yml@master + uses: openedx/.github/.github/workflows/commitlint.yml@master diff --git a/.github/workflows/upgrade-python-requirements.yml b/.github/workflows/upgrade-python-requirements.yml index b05ff7c8..8bf482ce 100644 --- a/.github/workflows/upgrade-python-requirements.yml +++ b/.github/workflows/upgrade-python-requirements.yml @@ -21,4 +21,4 @@ jobs: requirements_bot_github_email: ${{ secrets.REQUIREMENTS_BOT_GITHUB_EMAIL }} edx_smtp_username: ${{ secrets.EDX_SMTP_USERNAME }} edx_smtp_password: ${{ secrets.EDX_SMTP_PASSWORD }} - uses: edx/.github/.github/workflows/upgrade-python-requirements.yml@master + uses: openedx/.github/.github/workflows/upgrade-python-requirements.yml@master From 269387a6eebb0fd064c15add0d70737c2f10675b Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Tue, 13 Sep 2022 16:56:52 +0500 Subject: [PATCH 4/4] build: fixed the rst table structure. --- docs/xapi-extensions/eventVersion.rst | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/xapi-extensions/eventVersion.rst b/docs/xapi-extensions/eventVersion.rst index e4d7fda2..42aa38e7 100644 --- a/docs/xapi-extensions/eventVersion.rst +++ b/docs/xapi-extensions/eventVersion.rst @@ -1,5 +1,6 @@ -+-------------------------------------------------------------------------------------------------+--------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ -| Extensions | Title | Description | -+=================================================================================================+====================+================================================================================================================================================================================================================================================================================+ ++-----------------------------------------------------------------------------------------------------+--------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| Extensions | Title | Description | ++=====================================================================================================+====================+================================================================================================================================================================================================================================================================================+ | https://github.com/openedx/event-routing-backends/blob/master/docs/xapi-extensions/eventVersion.rst | "event version"@en | "This version represents version of mapping of a single edx event onto xapi format. Value should be a string of format "X.Y" where increment in X represents breaking changes and increment in Y represents addition of fields in the event json, both starting with 0 (zero)" | -+-------------------------------------------------------------------------------------------------+--------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ ++-----------------------------------------------------------------------------------------------------+--------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +