Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix github url strings (org edx -> openedx) #1891

Merged
merged 3 commits into from
Sep 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ JIRA: [JIRA-XXXX](https://openedx.atlassian.net/browse/JIRA-XXXX)

**Developer Checklist**

- [ ] Reviewed the [release process](https://github.com/edx/edx-ora2/blob/master/.github/release_process.md)
- [ ] Reviewed the [release process](https://github.com/openedx/edx-ora2/blob/master/.github/release_process.md)
- [ ] Translations and JS/SASS compiled
- [ ] Bumped version number in [setup.py](https://github.com/edx/edx-ora2/blob/a62e81a9b0d89223476967ec3c27f3557a850735/setup.py#L39) and [package.json](https://github.com/edx/edx-ora2/blob/a62e81a9b0d89223476967ec3c27f3557a850735/package.json#L3)
- [ ] Bumped version number in [setup.py](https://github.com/openedx/edx-ora2/blob/a62e81a9b0d89223476967ec3c27f3557a850735/setup.py#L39) and [package.json](https://github.com/openedx/edx-ora2/blob/a62e81a9b0d89223476967ec3c27f3557a850735/package.json#L3)

**Testing Instructions**

Expand Down
8 changes: 4 additions & 4 deletions .github/release_process.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@ Before Merging a pull request:
When a PR is ready to release, do the following to publish a new version of ORA:

- [ ] Merge to `master`
- [ ] Create a [release tag on GitHub](https://github.com/edx/edx-ora2/releases) matching version number in setup.py/package.json
- [ ] Create a [release tag on GitHub](https://github.com/openedx/edx-ora2/releases) matching version number in setup.py/package.json
- [ ] Grab a coffee while our automated process submits the build to PyPi
- [ ] Confirm new version appears in [PyPi: ora2](https://pypi.org/project/ora2)

## Release to Production

For non time-critical changes:

- [x] Dependencies in [edx-platform](https://github.com/edx/edx-platform) are routinely updated every few days as part of a dependency update job
- [x] Dependencies in [edx-platform](https://github.com/openedx/edx-platform) are routinely updated every few days as part of a dependency update job
- [ ] Communicate/coordinate updated feature flags/configuration changes to stakeholders
- [ ] After the next update task run, monitor the updated functionality in sandboxes/production

To expedite the release process:

- [ ] Create a new PR in [edx-platform](https://github.com/edx/edx-platform), changing ORA version in requirements files: `requirements/edx/{github.in,base.txt,development.txt,testing.txt}`
- [ ] Create a new PR in [edx-platform](https://github.com/openedx/edx-platform), changing ORA version in requirements files: `requirements/edx/{github.in,base.txt,development.txt,testing.txt}`
- [ ] Communicate/coordinate updated feature flags/configuration changes to stakeholders
- [ ] Follow the testing/release process for [edx-platform](https://github.com/edx/edx-platform)
- [ ] Follow the testing/release process for [edx-platform](https://github.com/openedx/edx-platform)
- [ ] After merging, monitor the updated functionality in sandboxes/production
2 changes: 1 addition & 1 deletion .github/workflows/commitlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ on:

jobs:
commitlint:
uses: edx/.github/.github/workflows/commitlint.yml@master
uses: openedx/.github/.github/workflows/commitlint.yml@master
2 changes: 1 addition & 1 deletion .github/workflows/upgrade-python-requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:

jobs:
call-upgrade-python-requirements-workflow:
uses: edx/.github/.github/workflows/upgrade-python-requirements.yml@master
uses: openedx/.github/.github/workflows/upgrade-python-requirements.yml@master
with:
branch: ${{ github.event.inputs.branch || 'master' }}
# optional parameters below; fill in if you'd like github or email notifications
Expand Down
8 changes: 4 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Open Response Assessment |build-status| |coverage-status|
=========================================================

This repository defines an Open Response Assessment (ORA) XBlock for use within edx-platform: https://github.com/edx/edx-platform
This repository defines an Open Response Assessment (ORA) XBlock for use within edx-platform: https://github.com/openedx/edx-platform

`User docs <http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/exercises_tools/open_response_assessments/index.html>`_

Expand All @@ -14,7 +14,7 @@ If you'll be modifying ORA code, the `Open edX Developer Stack`_ is a Docker-bas
edX engineers follow the `guides on our wiki <https://openedx.atlassian.net/wiki/spaces/EDUCATOR/pages/9765004/ORA+Developer+Guide>`_.
Reading this page before contributing **is highly recommended**.

.. _Open edX Developer Stack: https://github.com/edx/devstack
.. _Open edX Developer Stack: https://github.com/openedx/devstack

License
=======
Expand Down Expand Up @@ -42,8 +42,8 @@ You can get help with this code on our `mailing lists`_ or in real-time conversa
.. _mailing lists: https://open.edx.org/getting-help
.. _Slack: https://open.edx.org/getting-help

.. |build-status| image:: https://github.com/edx/edx-ora2/workflows/Python%20CI/badge.svg?branch=master
:target: https://github.com/edx/edx-ora2/actions?query=workflow%3A%22Python+CI%22
.. |build-status| image:: https://github.com/openedx/edx-ora2/workflows/Python%20CI/badge.svg?branch=master
:target: https://github.com/openedx/edx-ora2/actions?query=workflow%3A%22Python+CI%22
:alt: CI build status
.. |coverage-status| image:: https://coveralls.io/repos/edx/edx-ora2/badge.png?branch=master
:target: https://coveralls.io/r/edx/edx-ora2?branch=master
Expand Down
4 changes: 2 additions & 2 deletions docs/developers_guide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ Where is the code
-----------------
ORA is broken into two separate repositories:

- `edx-ora2 <https://github.com/edx/edx-ora2>`_
- `edx-ora2 <https://github.com/openedx/edx-ora2>`_

- `edx-submissions <https://github.com/edx/edx-submissions>`_
- `edx-submissions <https://github.com/openedx/edx-submissions>`_

Using ORA with docker devstack
------------------------------
Expand Down
6 changes: 3 additions & 3 deletions docs/ora_team_submissions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ORA2 Team Submissions
Workflows
---------

There’s an AssessmentWorkflow model that has a workflow app label, which means that the table name is prefixed with `workflow_` and not `assessment_` like everything else (I’m sure it’s to help resolve a name collision). `See for reference: <https://github.com/edx/edx-ora2/blob/001a6804e605426fdc43d4b5d83a38051c756c8d/openassessment/workflow/models.py#L108>`_. In fact, each of the AssessmentWorkflow, AssessmentWorkflowStep, and AssessmentWorkflowCancellation models live under the workflow app label.
There’s an AssessmentWorkflow model that has a workflow app label, which means that the table name is prefixed with `workflow_` and not `assessment_` like everything else (I’m sure it’s to help resolve a name collision). `See for reference: <https://github.com/openedx/edx-ora2/blob/001a6804e605426fdc43d4b5d83a38051c756c8d/openassessment/workflow/models.py#L108>`_. In fact, each of the AssessmentWorkflow, AssessmentWorkflowStep, and AssessmentWorkflowCancellation models live under the workflow app label.

- The ``SubmissionMixin.create_submission()`` method calls the ``workflow_api.create_workflow()`` method (it stops at ``WorkflowMixin.create_workflow()`` along the way). This is the entry point to workflow management in ORA.

Expand All @@ -22,7 +22,7 @@ Staff Workflows

These should be the only workflow type that we care about for team submissions.

`Python API for managing StaffWorkflow data: <https://github.com/edx/edx-ora2/blob/master/openassessment/assessment/api/staff.py>`_:
`Python API for managing StaffWorkflow data: <https://github.com/openedx/edx-ora2/blob/master/openassessment/assessment/api/staff.py>`_:

- **on_init(submission_uuid)**

Expand Down Expand Up @@ -56,7 +56,7 @@ New Models, sublcass StaffWorkflow

- We’ll actually also need a new, team-centric version of the ``workflow.AssessmentWorkflow`` model, so that we can pass a ``team_submission_uuid`` to the ``start_workflow()`` method. It will follow the same flow of logic of creating a workflow record and associated steps.

- ``AssessmentWorkflow.start_workflow()`` calls the ``on_init()`` function of each `assessment type’s API, e.g. <https://github.com/edx/edx-ora2/blob/master/openassessment/assessment/api/staff.py#L59>`_ In fact, pretty much all of the functions provided by assessment API’s require a ``submission_uuid`` parameter. So we’ll likely want some new API like ``assessment.api.team`` that provides the same functionality, but takes a ``team_submission_uuid`` as the first parameter.
- ``AssessmentWorkflow.start_workflow()`` calls the ``on_init()`` function of each `assessment type’s API, e.g. <https://github.com/openedx/edx-ora2/blob/master/openassessment/assessment/api/staff.py#L59>`_ In fact, pretty much all of the functions provided by assessment API’s require a ``submission_uuid`` parameter. So we’ll likely want some new API like ``assessment.api.team`` that provides the same functionality, but takes a ``team_submission_uuid`` as the first parameter.

No new team-based AssessmentWorkflowStep model. All that the steps care about are their types and the corresponding workflow instance.

Expand Down
14 changes: 7 additions & 7 deletions docs/release_process.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ ORA2 Release Processs

Github Checklist
----------------
- create a PR on edx-ora2 containing the version bump. This needs to happen in `setup.py <https://github.com/edx/edx-ora2/blob/4cc85e5a057fe8ea2d876e7c27344deb67df54d3/setup.py#L39>`_ and `package.json <https://github.com/edx/edx-ora2/blob/4cc85e5a057fe8ea2d876e7c27344deb67df54d3/package.json#L3>`_
- create a PR on edx-ora2 containing the version bump. This needs to happen in `setup.py <https://github.com/openedx/edx-ora2/blob/4cc85e5a057fe8ea2d876e7c27344deb67df54d3/setup.py#L39>`_ and `package.json <https://github.com/openedx/edx-ora2/blob/4cc85e5a057fe8ea2d876e7c27344deb67df54d3/package.json#L3>`_
- get a green Travis build on said PR
- merge to master
- green build on master
- create a release `tag on GitHub <https://github.com/edx/edx-ora2/releases>`_
- ORA2 is a dependency in platform. If immediate release is needed, create PR to update `requirements files` in `edx-platform`. See `PR for reference <https://github.com/edx/edx-platform/pull/24830>`_ . Otherwise, a bot will automatically update the requirements in platform.
- create a release `tag on GitHub <https://github.com/openedx/edx-ora2/releases>`_
- ORA2 is a dependency in platform. If immediate release is needed, create PR to update `requirements files` in `edx-platform`. See `PR for reference <https://github.com/openedx/edx-platform/pull/24830>`_ . Otherwise, a bot will automatically update the requirements in platform.
- If manual testing of the changes against edx-platform is desired, create a sandbox.
- get green build on the edx-platform PR, merge
- manually test changes on stage
Expand Down Expand Up @@ -38,11 +38,11 @@ Releasing edx-submissions
-------------------------
- ensure that the release number has been bumped in setup.py

- create a corresponding release in `edx submissions on GitHub: <https://github.com/edx/edx-submissions/releases>`_
- create a corresponding release in `edx submissions on GitHub: <https://github.com/openedx/edx-submissions/releases>`_

- generate a diff between the new tag and the old one

- e.g. https://github.com/edx/edx-submissions/compare/0.1.2...0.1.3
- e.g. https://github.com/openedx/edx-submissions/compare/0.1.2...0.1.3
- verify that only the expected changes are included
- ask anyone with commits to verify their changes on stage

Expand All @@ -58,11 +58,11 @@ Releasing edx-ora2

- ensure that the release number has been bumped in setup.py

- create a corresponding release on GitHub: https://github.com/edx/edx-ora2/releases
- create a corresponding release on GitHub: https://github.com/openedx/edx-ora2/releases

- generate a diff between the new tag and the old one

- e.g. https://github.com/edx/edx-ora2/compare/0.2.2...0.2.3
- e.g. https://github.com/openedx/edx-ora2/compare/0.2.2...0.2.3
- verify that only the expected changes are included
- ask anyone with commits to verify their changes on stage

Expand Down
2 changes: 1 addition & 1 deletion openassessment/fileupload/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,7 @@ def _file_uploads_from_list_fields(self, descriptions, names, sizes, include_del
def _descriptionless_uploads(self):
"""
This is the old behavior, required for a corner case and should be eventually removed.
https://github.com/edx/edx-ora2/pull/1275 closed a loophole that allowed files
https://github.com/openedx/edx-ora2/pull/1275 closed a loophole that allowed files
to be uploaded without descriptions. In that case, an ORA block's saved_file_descriptions would be
an empty list, but a key corresponding to their student item information would exist (and thus,
so would a valid download URL).
Expand Down
2 changes: 1 addition & 1 deletion openassessment/runtime_imports/classes.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def import_block_structure_transformers():
def import_course_waffle_flag():
"""
Helper method that imports CourseWaffleFlag from edx-platform at runtime.
https://github.com/edx/edx-platform/blob/master/openedx/core/djangoapps/waffle_utils/__init__.py#L345
https://github.com/openedx/edx-platform/blob/master/openedx/core/djangoapps/waffle_utils/__init__.py#L345
"""
from openedx.core.djangoapps.waffle_utils import CourseWaffleFlag
return CourseWaffleFlag
Expand Down
2 changes: 1 addition & 1 deletion openassessment/xblock/config_mixin.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ def is_mobile_support_enabled(self):
# in mobile apps.
# .. toggle_use_cases: open_edx
# .. toggle_creation_date: 2020-10-14
# .. toggle_tickets: https://github.com/edx/edx-ora2/pull/1445
# .. toggle_tickets: https://github.com/openedx/edx-ora2/pull/1445
return settings.FEATURES.get('ENABLE_ORA_MOBILE_SUPPORT', False)

@cached_property
Expand Down
2 changes: 1 addition & 1 deletion openassessment/xblock/static/dist/openassessment-lms.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "edx-ora2",
"version": "4.4.7",
"repository": "https://github.com/edx/edx-ora2.git",
"repository": "https://github.com/openedx/edx-ora2.git",
"dependencies": {
"@edx/frontend-build": "^6.1.1",
"@edx/paragon": "^12.8.0",
Expand Down
8 changes: 4 additions & 4 deletions pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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):
#
Expand Down Expand Up @@ -64,7 +64,7 @@
# SERIOUSLY.
#
# ------------------------------
# Generated by edx-lint version: 5.2.4
# Generated by edx-lint version: 5.2.5
# ------------------------------
[MASTER]
ignore = .git, .tox, migrations, acceptance
Expand Down Expand Up @@ -395,4 +395,4 @@ int-import-graph =
[EXCEPTIONS]
overgeneral-exceptions = Exception

# c4f560dcfef99308b43ef0b71fbf71a32abee8ea
# 0c410ff35825bc7444c07d5053bc7fddc4aaa50c
2 changes: 1 addition & 1 deletion requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ moto<1.3.15
# Networkx 2.5 drops support for python 3.5
networkx<2.5

# https://github.com/edx/edx-ora2/pull/1303
# https://github.com/openedx/edx-ora2/pull/1303
pytest==4.5.0
pytest-cov==2.7.1
pytest-django==3.7.0
Expand Down
2 changes: 1 addition & 1 deletion scripts/run-pylint.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def count_pylint_violations(report_file):
"""
Parses a pylint report line-by-line, and determins the number of pylint violations.

Taken from https://github.com/edx/edx-platform/blob/master/pavelib/quality.py.
Taken from https://github.com/openedx/edx-platform/blob/master/pavelib/quality.py.
"""
num_violations = 0
# An example string:
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def get_version(*file_paths):
version=VERSION,
author='edX',
author_email='[email protected]',
url='http://github.com/edx/edx-ora2',
url='http://github.com/openedx/edx-ora2',
description='edx-ora2',
license='AGPL',
long_description=README,
Expand Down