Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
5677134
ran python-modernize and isort on the repo
mraarif Nov 19, 2019
a45a656
Merge pull request #1 from edx/BOM-1038
mraarif Nov 20, 2019
fe6876a
Add setup.py install_requirements definition.
ericfab179 Jun 28, 2020
a8e3cff
Merge pull request #2 from eduNEXT/eric/oep-18
awais786 Jul 6, 2020
71440d2
Python code cleanup by the cleanup-python-code Jenkins job.
edx-requirements-bot Jan 12, 2021
d34df79
Merge pull request #3 from edx/jenkins/cleanup-python-code-a8e3cff
UsamaSadiq Jan 21, 2021
12bd6ba
feat: Added upgrade-python-requirements workflow
Jawayria May 11, 2021
97956c1
Merge pull request #5 from edx/Jawayria/upgrade-python-requirements
Jawayria May 11, 2021
8f885ca
build: update escalation email address
sarina May 24, 2021
f2d9c8f
Merge pull request #7 from edx/sarina-patch-1
sarina May 25, 2021
565e0d9
build: add CODEOWNERS; edx/community-engineering
stvstnfrd May 26, 2021
f976da3
merge: stvn/own/code
stvstnfrd May 26, 2021
9794819
build: remove OpsGenie alert for Python upgrade failures
sarina May 27, 2021
e4f2221
Bump lxml from 4.6.2 to 4.6.3 in /requirements
dependabot[bot] Jun 11, 2021
d279492
Merge pull request #12 from edx/dependabot/pip/requirements/lxml-4.6.3
dependabot[bot] Jun 11, 2021
70de89d
Bump pyyaml from 5.3.1 to 5.4 in /requirements
dependabot[bot] Jun 11, 2021
91c6da5
Merge pull request #11 from edx/dependabot/pip/requirements/pyyaml-5.4
dependabot[bot] Jun 11, 2021
7334bb4
build(deps): local add common_constraints file
stvstnfrd Jun 12, 2021
6376538
build(deps): run `make upgrade`
stvstnfrd Jun 12, 2021
2adf80d
merge(#13): build/cleanup
stvstnfrd Jun 12, 2021
268c006
chore: Updating Python Requirements
edx-requirements-bot Jun 23, 2021
0db9462
Merge pull request #14 from edx/jenkins/upgrade-python-requirements-2…
sarina Jun 24, 2021
4bd96eb
chore: Updating Python Requirements
edx-requirements-bot Jun 30, 2021
58863e9
merge(#15): jenkins/upgrade-python-requirements-0db9462
stvstnfrd Aug 9, 2021
20e78a6
chore: Updating Python Requirements
edx-requirements-bot Aug 11, 2021
23fe25b
Merge pull request #16 from edx/jenkins/upgrade-python-requirements-5…
sarina Aug 23, 2021
baa5ad7
chore: Updating Python Requirements
edx-requirements-bot Aug 25, 2021
8735420
Merge pull request #17 from edx/jenkins/upgrade-python-requirements-2…
nedbat Aug 26, 2021
524cef8
build: use the organization commitlint check
nedbat Oct 7, 2021
50c8b3b
chore: Updating Python Requirements
edx-requirements-bot Oct 13, 2021
5f37f93
Merge pull request #19 from edx/jenkins/upgrade-python-requirements-5…
nedbat Oct 13, 2021
25f73fa
chore: Updating Python Requirements
edx-requirements-bot Oct 20, 2021
259912e
Merge pull request #20 from edx/jenkins/upgrade-python-requirements-5…
nedbat Oct 20, 2021
b5c485a
chore: Updating Python Requirements
edx-requirements-bot Oct 27, 2021
04d6bff
Merge pull request #21 from edx/jenkins/upgrade-python-requirements-2…
nedbat Nov 2, 2021
94f178b
chore: Updating Python Requirements
edx-requirements-bot Nov 3, 2021
8b39cfb
feat: advertise constraints in setup.py
edx-requirements-bot Nov 4, 2021
499d1ee
Merge pull request #23 from edx/jenkins/cleanup-python-code-04d6bff
nedbat Nov 4, 2021
44c67d0
Merge pull request #22 from edx/jenkins/upgrade-python-requirements-0…
nedbat Nov 4, 2021
9848fe8
chore: Updating Python Requirements
edx-requirements-bot Nov 17, 2021
6d7d7bd
Merge pull request #24 from edx/jenkins/upgrade-python-requirements-4…
nedbat Nov 17, 2021
d05732a
chore: Updating Python Requirements
edx-requirements-bot Dec 15, 2021
2afa74d
Merge pull request #26 from edx/jenkins/upgrade-python-requirements-6…
nedbat Dec 16, 2021
34ebf1b
build: add DEPR workflow automation
sarina Feb 23, 2022
6a3d746
Merge DEPR automation workflow
sarina Feb 24, 2022
4e80a6b
fix: Install pip and pip-tools in upgrade script
edx-requirements-bot Jun 10, 2022
c0cc776
Merge pull request #36 from openedx/jenkins/fix-upgrade-6a3d746
Jawayria Jun 24, 2022
ad820a2
fix: update path to .github workflows to read from openedx org
sarina Sep 10, 2022
2d987ad
build: use canonical upgrade-python-requirements file
sarina Sep 15, 2022
428b827
Merge pull request #38 from openedx/tcril/fix-gh-org-url
sarina Sep 15, 2022
ad3870d
fix: github workflow -branch to actual default branch
sarina Sep 19, 2022
6eeb46d
Merge pull request #39 from openedx/tcril/update-py-upgrade-script
sarina Sep 19, 2022
4e49dc0
build: Adding functionality for publishing on pypi
awais786 Nov 24, 2022
ab1c26f
Merge pull request #62 from openedx/publish-pypi
awais786 Nov 25, 2022
a24461e
build: Remove community-engineering CODEOWNERS
Dec 8, 2022
be931ee
build: Remove community-engineering CODEOWNERS
Dec 9, 2022
ed82690
Feb 23, 2023
4b68aa3
Feb 23, 2023
e6b1838
Feb 23, 2023
40b27fd
Merge pull request #78 from openedx/repo_checks/ensure_workflows
Feb 24, 2023
b62e231
fix: update pip-tools to 6.13.0
edx-requirements-bot Apr 27, 2023
df073bf
Merge pull request #87 from openedx/jenkins/zshkoor/update-pip-tools-…
UsamaSadiq Apr 27, 2023
62b2468
fix: Uncommented parameters in upgrade requirements workflow
zubairshakoorarbisoft May 5, 2023
8de42dc
Merge pull request #88 from openedx/zshkoor/uncommented-upgrade-requi…
UsamaSadiq May 5, 2023
b7c143d
build: added reviewers in dependabot config
edx-requirements-bot May 12, 2023
70cf5d8
Merge pull request #89 from openedx/jenkins/zshkoor/add-reviewers-in-…
UsamaSadiq May 22, 2023
e48938a
chore: Updating Python Requirements
edx-requirements-bot Jun 5, 2023
a075c93
Merge pull request #92 from openedx/jenkins/upgrade-python-requiremen…
UsamaSadiq Jun 5, 2023
7c4117d
chore: Updating Python Requirements
edx-requirements-bot Sep 18, 2023
2ee8f73
Merge pull request #105 from openedx/jenkins/upgrade-python-requireme…
UsamaSadiq Sep 20, 2023
00e595a
chore: Updating Python Requirements
edx-requirements-bot Sep 25, 2023
65d7016
Merge pull request #106 from openedx/jenkins/upgrade-python-requireme…
UsamaSadiq Sep 25, 2023
061e6ba
fix: encoding issues of js files
mumarkhan999 Oct 9, 2023
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
9 changes: 9 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
version: 2
updates:
# Adding new check for github-actions
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
reviewers:
- "openedx/arbi-bom"
19 changes: 19 additions & 0 deletions .github/workflows/add-depr-ticket-to-depr-board.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Run the workflow that adds new tickets that are either:
# - labelled "DEPR"
# - title starts with "[DEPR]"
# - body starts with "Proposal Date" (this is the first template field)
# to the org-wide DEPR project board

name: Add newly created DEPR issues to the DEPR project board

on:
issues:
types: [opened]

jobs:
routeissue:
uses: openedx/.github/.github/workflows/add-depr-ticket-to-depr-board.yml@master
secrets:
GITHUB_APP_ID: ${{ secrets.GRAPHQL_AUTH_APP_ID }}
GITHUB_APP_PRIVATE_KEY: ${{ secrets.GRAPHQL_AUTH_APP_PEM }}
SLACK_BOT_TOKEN: ${{ secrets.SLACK_ISSUE_BOT_TOKEN }}
20 changes: 20 additions & 0 deletions .github/workflows/add-remove-label-on-comment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# This workflow runs when a comment is made on the ticket
# If the comment starts with "label: " it tries to apply
# the label indicated in rest of comment.
# If the comment starts with "remove label: ", it tries
# to remove the indicated label.
# Note: Labels are allowed to have spaces and this script does
# not parse spaces (as often a space is legitimate), so the command
# "label: really long lots of words label" will apply the
# label "really long lots of words label"

name: Allows for the adding and removing of labels via comment

on:
issue_comment:
types: [created]

jobs:
add_remove_labels:
uses: openedx/.github/.github/workflows/add-remove-label-on-comment.yml@master

10 changes: 10 additions & 0 deletions .github/workflows/commitlint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Run commitlint on the commit messages in a pull request.

name: Lint Commit Messages

on:
- pull_request

jobs:
commitlint:
uses: openedx/.github/.github/workflows/commitlint.yml@master
30 changes: 30 additions & 0 deletions .github/workflows/pypi-publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Publish package to PyPI

on:
push:
tags:
- '*'

jobs:
push:
runs-on: ubuntu-20.04

steps:
- name: Checkout
uses: actions/checkout@v3
- name: setup python
uses: actions/setup-python@v3
with:
python-version: 3.8

- name: Install pip
run: pip install -r requirements/pip.txt

- name: Build package
run: python setup.py sdist bdist_wheel

- name: Publish to PyPI
uses: pypa/gh-action-pypi-publish@master
with:
user: __token__
password: ${{ secrets.PYPI_UPLOAD_TOKEN }}
12 changes: 12 additions & 0 deletions .github/workflows/self-assign-issue.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# This workflow runs when a comment is made on the ticket
# If the comment starts with "assign me" it assigns the author to the
# ticket (case insensitive)

name: Assign comment author to ticket if they say "assign me"
on:
issue_comment:
types: [created]

jobs:
self_assign_by_comment:
uses: openedx/.github/.github/workflows/self-assign-issue.yml@master
27 changes: 27 additions & 0 deletions .github/workflows/upgrade-python-requirements.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Upgrade Python Requirements

on:
schedule:
- cron: "0 0 * * 1"
workflow_dispatch:
inputs:
branch:
description: "Target branch against which to create requirements PR"
required: true
default: 'master'

jobs:
call-upgrade-python-requirements-workflow:
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
# user_reviewers: ""
team_reviewers: "arbi-bom"
email_address: "arbi-bom@edx.org"
send_success_notification: false
secrets:
requirements_bot_github_token: ${{ secrets.REQUIREMENTS_BOT_GITHUB_TOKEN }}
requirements_bot_github_email: ${{ secrets.REQUIREMENTS_BOT_GITHUB_EMAIL }}
edx_smtp_username: ${{ secrets.EDX_SMTP_USERNAME }}
edx_smtp_password: ${{ secrets.EDX_SMTP_PASSWORD }}
13 changes: 13 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
COMMON_CONSTRAINTS_TXT=requirements/common_constraints.txt
.PHONY: $(COMMON_CONSTRAINTS_TXT)
$(COMMON_CONSTRAINTS_TXT):
wget -O "$(@)" https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt || touch "$(@)"

upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
upgrade: $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
pip install -q -r requirements/pip_tools.txt
pip-compile --allow-unsafe --rebuild --upgrade -o requirements/pip.txt requirements/pip.in
pip-compile --upgrade -o requirements/pip_tools.txt requirements/pip_tools.in
pip install -q -r requirements/pip.txt
pip install -q -r requirements/pip_tools.txt
pip-compile --upgrade -o requirements/base.txt requirements/base.in
8 changes: 5 additions & 3 deletions concept/concept.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@
can integrate with the LMS more easily than with Studio, so it's in
many ways an easier environment where to do this."""

import pkg_resources

import json, requests
import json

import pkg_resources
from xblock.core import XBlock
from xblock.fields import Scope, Integer, String
from xblock.fields import Integer, Scope, String
from xblock.fragment import Fragment

import requests


class ConceptXBlock(XBlock):
"""
Expand Down
Binary file modified concept/static/js/oa_edit.js
Binary file not shown.
Binary file modified concept/static/js/oa_server.js
Binary file not shown.
10 changes: 10 additions & 0 deletions openedx.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# This file describes this Open edX repo, as described in OEP-2:
# https://open-edx-proposals.readthedocs.io/en/latest/oep-0002-bp-repo-metadata.html#specification

oeps:
oep-2: True
oep-7: True
oep-18: True

tags:
- xblock
4 changes: 4 additions & 0 deletions requirements/base.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Core requirements for using this package
-c constraints.txt

XBlock
33 changes: 33 additions & 0 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# make upgrade
#
appdirs==1.4.4
# via fs
fs==2.4.16
# via xblock
lxml==4.9.3
# via xblock
markupsafe==2.1.3
# via xblock
python-dateutil==2.8.2
# via xblock
pytz==2023.3.post1
# via xblock
pyyaml==6.0.1
# via xblock
six==1.16.0
# via
# fs
# python-dateutil
web-fragments==2.1.0
# via xblock
webob==1.8.7
# via xblock
xblock==1.7.0
# via -r requirements/base.in

# The following packages are considered to be unsafe in a requirements file:
# setuptools
27 changes: 27 additions & 0 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# A central location for most common version constraints
# (across edx repos) for pip-installation.
#
# Similar to other constraint files this file doesn't install any packages.
# It specifies version constraints that will be applied if a package is needed.
# When pinning something here, please provide an explanation of why it is a good
# idea to pin this package across all edx repos, Ideally, link to other information
# that will help people in the future to remove the pin when possible.
# Writing an issue against the offending project and linking to it here is good.
#
# Note: Changes to this file will automatically be used by other repos, referencing
# this file from Github directly. It does not require packaging in edx-lint.


# using LTS django version
Django<4.0

# elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process.
# elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
elasticsearch<7.14.0

# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
django-simple-history==3.0.0

# tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos.
# Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810
tox<4.0.0
12 changes: 12 additions & 0 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Version constraints for pip-installation.
#
# This file doesn't install any packages. It specifies version constraints
# that will be applied if a package is needed.
#
# When pinning something here, please provide an explanation of why. Ideally,
# link to other information that will help people in the future to remove the
# pin when possible. Writing an issue against the offending project and
# linking to it here is good.

# Common constraints for edx repos
-c common_constraints.txt
7 changes: 7 additions & 0 deletions requirements/pip.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
-c constraints.txt
# Core dependencies for installing other packages

pip
setuptools
wheel

14 changes: 14 additions & 0 deletions requirements/pip.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# make upgrade
#
wheel==0.41.2
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
pip==23.2.1
# via -r requirements/pip.in
setuptools==68.2.2
# via -r requirements/pip.in
4 changes: 4 additions & 0 deletions requirements/pip_tools.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Dependencies to run compile tools
-c constraints.txt

pip-tools # Contains pip-compile, used to generate pip requirements files
31 changes: 31 additions & 0 deletions requirements/pip_tools.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# make upgrade
#
build==1.0.3
# via pip-tools
click==8.1.7
# via pip-tools
importlib-metadata==6.8.0
# via build
packaging==23.1
# via build
pip-tools==7.3.0
# via -r requirements/pip_tools.in
pyproject-hooks==1.0.0
# via build
tomli==2.0.1
# via
# build
# pip-tools
# pyproject-hooks
wheel==0.41.2
# via pip-tools
zipp==3.17.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
# setuptools
Loading