From 82a7f8267ad65d2607dc32482785047e0ee40c2e Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Mon, 8 Jul 2024 12:43:06 +0500 Subject: [PATCH 01/22] chore: initial commit --- .coveragerc | 3 + .dockerignore | 1 + .editorconfig | 100 +++ .github/PULL_REQUEST_TEMPLATE.md | 10 + .github/workflows/ci.yml | 46 ++ .github/workflows/commitlint.yml | 10 + .github/workflows/pypi-publish.yml | 30 + .../workflows/upgrade-python-requirements.yml | 27 + .gitignore | 65 ++ .readthedocs.yaml | 27 + CHANGELOG.rst | 25 + Dockerfile | 11 + LICENSE.txt | 664 ++++++++++++++++++ MANIFEST.in | 6 + Makefile | 88 +++ README.md | 1 - README.rst | 151 ++++ catalog-info.yaml | 38 + codecov.yml | 12 + docs/Makefile | 230 ++++++ docs/_static/theme_overrides.css | 10 + docs/changelog.rst | 1 + docs/concepts/index.rst | 2 + docs/conf.py | 546 ++++++++++++++ docs/decisions.rst | 12 + docs/decisions/0001-purpose-of-this-repo.rst | 57 ++ docs/decisions/README.rst | 8 + docs/getting_started.rst | 18 + docs/how-tos/index.rst | 2 + docs/index.rst | 34 + docs/internationalization.rst | 51 ++ docs/make.bat | 281 ++++++++ docs/quickstarts/index.rst | 2 + docs/readme.rst | 1 + docs/references/index.rst | 2 + docs/testing.rst | 44 ++ manage.py | 16 + pylintrc | 388 ++++++++++ pylintrc_tweaks | 9 + requirements/base.in | 8 + requirements/base.txt | 104 +++ requirements/ci.in | 5 + requirements/ci.txt | 34 + requirements/constraints.txt | 12 + requirements/dev.in | 9 + requirements/dev.txt | 399 +++++++++++ requirements/doc.in | 11 + requirements/doc.txt | 372 ++++++++++ requirements/pip-tools.in | 5 + requirements/pip-tools.txt | 24 + requirements/pip.in | 6 + requirements/pip.txt | 14 + requirements/private.readme | 15 + requirements/quality.in | 10 + requirements/quality.txt | 315 +++++++++ requirements/test.in | 9 + requirements/test.txt | 224 ++++++ setup.cfg | 10 + setup.py | 205 ++++++ test_utils/__init__.py | 10 + tests/test_annotatable.py | 26 + tests/test_poll.py | 26 + tests/test_word_cloud.py | 26 + tox.ini | 85 +++ translation_settings.py | 51 ++ xblocks_contrib/__init__.py | 9 + xblocks_contrib/annotatable/.tx/config | 8 + xblocks_contrib/annotatable/__init__.py | 7 + xblocks_contrib/annotatable/annotatable.py | 115 +++ .../annotatable/conf/locale/__init__.py | 0 .../annotatable/conf/locale/config.yaml | 93 +++ xblocks_contrib/annotatable/static/README.txt | 19 + .../annotatable/static/css/annotatable.css | 9 + .../annotatable/static/html/annotatable.html | 5 + .../annotatable/static/js/src/annotatable.js | 33 + xblocks_contrib/annotatable/translation | 1 + xblocks_contrib/poll/.tx/config | 8 + xblocks_contrib/poll/__init__.py | 7 + xblocks_contrib/poll/conf/locale/__init__.py | 0 xblocks_contrib/poll/conf/locale/config.yaml | 93 +++ xblocks_contrib/poll/poll.py | 115 +++ xblocks_contrib/poll/static/README.txt | 19 + xblocks_contrib/poll/static/css/poll.css | 9 + xblocks_contrib/poll/static/html/poll.html | 5 + xblocks_contrib/poll/static/js/src/poll.js | 33 + xblocks_contrib/poll/translation | 1 + xblocks_contrib/word_cloud/.tx/config | 8 + xblocks_contrib/word_cloud/__init__.py | 7 + .../word_cloud/conf/locale/__init__.py | 0 .../word_cloud/conf/locale/config.yaml | 93 +++ xblocks_contrib/word_cloud/static/README.txt | 19 + .../word_cloud/static/css/word_cloud.css | 9 + .../word_cloud/static/html/word_cloud.html | 5 + .../word_cloud/static/js/src/word_cloud.js | 33 + xblocks_contrib/word_cloud/translation | 1 + xblocks_contrib/word_cloud/word_cloud.py | 115 +++ 96 files changed, 5922 insertions(+), 1 deletion(-) create mode 100644 .coveragerc create mode 100644 .dockerignore create mode 100644 .editorconfig create mode 100644 .github/PULL_REQUEST_TEMPLATE.md create mode 100644 .github/workflows/ci.yml create mode 100644 .github/workflows/commitlint.yml create mode 100644 .github/workflows/pypi-publish.yml create mode 100644 .github/workflows/upgrade-python-requirements.yml create mode 100644 .gitignore create mode 100644 .readthedocs.yaml create mode 100644 CHANGELOG.rst create mode 100644 Dockerfile create mode 100644 LICENSE.txt create mode 100644 MANIFEST.in create mode 100644 Makefile delete mode 100644 README.md create mode 100644 README.rst create mode 100644 catalog-info.yaml create mode 100644 codecov.yml create mode 100644 docs/Makefile create mode 100644 docs/_static/theme_overrides.css create mode 100644 docs/changelog.rst create mode 100644 docs/concepts/index.rst create mode 100644 docs/conf.py create mode 100644 docs/decisions.rst create mode 100644 docs/decisions/0001-purpose-of-this-repo.rst create mode 100644 docs/decisions/README.rst create mode 100644 docs/getting_started.rst create mode 100644 docs/how-tos/index.rst create mode 100644 docs/index.rst create mode 100644 docs/internationalization.rst create mode 100644 docs/make.bat create mode 100644 docs/quickstarts/index.rst create mode 100644 docs/readme.rst create mode 100644 docs/references/index.rst create mode 100644 docs/testing.rst create mode 100755 manage.py create mode 100644 pylintrc create mode 100644 pylintrc_tweaks create mode 100644 requirements/base.in create mode 100644 requirements/base.txt create mode 100644 requirements/ci.in create mode 100644 requirements/ci.txt create mode 100644 requirements/constraints.txt create mode 100644 requirements/dev.in create mode 100644 requirements/dev.txt create mode 100644 requirements/doc.in create mode 100644 requirements/doc.txt create mode 100644 requirements/pip-tools.in create mode 100644 requirements/pip-tools.txt create mode 100644 requirements/pip.in create mode 100644 requirements/pip.txt create mode 100644 requirements/private.readme create mode 100644 requirements/quality.in create mode 100644 requirements/quality.txt create mode 100644 requirements/test.in create mode 100644 requirements/test.txt create mode 100644 setup.cfg create mode 100755 setup.py create mode 100644 test_utils/__init__.py create mode 100644 tests/test_annotatable.py create mode 100644 tests/test_poll.py create mode 100644 tests/test_word_cloud.py create mode 100644 tox.ini create mode 100644 translation_settings.py create mode 100644 xblocks_contrib/__init__.py create mode 100644 xblocks_contrib/annotatable/.tx/config create mode 100644 xblocks_contrib/annotatable/__init__.py create mode 100644 xblocks_contrib/annotatable/annotatable.py create mode 100644 xblocks_contrib/annotatable/conf/locale/__init__.py create mode 100644 xblocks_contrib/annotatable/conf/locale/config.yaml create mode 100644 xblocks_contrib/annotatable/static/README.txt create mode 100644 xblocks_contrib/annotatable/static/css/annotatable.css create mode 100644 xblocks_contrib/annotatable/static/html/annotatable.html create mode 100644 xblocks_contrib/annotatable/static/js/src/annotatable.js create mode 120000 xblocks_contrib/annotatable/translation create mode 100644 xblocks_contrib/poll/.tx/config create mode 100644 xblocks_contrib/poll/__init__.py create mode 100644 xblocks_contrib/poll/conf/locale/__init__.py create mode 100644 xblocks_contrib/poll/conf/locale/config.yaml create mode 100644 xblocks_contrib/poll/poll.py create mode 100644 xblocks_contrib/poll/static/README.txt create mode 100644 xblocks_contrib/poll/static/css/poll.css create mode 100644 xblocks_contrib/poll/static/html/poll.html create mode 100644 xblocks_contrib/poll/static/js/src/poll.js create mode 120000 xblocks_contrib/poll/translation create mode 100644 xblocks_contrib/word_cloud/.tx/config create mode 100644 xblocks_contrib/word_cloud/__init__.py create mode 100644 xblocks_contrib/word_cloud/conf/locale/__init__.py create mode 100644 xblocks_contrib/word_cloud/conf/locale/config.yaml create mode 100644 xblocks_contrib/word_cloud/static/README.txt create mode 100644 xblocks_contrib/word_cloud/static/css/word_cloud.css create mode 100644 xblocks_contrib/word_cloud/static/html/word_cloud.html create mode 100644 xblocks_contrib/word_cloud/static/js/src/word_cloud.js create mode 120000 xblocks_contrib/word_cloud/translation create mode 100644 xblocks_contrib/word_cloud/word_cloud.py diff --git a/.coveragerc b/.coveragerc new file mode 100644 index 0000000..1f4f2d7 --- /dev/null +++ b/.coveragerc @@ -0,0 +1,3 @@ +[run] +branch = True +source = xblocks_contrib diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..9414382 --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +Dockerfile diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..5cf5aed --- /dev/null +++ b/.editorconfig @@ -0,0 +1,100 @@ +# *************************** +# ** DO NOT EDIT THIS FILE ** +# *************************** +# +# 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 +# repo's file. +# +# 2. Run: +# +# $ edx_lint write .editorconfig +# +# 3. This will modify the local file. Submit a pull request to get it +# checked in so that others will benefit. +# +# +# CENTRAL CHANGE: +# +# 1. Edit the .editorconfig file in the edx-lint repo at +# https://github.com/openedx/edx-lint/blob/master/edx_lint/files/.editorconfig +# +# 2. install the updated version of edx-lint (in edx-lint): +# +# $ pip install . +# +# 3. Run (in edx-lint): +# +# $ 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 and +# publish the new version. +# +# 5. In your local repo, install the newer version of edx-lint. +# +# 6. Run: +# +# $ edx_lint write .editorconfig +# +# 7. This will modify the local file. Submit a pull request to get it +# checked in so that others will benefit. +# +# +# +# +# +# STAY AWAY FROM THIS FILE! +# +# +# +# +# +# SERIOUSLY. +# +# ------------------------------ +# Generated by edx-lint version: 5.2.5 +# ------------------------------ +[*] +end_of_line = lf +insert_final_newline = true +charset = utf-8 +indent_style = space +indent_size = 4 +max_line_length = 120 +trim_trailing_whitespace = true + +[{Makefile, *.mk}] +indent_style = tab +indent_size = 8 + +[*.{yml,yaml,json}] +indent_size = 2 + +[*.js] +indent_size = 2 + +[*.diff] +trim_trailing_whitespace = false + +[.git/*] +trim_trailing_whitespace = false + +[COMMIT_EDITMSG] +max_line_length = 72 + +[*.rst] +max_line_length = 79 + +# f2f02689fced7a2e0c62c2f9803184114dc2ae4b diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..ed62972 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,10 @@ + +**Merge checklist:** +Check off if complete *or* not applicable: +- [ ] Version bumped +- [ ] Changelog record added +- [ ] Documentation updated (not only docstrings) +- [ ] Fixup commits are squashed away +- [ ] Unit tests added/updated +- [ ] Manual testing instructions provided +- [ ] Noted any: Concerns, dependencies, migration issues, deadlines, tickets diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..f193a86 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,46 @@ +name: Python CI + +on: + push: + branches: [main] + pull_request: + branches: + - '**' + + +jobs: + run_tests: + name: tests + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [ubuntu-20.04] + python-version: ['3.11', '3.12'] + toxenv: [quality, docs, django42, django50] + + steps: + - uses: actions/checkout@v4 + - name: setup python + uses: actions/setup-python@v5 + with: + python-version: ${{ matrix.python-version }} + + - name: Install pip + run: pip install -r requirements/pip.txt + + - name: Install Dependencies + run: pip install -r requirements/ci.txt + + - name: Run Tests + env: + TOXENV: ${{ matrix.toxenv }} + run: tox + + - name: Run coverage + if: matrix.python-version == '3.11' && matrix.toxenv == 'django42' + uses: codecov/codecov-action@v4 + with: + token: ${{ secrets.CODECOV_TOKEN }} + flags: unittests + fail_ci_if_error: true diff --git a/.github/workflows/commitlint.yml b/.github/workflows/commitlint.yml new file mode 100644 index 0000000..fec11d6 --- /dev/null +++ b/.github/workflows/commitlint.yml @@ -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 diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml new file mode 100644 index 0000000..a6c10dc --- /dev/null +++ b/.github/workflows/pypi-publish.yml @@ -0,0 +1,30 @@ +name: Publish package to PyPi + +on: + release: + types: [published] + +jobs: + + push: + runs-on: ubuntu-20.04 + + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: setup python + uses: actions/setup-python@v5 + with: + python-version: 3.11 + + - 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 }} diff --git a/.github/workflows/upgrade-python-requirements.yml b/.github/workflows/upgrade-python-requirements.yml new file mode 100644 index 0000000..293fcc9 --- /dev/null +++ b/.github/workflows/upgrade-python-requirements.yml @@ -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: 'main' + +jobs: + call-upgrade-python-requirements-workflow: + uses: openedx/.github/.github/workflows/upgrade-python-requirements.yml@master + with: + branch: ${{ github.event.inputs.branch || 'main' }} + # optional parameters below; fill in if you'd like github or email notifications + # user_reviewers: "" + # team_reviewers: "" + # email_address: "" + # 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 }} diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..99a70ef --- /dev/null +++ b/.gitignore @@ -0,0 +1,65 @@ +*.py[cod] +__pycache__ +.pytest_cache + +# C extensions +*.so + +# Packages +*.egg +*.egg-info +/dist +/build +/eggs +/parts +/bin +/var +/sdist +/develop-eggs +/.installed.cfg +/lib +/lib64 + +# Installer logs +pip-log.txt + +# Unit test / coverage reports +.cache/ +.pytest_cache/ +.coverage +.coverage.* +.tox +coverage.xml +htmlcov/ + +# Virtual environments +/venv/ +/venv-*/ +/.venv/ +/.venv-*/ + +# The Silver Searcher +.agignore + +# OS X artifacts +*.DS_Store + +# Logging +log/ +logs/ +chromedriver.log +ghostdriver.log + +# Complexity +output/*.html +output/*/index.html + +# Sphinx +docs/_build +docs/modules.rst +docs/xblocks_contrib.rst +docs/xblocks_contrib.*.rst + +# Private requirements +requirements/private.in +requirements/private.txt diff --git a/.readthedocs.yaml b/.readthedocs.yaml new file mode 100644 index 0000000..c9226ad --- /dev/null +++ b/.readthedocs.yaml @@ -0,0 +1,27 @@ +# .readthedocs.yml +# Read the Docs configuration file +# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details + +# Required +version: 2 + +# Build documentation in the docs/ directory with Sphinx +sphinx: + configuration: docs/conf.py + fail_on_warning: true + +# Set the version of python needed to build these docs. +build: + os: "ubuntu-22.04" + tools: + python: "3.11" + +python: + install: + - requirements: requirements/doc.txt + + # This will pip install this repo into the python environment + # if you are using this in a repo that is not pip installable + # then you should remove the following two lines. + - method: pip + path: . diff --git a/CHANGELOG.rst b/CHANGELOG.rst new file mode 100644 index 0000000..9768483 --- /dev/null +++ b/CHANGELOG.rst @@ -0,0 +1,25 @@ +Change Log +########## + +.. + All enhancements and patches to xblocks-contrib will be documented + in this file. It adheres to the structure of https://keepachangelog.com/ , + but in reStructuredText instead of Markdown (for ease of incorporation into + Sphinx documentation and the PyPI description). + + This project adheres to Semantic Versioning (https://semver.org/). + +.. There should always be an "Unreleased" section for changes pending release. + +Unreleased +********** + +* + +0.1.0 – 2024-07-04 +********************************************** + +Added +===== + +* First release on PyPI. diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..645cb68 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,11 @@ +FROM openedx/xblock-sdk +RUN mkdir -p /usr/local/src/xblocks-contrib +VOLUME ["/usr/local/src/xblocks-contrib"] +RUN apt-get update && apt-get install -y gettext +RUN echo "pip install -r /usr/local/src/xblocks-contrib/requirements.txt" >> /usr/local/src/xblock-sdk/install_and_run_xblock.sh +RUN echo "pip install -e /usr/local/src/xblocks-contrib" >> /usr/local/src/xblock-sdk/install_and_run_xblock.sh +RUN echo "cd /usr/local/src/xblocks-contrib && make compile_translations && cd /usr/local/src/xblock-sdk" >> /usr/local/src/xblock-sdk/install_and_run_xblock.sh +RUN echo "exec python /usr/local/src/xblock-sdk/manage.py \"\$@\"" >> /usr/local/src/xblock-sdk/install_and_run_xblock.sh +RUN chmod +x /usr/local/src/xblock-sdk/install_and_run_xblock.sh +ENTRYPOINT ["/bin/bash", "/usr/local/src/xblock-sdk/install_and_run_xblock.sh"] +CMD ["runserver", "0.0.0.0:8000"] diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..8a87330 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,664 @@ + + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. + + diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..bcd2b3e --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,6 @@ +include CHANGELOG.rst +include LICENSE.txt +include README.rst +include requirements/base.in +include requirements/constraints.txt +recursive-include xblocks_contrib *.html *.png *.gif *.js *.css *.jpg *.jpeg *.svg diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..d0ad939 --- /dev/null +++ b/Makefile @@ -0,0 +1,88 @@ +.DEFAULT_GOAL := help + +.PHONY: dev.clean dev.build dev.run upgrade help requirements +.PHONY: extract_translations compile_translations +.PHONY: detect_changed_source_translations dummy_translations build_dummy_translations +.PHONY: validate_translations pull_translations push_translations install_transifex_clients + +REPO_NAME := xblocks-contrib +PACKAGE_NAME := xblocks_contrib +EXTRACT_DIR := $(PACKAGE_NAME)/conf/locale/en/LC_MESSAGES +JS_TARGET := $(PACKAGE_NAME)/public/js/translations + +help: + @perl -nle'print $& if m{^[\.a-zA-Z_-]+:.*?## .*$$}' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m %-25s\033[0m %s\n", $$1, $$2}' + +# Define PIP_COMPILE_OPTS=-v to get more information during make upgrade. +PIP_COMPILE = pip-compile --upgrade $(PIP_COMPILE_OPTS) + +upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade +upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in + pip install -qr requirements/pip-tools.txt + # Make sure to compile files after any other files they include! + $(PIP_COMPILE) --allow-unsafe -o requirements/pip.txt requirements/pip.in + $(PIP_COMPILE) -o requirements/pip-tools.txt requirements/pip-tools.in + pip install -qr requirements/pip.txt + pip install -qr requirements/pip-tools.txt + $(PIP_COMPILE) -o requirements/base.txt requirements/base.in + $(PIP_COMPILE) -o requirements/test.txt requirements/test.in + $(PIP_COMPILE) -o requirements/doc.txt requirements/doc.in + $(PIP_COMPILE) -o requirements/quality.txt requirements/quality.in + $(PIP_COMPILE) -o requirements/ci.txt requirements/ci.in + $(PIP_COMPILE) -o requirements/dev.txt requirements/dev.in + # Let tox control the Django version for tests + sed '/^[dD]jango==/d' requirements/test.txt > requirements/test.tmp + mv requirements/test.tmp requirements/test.txt + +piptools: ## install pinned version of pip-compile and pip-sync + pip install -r requirements/pip.txt + pip install -r requirements/pip-tools.txt + +requirements: piptools ## install development environment requirements + pip-sync -q requirements/dev.txt requirements/private.* + +dev.clean: + -docker rm $(REPO_NAME)-dev + -docker rmi $(REPO_NAME)-dev + +dev.build: + docker build -t $(REPO_NAME)-dev $(CURDIR) + +dev.run: dev.clean dev.build ## Clean, build and run test image + docker run -p 8000:8000 -v $(CURDIR):/usr/local/src/$(REPO_NAME) --name $(REPO_NAME)-dev $(REPO_NAME)-dev + +## Localization targets + +extract_translations: ## extract strings to be translated, outputting .po files + cd $(PACKAGE_NAME) && i18n_tool extract --no-segment --merge-po-files + mv $(EXTRACT_DIR)/django.po $(EXTRACT_DIR)/text.po + +compile_translations: ## compile translation files, outputting .mo files for each supported language + cd $(PACKAGE_NAME) && i18n_tool generate + python manage.py compilejsi18n --namespace Xblocks-contribI18n --output $(JS_TARGET) + +detect_changed_source_translations: + cd $(PACKAGE_NAME) && i18n_tool changed + +dummy_translations: ## generate dummy translation (.po) files + cd $(PACKAGE_NAME) && i18n_tool dummy + +build_dummy_translations: dummy_translations compile_translations ## generate and compile dummy translation files + +validate_translations: build_dummy_translations detect_changed_source_translations ## validate translations + +pull_translations: ## pull translations from transifex + cd $(PACKAGE_NAME) && i18n_tool transifex pull + +push_translations: extract_translations ## push translations to transifex + cd $(PACKAGE_NAME) && i18n_tool transifex push + +install_transifex_client: ## Install the Transifex client + # Instaling client will skip CHANGELOG and LICENSE files from git changes + # so remind the user to commit the change first before installing client. + git diff -s --exit-code HEAD || { echo "Please commit changes first."; exit 1; } + curl -o- https://raw.githubusercontent.com/transifex/cli/master/install.sh | bash + git checkout -- LICENSE README.md ## overwritten by Transifex installer + +selfcheck: ## check that the Makefile is well-formed + @echo "The Makefile is well-formed." diff --git a/README.md b/README.md deleted file mode 100644 index 0cacbbe..0000000 --- a/README.md +++ /dev/null @@ -1 +0,0 @@ -# xblocks-contrib diff --git a/README.rst b/README.rst new file mode 100644 index 0000000..9085408 --- /dev/null +++ b/README.rst @@ -0,0 +1,151 @@ +core xblocks +############################# + +Testing with Docker +******************** + +This XBlock comes with a Docker test environment ready to build, based on the xblock-sdk workbench. To build and run it:: + + $ make dev.run + +The XBlock SDK Workbench, including this XBlock, will be available on the list of XBlocks at http://localhost:8000 + +Translating +************* + +Internationalization (i18n) is when a program is made aware of multiple languages. +Localization (l10n) is adapting a program to local language and cultural habits. + +Use the locale directory to provide internationalized strings for your XBlock project. +For more information on how to enable translations, visit the +`Open edX XBlock tutorial on Internationalization `_. + +This cookiecutter template uses `django-statici18n `_ +to provide translations to static javascript using ``gettext``. + +The included Makefile contains targets for extracting, compiling and validating translatable strings. +The general steps to provide multilingual messages for a Python program (or an XBlock) are: + +1. Mark translatable strings. +2. Run i18n tools to create raw message catalogs. +3. Create language specific translations for each message in the catalogs. +4. Use ``gettext`` to translate strings. + +1. Mark translatable strings +============================= + +Mark translatable strings in python:: + + + from django.utils.translation import ugettext as _ + + # Translators: This comment will appear in the `.po` file. + message = _("This will be marked.") + +See `edx-developer-guide `__ +for more information. + +You can also use ``gettext`` to mark strings in javascript:: + + + // Translators: This comment will appear in the `.po` file. + var message = gettext("Custom message."); + +See `edx-developer-guide `__ +for more information. + +2. Run i18n tools to create Raw message catalogs +================================================= + +This cookiecutter template offers multiple make targets which are shortcuts to +use `edx-i18n-tools `_. + +After marking strings as translatable we have to create the raw message catalogs. +These catalogs are created in ``.po`` files. For more information see +`GNU PO file documentation `_. +These catalogs can be created by running:: + + + $ make extract_translations + +The previous command will create the necessary ``.po`` files under +``xblocks-contrib/xblocks_contrib/conf/locale/en/LC_MESSAGES/text.po``. +The ``text.po`` file is created from the ``django-partial.po`` file created by +``django-admin makemessages`` (`makemessages documentation `_), +this is why you will not see a ``django-partial.po`` file. + +3. Create language specific translations +============================================== + +3.1 Add translated strings +--------------------------- + +After creating the raw message catalogs, all translations should be filled out by the translator. +One or more translators must edit the entries created in the message catalog, i.e. the ``.po`` file(s). +The format of each entry is as follows:: + + # translator-comments + A. extracted-comments + #: reference… + #, flag… + #| msgid previous-untranslated-string + msgid 'untranslated message' + msgstr 'mensaje traducido (translated message)' + +For more information see +`GNU PO file documentation `_. + +To use translations from transifex use the follow Make target to pull translations:: + + $ make pull_translations + +See `config instructions `_ for information on how to set up your +transifex credentials. + +See `transifex documentation `_ for more details about integrating +django with transiflex. + +3.2 Compile translations +------------------------- + +Once translations are in place, use the following Make target to compile the translation catalogs ``.po`` into +``.mo`` message files:: + + $ make compile_translations + +The previous command will compile ``.po`` files using +``django-admin compilemessages`` (`compilemessages documentation `_). +After compiling the ``.po`` file(s), ``django-statici18n`` is used to create language specific catalogs. See +``django-statici18n`` `documentation `_ for more information. + +To upload translations to transiflex use the follow Make target:: + + $ make push_translations + +See `config instructions `_ for information on how to set up your +transifex credentials. + +See `transifex documentation `_ for more details about integrating +django with transiflex. + + **Note:** The ``dev.run`` make target will automatically compile any translations. + + **Note:** To check if the source translation files (``.po``) are up-to-date run:: + + $ make detect_changed_source_translations + +4. Use ``gettext`` to translate strings +======================================== + +Django will automatically use ``gettext`` and the compiled translations to translate strings. + +Troubleshooting +**************** + +If there are any errors compiling ``.po`` files run the following command to validate your ``.po`` files:: + + $ make validate + +See `django's i18n troubleshooting documentation +`_ +for more information. diff --git a/catalog-info.yaml b/catalog-info.yaml new file mode 100644 index 0000000..091fd12 --- /dev/null +++ b/catalog-info.yaml @@ -0,0 +1,38 @@ +# This file records information about this repo. Its use is described in OEP-55: +# https://open-edx-proposals.readthedocs.io/en/latest/processes/oep-0055-proc-project-maintainers.html + +apiVersion: backstage.io/v1alpha1 +kind: "" +metadata: + name: 'xblocks-contrib' + description: "core xblocks" + annotations: + # The openedx.org/release key is described in OEP-10: + # https://open-edx-proposals.readthedocs.io/en/latest/oep-0010-proc-openedx-releases.html + # The FAQ might also be helpful: https://openedx.atlassian.net/wiki/spaces/COMM/pages/1331268879/Open+edX+Release+FAQ + # Note: This will only work if the repo is in the `openedx` org in github. Repos in other orgs that have this + # setting will still be treated as if they don't want to be part of the Open edX releases. + openedx.org/release: null + # (Optional) Annotation keys and values can be whatever you want. + # We use it in Open edX repos to have a comma-separated list of GitHub user + # names that might be interested in changes to the architecture of this + # component. + openedx.org/arch-interest-groups: "" +spec: + + # (Required) This can be a group(`group:` or a user(`user:`) + owner: "" + + # (Required) Acceptable Type Values: service, website, library + type: '' + + # (Required) Acceptable Lifecycle Values: experimental, production, deprecated + lifecycle: 'experimental' + + # (Optional) The value can be the name of any known component. + subcomponentOf: '' + + # (Optional) An array of different components or resources. + dependsOn: + - '' + - '' diff --git a/codecov.yml b/codecov.yml new file mode 100644 index 0000000..4da4768 --- /dev/null +++ b/codecov.yml @@ -0,0 +1,12 @@ +coverage: + status: + project: + default: + enabled: yes + target: auto + patch: + default: + enabled: yes + target: 100% + +comment: false diff --git a/docs/Makefile b/docs/Makefile new file mode 100644 index 0000000..1d579f6 --- /dev/null +++ b/docs/Makefile @@ -0,0 +1,230 @@ +# Makefile for Sphinx documentation +# + +# You can set these variables from the command line. +SPHINXOPTS = +SPHINXBUILD = sphinx-build +PAPER = +BUILDDIR = _build + +# User-friendly check for sphinx-build +ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1) +$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from https://sphinx-doc.org/) +endif + +# Internal variables. +PAPEROPT_a4 = -D latex_paper_size=a4 +PAPEROPT_letter = -D latex_paper_size=letter +ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . +# the i18n builder cannot share the environment and doctrees with the others +I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . + +.PHONY: help +help: + @echo "Please use \`make ' where is one of" + @echo " html to make standalone HTML files" + @echo " dirhtml to make HTML files named index.html in directories" + @echo " singlehtml to make a single large HTML file" + @echo " pickle to make pickle files" + @echo " json to make JSON files" + @echo " htmlhelp to make HTML files and a HTML help project" + @echo " qthelp to make HTML files and a qthelp project" + @echo " applehelp to make an Apple Help Book" + @echo " devhelp to make HTML files and a Devhelp project" + @echo " epub to make an epub" + @echo " epub3 to make an epub3" + @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" + @echo " latexpdf to make LaTeX files and run them through pdflatex" + @echo " latexpdfja to make LaTeX files and run them through platex/dvipdfmx" + @echo " text to make text files" + @echo " man to make manual pages" + @echo " texinfo to make Texinfo files" + @echo " info to make Texinfo files and run them through makeinfo" + @echo " gettext to make PO message catalogs" + @echo " changes to make an overview of all changed/added/deprecated items" + @echo " xml to make Docutils-native XML files" + @echo " pseudoxml to make pseudoxml-XML files for display purposes" + @echo " linkcheck to check all external links for integrity" + @echo " doctest to run all doctests embedded in the documentation (if enabled)" + @echo " coverage to run coverage check of the documentation (if enabled)" + @echo " dummy to check syntax errors of document sources" + +.PHONY: clean +clean: + rm -rf $(BUILDDIR)/* + +.PHONY: html +html: + $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html + @echo + @echo "Build finished. The HTML pages are in $(BUILDDIR)/html." + +.PHONY: dirhtml +dirhtml: + $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml + @echo + @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml." + +.PHONY: singlehtml +singlehtml: + $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml + @echo + @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml." + +.PHONY: pickle +pickle: + $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle + @echo + @echo "Build finished; now you can process the pickle files." + +.PHONY: json +json: + $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json + @echo + @echo "Build finished; now you can process the JSON files." + +.PHONY: htmlhelp +htmlhelp: + $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp + @echo + @echo "Build finished; now you can run HTML Help Workshop with the" \ + ".hhp project file in $(BUILDDIR)/htmlhelp." + +.PHONY: qthelp +qthelp: + $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp + @echo + @echo "Build finished; now you can run "qcollectiongenerator" with the" \ + ".qhcp project file in $(BUILDDIR)/qthelp, like this:" + @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/xblocks-contrib.qhcp" + @echo "To view the help file:" + @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/xblocks-contrib.qhc" + +.PHONY: applehelp +applehelp: + $(SPHINXBUILD) -b applehelp $(ALLSPHINXOPTS) $(BUILDDIR)/applehelp + @echo + @echo "Build finished. The help book is in $(BUILDDIR)/applehelp." + @echo "N.B. You won't be able to view it unless you put it in" \ + "~/Library/Documentation/Help or install it in your application" \ + "bundle." + +.PHONY: devhelp +devhelp: + $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp + @echo + @echo "Build finished." + @echo "To view the help file:" + @echo "# mkdir -p $$HOME/.local/share/devhelp/xblocks-contrib" + @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/xblocks-contrib" + @echo "# devhelp" + +.PHONY: epub +epub: + $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub + @echo + @echo "Build finished. The epub file is in $(BUILDDIR)/epub." + +.PHONY: epub3 +epub3: + $(SPHINXBUILD) -b epub3 $(ALLSPHINXOPTS) $(BUILDDIR)/epub3 + @echo + @echo "Build finished. The epub3 file is in $(BUILDDIR)/epub3." + +.PHONY: latex +latex: + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex + @echo + @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex." + @echo "Run \`make' in that directory to run these through (pdf)latex" \ + "(use \`make latexpdf' here to do that automatically)." + +.PHONY: latexpdf +latexpdf: + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex + @echo "Running LaTeX files through pdflatex..." + $(MAKE) -C $(BUILDDIR)/latex all-pdf + @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." + +.PHONY: latexpdfja +latexpdfja: + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex + @echo "Running LaTeX files through platex and dvipdfmx..." + $(MAKE) -C $(BUILDDIR)/latex all-pdf-ja + @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." + +.PHONY: text +text: + $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text + @echo + @echo "Build finished. The text files are in $(BUILDDIR)/text." + +.PHONY: man +man: + $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man + @echo + @echo "Build finished. The manual pages are in $(BUILDDIR)/man." + +.PHONY: texinfo +texinfo: + $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo + @echo + @echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo." + @echo "Run \`make' in that directory to run these through makeinfo" \ + "(use \`make info' here to do that automatically)." + +.PHONY: info +info: + $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo + @echo "Running Texinfo files through makeinfo..." + make -C $(BUILDDIR)/texinfo info + @echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo." + +.PHONY: gettext +gettext: + $(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale + @echo + @echo "Build finished. The message catalogs are in $(BUILDDIR)/locale." + +.PHONY: changes +changes: + $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes + @echo + @echo "The overview file is in $(BUILDDIR)/changes." + +.PHONY: linkcheck +linkcheck: + $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck + @echo + @echo "Link check complete; look for any errors in the above output " \ + "or in $(BUILDDIR)/linkcheck/output.txt." + +.PHONY: doctest +doctest: + $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest + @echo "Testing of doctests in the sources finished, look at the " \ + "results in $(BUILDDIR)/doctest/output.txt." + +.PHONY: coverage +coverage: + $(SPHINXBUILD) -b coverage $(ALLSPHINXOPTS) $(BUILDDIR)/coverage + @echo "Testing of coverage in the sources finished, look at the " \ + "results in $(BUILDDIR)/coverage/python.txt." + +.PHONY: xml +xml: + $(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml + @echo + @echo "Build finished. The XML files are in $(BUILDDIR)/xml." + +.PHONY: pseudoxml +pseudoxml: + $(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml + @echo + @echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml." + +.PHONY: dummy +dummy: + $(SPHINXBUILD) -b dummy $(ALLSPHINXOPTS) $(BUILDDIR)/dummy + @echo + @echo "Build finished. Dummy builder generates no files." diff --git a/docs/_static/theme_overrides.css b/docs/_static/theme_overrides.css new file mode 100644 index 0000000..aad8245 --- /dev/null +++ b/docs/_static/theme_overrides.css @@ -0,0 +1,10 @@ +/* override table width restrictions */ +.wy-table-responsive table td, .wy-table-responsive table th { + /* !important prevents the common CSS stylesheets from + overriding this as on RTD they are loaded after this stylesheet */ + white-space: normal !important; +} + +.wy-table-responsive { + overflow: visible !important; +} diff --git a/docs/changelog.rst b/docs/changelog.rst new file mode 100644 index 0000000..565b052 --- /dev/null +++ b/docs/changelog.rst @@ -0,0 +1 @@ +.. include:: ../CHANGELOG.rst diff --git a/docs/concepts/index.rst b/docs/concepts/index.rst new file mode 100644 index 0000000..8a2b4bd --- /dev/null +++ b/docs/concepts/index.rst @@ -0,0 +1,2 @@ +Concepts +######## diff --git a/docs/conf.py b/docs/conf.py new file mode 100644 index 0000000..c6b5484 --- /dev/null +++ b/docs/conf.py @@ -0,0 +1,546 @@ +# pylint: disable=invalid-name +""" +xblocks-contrib documentation build configuration file. + +This file is execfile()d with the current directory set to its +containing dir. + +Note that not all possible configuration values are present in this +autogenerated file. + +All configuration values have a default; values that are commented out +serve to show the default. +""" +import os +import re +import sys +from datetime import datetime +from subprocess import check_call + + +def get_version(*file_paths): + """ + Extract the version string from the file. + + Input: + - file_paths: relative path fragments to file with + version string + """ + filename = os.path.join(os.path.dirname(__file__), *file_paths) + version_file = open(filename, encoding="utf8").read() + version_match = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]", version_file, re.M) + if version_match: + return version_match.group(1) + raise RuntimeError("Unable to find version string.") + + +REPO_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) +sys.path.append(REPO_ROOT) + +VERSION = get_version("../xblocks_contrib", "__init__.py") + +# If extensions (or modules to document with autodoc) are in another directory, +# add these directories to sys.path here. If the directory is relative to the +# documentation root, use os.path.abspath to make it absolute, like shown here. +# +# import os +# import sys +# sys.path.insert(0, os.path.abspath('.')) + +# -- General configuration ------------------------------------------------ + +# If your documentation needs a minimal Sphinx version, state it here. +# +# needs_sphinx = '1.0' + +# Add any Sphinx extension module names here, as strings. They can be +# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom +# ones. +extensions = [ + "sphinx.ext.autodoc", + "sphinx.ext.doctest", + "sphinx.ext.intersphinx", + "sphinx.ext.ifconfig", + "sphinx.ext.napoleon", +] + +# A list of warning types to suppress arbitrary warning messages. +suppress_warnings = [ + "image.nonlocal_uri", +] + +# Add any paths that contain templates here, relative to this directory. +templates_path = ["_templates"] + +# The suffix(es) of source filenames. +# You can specify multiple suffix as a list of string: +# +# source_suffix = ['.rst', '.md'] +source_suffix = ".rst" + +# The encoding of source files. +# +# source_encoding = 'utf-8-sig' + +# The top level toctree document. +top_level_doc = "index" + +# General information about the project. +project = "xblocks-contrib" +copyright = f"{datetime.now().year}, Axim Collaborative, Inc." # pylint: disable=redefined-builtin +author = "Axim Collaborative, Inc." +project_title = "xblocks-contrib" +documentation_title = f"{project_title}" + +# Set display_github to False if you don't want "edit on Github" button +html_context = { + "display_github": True, # Integrate GitHub + "github_user": "edx", # Username + "github_repo": "xblocks-contrib", # Repo name + "github_version": "main", # Version + "conf_py_path": "/docs/", # Path in the checkout to the docs root +} + +# The version info for the project you're documenting, acts as replacement for +# |version| and |release|, also used in various other places throughout the +# built documents. +# +# The short X.Y version. +version = VERSION +# The full version, including alpha/beta/rc tags. +release = VERSION + +# The language for content autogenerated by Sphinx. Refer to documentation +# for a list of supported languages. +# +# This is also used if you do content translation via gettext catalogs. +# Usually you set "language" from the command line for these cases. +language = "en" + +# There are two options for replacing |today|: either, you set today to some +# non-false value, then it is used: +# +# today = '' +# +# Else, today_fmt is used as the format for a strftime call. +# +# today_fmt = '%B %d, %Y' + +# List of patterns, relative to source directory, that match files and +# directories to ignore when looking for source files. +# This patterns also effect to html_static_path and html_extra_path +exclude_patterns = [ + "_build", + "Thumbs.db", + ".DS_Store", + # This file is intended as a guide for developers browsing the source tree, + # not to be rendered into the output docs. + "decisions/README.rst", +] + +# The reST default role (used for this markup: `text`) to use for all +# documents. +# +# default_role = None + +# If true, '()' will be appended to :func: etc. cross-reference text. +# +# add_function_parentheses = True + +# If true, the current module name will be prepended to all description +# unit titles (such as .. function::). +# +# add_module_names = True + +# If true, sectionauthor and moduleauthor directives will be shown in the +# output. They are ignored by default. +# +# show_authors = False + +# The name of the Pygments (syntax highlighting) style to use. +pygments_style = "sphinx" + +# A list of ignored prefixes for module index sorting. +# modindex_common_prefix = [] + +# If true, keep warnings as "system message" paragraphs in the built documents. +# keep_warnings = False + +# If true, `todo` and `todoList` produce output, else they produce nothing. +todo_include_todos = False + +# -- Options for HTML output ---------------------------------------------- + +# The theme to use for HTML and HTML Help pages. See the documentation for +# a list of builtin themes. + +html_theme = "sphinx_book_theme" + +# Theme options are theme-specific and customize the look and feel of a theme +# further. For a list of options available for each theme, see the +# documentation. +# +html_theme_options = { + "repository_url": "https://github.com/openedx/xblocks-contrib", + "repository_branch": "main", + "path_to_docs": "docs/", + "home_page_in_toc": True, + "use_repository_button": True, + "use_issues_button": True, + "use_edit_page_button": True, + # Please don't change unless you know what you're doing. + "extra_footer": """ + + Creative Commons License + +
+ These works by + Axim Collaborative, Inc + are licensed under a + Creative Commons Attribution-ShareAlike 4.0 International License. + """, +} + +# Add any paths that contain custom themes here, relative to this directory. +# html_theme_path = [] + +# The name for this set of Sphinx documents. +# " v documentation" by default. +# +# html_title = 'xblocks-contrib v0.1.0' + +# A shorter title for the navigation bar. Default is the same as html_title. +# +# html_short_title = None + +# The name of an image file (relative to this directory) to place at the top +# of the sidebar. +# +html_logo = "https://logos.openedx.org/open-edx-logo-color.png" + +# The name of an image file (relative to this directory) to use as a favicon +# of the docs. This file should be a Windows icon file (.ico) being 16x16 +# or 32x32 +# pixels large. +# +html_favicon = "https://logos.openedx.org/open-edx-favicon.ico" + +# Add any paths that contain custom static files (such as style sheets) here, +# relative to this directory. They are copied after the builtin static files, +# so a file named "default.css" will overwrite the builtin "default.css". +html_static_path = ["_static"] + +# Add any extra paths that contain custom files (such as robots.txt or +# .htaccess) here, relative to this directory. These files are copied +# directly to the root of the documentation. +# +# html_extra_path = [] + +# If not None, a 'Last updated on:' timestamp is inserted at every page +# bottom, using the given strftime format. +# The empty string is equivalent to '%b %d, %Y'. +# +# html_last_updated_fmt = None + +# If true, SmartyPants will be used to convert quotes and dashes to +# typographically correct entities. +# +# html_use_smartypants = True + +# Custom sidebar templates, maps document names to template names. +# +# html_sidebars = {} + +# Additional templates that should be rendered to pages, maps page names to +# template names. +# +# html_additional_pages = {} + +# If false, no module index is generated. +# +# html_domain_indices = True + +# If false, no index is generated. +# +# html_use_index = True + +# If true, the index is split into individual pages for each letter. +# +# html_split_index = False + +# If true, links to the reST sources are added to the pages. +# +# html_show_sourcelink = True + +# If true, "Created using Sphinx" is shown in the HTML footer. Default is True. +# +# html_show_sphinx = True + +# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. +# +# html_show_copyright = True + +# If true, an OpenSearch description file will be output, and all pages will +# contain a tag referring to it. The value of this option must be the +# base URL from which the finished HTML is served. +# +# html_use_opensearch = '' + +# This is the file name suffix for HTML files (e.g. ".xhtml"). +# html_file_suffix = None + +# Language to be used for generating the HTML full-text search index. +# Sphinx supports the following languages: +# 'da', 'de', 'en', 'es', 'fi', 'fr', 'h', 'it', 'ja' +# 'nl', 'no', 'pt', 'ro', 'r', 'sv', 'tr', 'zh' +# +# html_search_language = 'en' + +# A dictionary with options for the search language support, empty by default. +# 'ja' uses this config value. +# 'zh' user can custom change `jieba` dictionary path. +# +# html_search_options = {'type': 'default'} + +# The name of a javascript file (relative to the configuration directory) that +# implements a search results scorer. If empty, the default will be used. +# +# html_search_scorer = 'scorer.js' + +# Output file base name for HTML help builder. +htmlhelp_basename = f"{project}doc" + +# -- Options for LaTeX output --------------------------------------------- + +latex_elements = { + # The paper size ('letterpaper' or 'a4paper'). + # + # 'papersize': 'letterpaper', + # The font size ('10pt', '11pt' or '12pt'). + # + # 'pointsize': '10pt', + # Additional stuff for the LaTeX preamble. + # + # 'preamble': '', + # Latex figure (float) alignment + # + # 'figure_align': 'htbp', +} + +# Grouping the document tree into LaTeX files. List of tuples +# (source start file, target name, title, +# author, documentclass [howto, manual, or own class]). +latex_target = f"{project}.tex" +latex_documents = [ + (top_level_doc, latex_target, documentation_title, author, "manual"), +] + +# The name of an image file (relative to this directory) to place at the top of +# the title page. +# +# latex_logo = None + +# For "manual" documents, if this is true, then toplevel headings are parts, +# not chapters. +# +# latex_use_parts = False + +# If true, show page references after internal links. +# +# latex_show_pagerefs = False + +# If true, show URL addresses after external links. +# +# latex_show_urls = False + +# Documents to append as an appendix to all manuals. +# +# latex_appendices = [] + +# It false, will not define \strong, \code, itleref, \crossref ... but only +# \sphinxstrong, ..., \sphinxtitleref, ... To help avoid clash with user added +# packages. +# +# latex_keep_old_macro_names = True + +# If false, no module index is generated. +# +# latex_domain_indices = True + + +# -- Options for manual page output --------------------------------------- + +# One entry per manual page. List of tuples +# (source start file, name, description, authors, manual section). +man_pages = [(top_level_doc, project_title, documentation_title, [author], 1)] + +# If true, show URL addresses after external links. +# +# man_show_urls = False + + +# -- Options for Texinfo output ------------------------------------------- + +# Grouping the document tree into Texinfo files. List of tuples +# (source start file, target name, title, author, +# dir menu entry, description, category) +texinfo_documents = [ + ( + top_level_doc, + project_title, + documentation_title, + author, + project_title, + "core xblocks", + "Miscellaneous", + ), +] + +# Documents to append as an appendix to all manuals. +# +# texinfo_appendices = [] + +# If false, no module index is generated. +# +# texinfo_domain_indices = True + +# How to display URL addresses: 'footnote', 'no', or 'inline'. +# +# texinfo_show_urls = 'footnote' + +# If true, do not generate a @detailmenu in the "Top" node's menu. +# +# texinfo_no_detailmenu = False + + +# -- Options for Epub output ---------------------------------------------- + +# Bibliographic Dublin Core info. +epub_title = project +epub_author = author +epub_publisher = author +epub_copyright = copyright + +# The basename for the epub file. It defaults to the project name. +# epub_basename = project + +# The HTML theme for the epub output. Since the default themes are not +# optimized for small screen space, using the same theme for HTML and epub +# output is usually not wise. This defaults to 'epub', a theme designed to save +# visual space. +# +# epub_theme = 'epub' + +# The language of the text. It defaults to the language option +# or 'en' if the language is not set. +# +# epub_language = '' + +# The scheme of the identifier. Typical schemes are ISBN or URL. +# epub_scheme = '' + +# The unique identifier of the text. This can be a ISBN number +# or the project homepage. +# +# epub_identifier = '' + +# A unique identification for the text. +# +# epub_uid = '' + +# A tuple containing the cover image and cover page html template filenames. +# +# epub_cover = () + +# A sequence of (type, uri, title) tuples for the guide element of content.opf. +# +# epub_guide = () + +# HTML files that should be inserted before the pages created by sphinx. +# The format is a list of tuples containing the path and title. +# +# epub_pre_files = [] + +# HTML files that should be inserted after the pages created by sphinx. +# The format is a list of tuples containing the path and title. +# +# epub_post_files = [] + +# A list of files that should not be packed into the epub file. +epub_exclude_files = ["search.html"] + +# The depth of the table of contents in toc.ncx. +# +# epub_tocdepth = 3 + +# Allow duplicate toc entries. +# +# epub_tocdup = True + +# Choose between 'default' and 'includehidden'. +# +# epub_tocscope = 'default' + +# Fix unsupported image types using the Pillow. +# +# epub_fix_images = False + +# Scale large images. +# +# epub_max_image_width = 0 + +# How to display URL addresses: 'footnote', 'no', or 'inline'. +# +# epub_show_urls = 'inline' + +# If false, no index is generated. +# +# epub_use_index = True + + +# Example configuration for intersphinx: refer to the Python standard library. +intersphinx_mapping = { + "python": ("https://docs.python.org/3.11", None), +} + + +def on_init(app): # pylint: disable=unused-argument + """ + Run sphinx-apidoc after Sphinx initialization. + + Read the Docs won't run tox or custom shell commands, so we need this to + avoid checking in the generated reStructuredText files. + """ + docs_path = os.path.abspath(os.path.dirname(__file__)) + root_path = os.path.abspath(os.path.join(docs_path, "..")) + apidoc_path = "sphinx-apidoc" + if hasattr(sys, "real_prefix"): # Check to see if we are in a virtualenv + # If we are, assemble the path manually + bin_path = os.path.abspath(os.path.join(sys.prefix, "bin")) + apidoc_path = os.path.join(bin_path, apidoc_path) + check_call( + [ + apidoc_path, + "-o", + docs_path, + os.path.join(root_path, "xblocks_contrib"), + os.path.join(root_path, "xblocks_contrib/migrations"), + ] + ) + + +def setup(app): + """Sphinx extension: run sphinx-apidoc.""" + event = "builder-inited" + app.connect(event, on_init) diff --git a/docs/decisions.rst b/docs/decisions.rst new file mode 100644 index 0000000..a21903c --- /dev/null +++ b/docs/decisions.rst @@ -0,0 +1,12 @@ +Decisions +######### + +The following `ADRs` are a record of all decisions made as a part of developing this library. + +.. _ADRs: https://open-edx-proposals.readthedocs.io/en/latest/oep-0019-bp-developer-documentation.html#adrs + +.. toctree:: + :maxdepth: 1 + :glob: + + decisions/* diff --git a/docs/decisions/0001-purpose-of-this-repo.rst b/docs/decisions/0001-purpose-of-this-repo.rst new file mode 100644 index 0000000..d67cb89 --- /dev/null +++ b/docs/decisions/0001-purpose-of-this-repo.rst @@ -0,0 +1,57 @@ +0001 Purpose of This Repo +######################### + +Status +****** + +**Draft** + +.. TODO: When ready, update the status from Draft to Provisional or Accepted. + +.. Standard statuses + - **Draft** if the decision is newly proposed and in active discussion + - **Provisional** if the decision is still preliminary and in experimental phase + - **Accepted** *(date)* once it is agreed upon + - **Superseded** *(date)* with a reference to its replacement if a later ADR changes or reverses the decision + + If an ADR has Draft status and the PR is under review, you can either use the intended final status (e.g. Provisional, Accepted, etc.), or you can clarify both the current and intended status using something like the following: "Draft (=> Provisional)". Either of these options is especially useful if the merged status is not intended to be Accepted. + +Context +******* + +TODO: Add context of what led to the creation of this repo. + +.. This section describes the forces at play, including technological, political, social, and project local. These forces are probably in tension, and should be called out as such. The language in this section is value-neutral. It is simply describing facts. + +Decision +******** + +We will create a repository... + +TODO: Clearly state how the context above led to the creation of this repo. + +.. This section describes our response to these forces. It is stated in full sentences, with active voice. "We will …" + +Consequences +************ + +TODO: Add what other things will change as a result of creating this repo. + +.. This section describes the resulting context, after applying the decision. All consequences should be listed here, not just the "positive" ones. A particular decision may have positive, negative, and neutral consequences, but all of them affect the team and project in the future. + +Rejected Alternatives +********************* + +TODO: If applicable, list viable alternatives to creating this new repo and give reasons for why they were rejected. If not applicable, remove section. + +.. This section lists alternate options considered, described briefly, with pros and cons. + +References +********** + +TODO: If applicable, add any references. If not applicable, remove section. + +.. (Optional) List any additional references here that would be useful to the future reader. See `Documenting Architecture Decisions`_ and `OEP-19 on ADRs`_ for further input. + +.. _Documenting Architecture Decisions: https://cognitect.com/blog/2011/11/15/documenting-architecture-decisions +.. _OEP-19 on ADRs: https://open-edx-proposals.readthedocs.io/en/latest/best-practices/oep-0019-bp-developer-documentation.html#adrs diff --git a/docs/decisions/README.rst b/docs/decisions/README.rst new file mode 100644 index 0000000..612ad3b --- /dev/null +++ b/docs/decisions/README.rst @@ -0,0 +1,8 @@ +This directory is a historical record on the architectural decisions we make with this repository as it evolves over time. + +It uses Architecture Decision Records, as described by Michael Nygard in `Documenting Architecture Decisions`_. + +For more information, see `OEP-19's section on ADRs`_. + +.. _Documenting Architecture Decisions: https://cognitect.com/blog/2011/11/15/documenting-architecture-decisions +.. _OEP-19's section on ADRs: https://open-edx-proposals.readthedocs.io/en/latest/best-practices/oep-0019-bp-developer-documentation.html#adrs diff --git a/docs/getting_started.rst b/docs/getting_started.rst new file mode 100644 index 0000000..cec5418 --- /dev/null +++ b/docs/getting_started.rst @@ -0,0 +1,18 @@ +Getting Started +############### + +If you have not already done so, create/activate a `virtualenv`_. Unless otherwise stated, assume all terminal code +below is executed within the virtualenv. + +.. _virtualenv: https://virtualenvwrapper.readthedocs.org/en/latest/ + + +Install dependencies +******************** +Dependencies can be installed via the command below. + +.. code-block:: bash + + $ make requirements + + diff --git a/docs/how-tos/index.rst b/docs/how-tos/index.rst new file mode 100644 index 0000000..5147f80 --- /dev/null +++ b/docs/how-tos/index.rst @@ -0,0 +1,2 @@ +How-tos +####### diff --git a/docs/index.rst b/docs/index.rst new file mode 100644 index 0000000..c1a0c30 --- /dev/null +++ b/docs/index.rst @@ -0,0 +1,34 @@ +.. xblocks-contrib documentation top level file, created by + sphinx-quickstart on Thu Jul 04 13:23:33 2024. + You can adapt this file completely to your liking, but it should at least + contain the root `toctree` directive. + +xblocks-contrib +=============== + +core xblocks + +Contents: + +.. toctree:: + :maxdepth: 2 + + readme + getting_started + quickstarts/index + concepts/index + how-tos/index + testing + internationalization + modules + changelog + decisions + references/index + + +Indices and tables +################## + +* :ref:`genindex` +* :ref:`modindex` +* :ref:`search` diff --git a/docs/internationalization.rst b/docs/internationalization.rst new file mode 100644 index 0000000..9b25877 --- /dev/null +++ b/docs/internationalization.rst @@ -0,0 +1,51 @@ +.. _chapter-i18n: + +Internationalization +#################### +All user-facing text content should be marked for translation. Even if this application is only run in English, our +open source users may choose to use another language. Marking content for translation ensures our users have +this choice. + +Follow the `internationalization coding guidelines`_ in the edX Developer's Guide when developing new features. + +.. _internationalization coding guidelines: https://edx.readthedocs.org/projects/edx-developer-guide/en/latest/internationalization/i18n.html + +Updating Translations +********************* +This project uses `Transifex`_ to translate content. After new features are developed the translation source files +should be pushed to Transifex. Our translation community will translate the content, after which we can retrieve the +translations. + +.. _Transifex: https://www.transifex.com/ + +Pushing source translation files to Transifex requires access to the edx-platform. Request access from the Open Source +Team if you will be pushing translation files. You should also `configure the Transifex client`_ if you have not done so +already. + +.. _configure the Transifex client: https://docs.transifex.com/client/config/ + +The `make` targets listed below can be used to push or pull translations. + +.. list-table:: + :widths: 25 75 + :header-rows: 1 + + * - Target + - Description + * - pull_translations + - Pull translations from Transifex + * - push_translations + - Push source translation files to Transifex + +Fake Translations +***************** +As you develop features it may be helpful to know which strings have been marked for translation, and which are not. +Use the `fake_translations` make target for this purpose. This target will extract all strings marked for translation, +generate fake translations in the Esperanto (eo) language directory, and compile the translations. + +You can trigger the display of the translations by setting your browser's language to Esperanto (eo), and navigating to +a page on the site. Instead of plain English strings, you should see specially-accented English strings that look +like this: + + Thé Fütüré øf Ønlïné Édüçätïøn Ⱡσяєм ι# Før änýøné, änýwhéré, änýtïmé Ⱡσяєм # + diff --git a/docs/make.bat b/docs/make.bat new file mode 100644 index 0000000..efd211c --- /dev/null +++ b/docs/make.bat @@ -0,0 +1,281 @@ +@ECHO OFF + +REM Command file for Sphinx documentation + +if "%SPHINXBUILD%" == "" ( + set SPHINXBUILD=sphinx-build +) +set BUILDDIR=_build +set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% . +set I18NSPHINXOPTS=%SPHINXOPTS% . +if NOT "%PAPER%" == "" ( + set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS% + set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS% +) + +if "%1" == "" goto help + +if "%1" == "help" ( + :help + echo.Please use `make ^` where ^ is one of + echo. html to make standalone HTML files + echo. dirhtml to make HTML files named index.html in directories + echo. singlehtml to make a single large HTML file + echo. pickle to make pickle files + echo. json to make JSON files + echo. htmlhelp to make HTML files and a HTML help project + echo. qthelp to make HTML files and a qthelp project + echo. devhelp to make HTML files and a Devhelp project + echo. epub to make an epub + echo. epub3 to make an epub3 + echo. latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter + echo. text to make text files + echo. man to make manual pages + echo. texinfo to make Texinfo files + echo. gettext to make PO message catalogs + echo. changes to make an overview over all changed/added/deprecated items + echo. xml to make Docutils-native XML files + echo. pseudoxml to make pseudoxml-XML files for display purposes + echo. linkcheck to check all external links for integrity + echo. doctest to run all doctests embedded in the documentation if enabled + echo. coverage to run coverage check of the documentation if enabled + echo. dummy to check syntax errors of document sources + goto end +) + +if "%1" == "clean" ( + for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i + del /q /s %BUILDDIR%\* + goto end +) + + +REM Check if sphinx-build is available and fallback to Python version if any +%SPHINXBUILD% 1>NUL 2>NUL +if errorlevel 9009 goto sphinx_python +goto sphinx_ok + +:sphinx_python + +set SPHINXBUILD=python -m sphinx.__init__ +%SPHINXBUILD% 2> nul +if errorlevel 9009 ( + echo. + echo.The 'sphinx-build' command was not found. Make sure you have Sphinx + echo.installed, then set the SPHINXBUILD environment variable to point + echo.to the full path of the 'sphinx-build' executable. Alternatively you + echo.may add the Sphinx directory to PATH. + echo. + echo.If you don't have Sphinx installed, grab it from + echo.https://sphinx-doc.org/ + exit /b 1 +) + +:sphinx_ok + + +if "%1" == "html" ( + %SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html + if errorlevel 1 exit /b 1 + echo. + echo.Build finished. The HTML pages are in %BUILDDIR%/html. + goto end +) + +if "%1" == "dirhtml" ( + %SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml + if errorlevel 1 exit /b 1 + echo. + echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml. + goto end +) + +if "%1" == "singlehtml" ( + %SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml + if errorlevel 1 exit /b 1 + echo. + echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml. + goto end +) + +if "%1" == "pickle" ( + %SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle + if errorlevel 1 exit /b 1 + echo. + echo.Build finished; now you can process the pickle files. + goto end +) + +if "%1" == "json" ( + %SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json + if errorlevel 1 exit /b 1 + echo. + echo.Build finished; now you can process the JSON files. + goto end +) + +if "%1" == "htmlhelp" ( + %SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp + if errorlevel 1 exit /b 1 + echo. + echo.Build finished; now you can run HTML Help Workshop with the ^ +.hhp project file in %BUILDDIR%/htmlhelp. + goto end +) + +if "%1" == "qthelp" ( + %SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp + if errorlevel 1 exit /b 1 + echo. + echo.Build finished; now you can run "qcollectiongenerator" with the ^ +.qhcp project file in %BUILDDIR%/qthelp, like this: + echo.^> qcollectiongenerator %BUILDDIR%\qthelp\xblocks-contrib.qhcp + echo.To view the help file: + echo.^> assistant -collectionFile %BUILDDIR%\qthelp\xblocks-contrib.ghc + goto end +) + +if "%1" == "devhelp" ( + %SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp + if errorlevel 1 exit /b 1 + echo. + echo.Build finished. + goto end +) + +if "%1" == "epub" ( + %SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub + if errorlevel 1 exit /b 1 + echo. + echo.Build finished. The epub file is in %BUILDDIR%/epub. + goto end +) + +if "%1" == "epub3" ( + %SPHINXBUILD% -b epub3 %ALLSPHINXOPTS% %BUILDDIR%/epub3 + if errorlevel 1 exit /b 1 + echo. + echo.Build finished. The epub3 file is in %BUILDDIR%/epub3. + goto end +) + +if "%1" == "latex" ( + %SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex + if errorlevel 1 exit /b 1 + echo. + echo.Build finished; the LaTeX files are in %BUILDDIR%/latex. + goto end +) + +if "%1" == "latexpdf" ( + %SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex + cd %BUILDDIR%/latex + make all-pdf + cd %~dp0 + echo. + echo.Build finished; the PDF files are in %BUILDDIR%/latex. + goto end +) + +if "%1" == "latexpdfja" ( + %SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex + cd %BUILDDIR%/latex + make all-pdf-ja + cd %~dp0 + echo. + echo.Build finished; the PDF files are in %BUILDDIR%/latex. + goto end +) + +if "%1" == "text" ( + %SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text + if errorlevel 1 exit /b 1 + echo. + echo.Build finished. The text files are in %BUILDDIR%/text. + goto end +) + +if "%1" == "man" ( + %SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man + if errorlevel 1 exit /b 1 + echo. + echo.Build finished. The manual pages are in %BUILDDIR%/man. + goto end +) + +if "%1" == "texinfo" ( + %SPHINXBUILD% -b texinfo %ALLSPHINXOPTS% %BUILDDIR%/texinfo + if errorlevel 1 exit /b 1 + echo. + echo.Build finished. The Texinfo files are in %BUILDDIR%/texinfo. + goto end +) + +if "%1" == "gettext" ( + %SPHINXBUILD% -b gettext %I18NSPHINXOPTS% %BUILDDIR%/locale + if errorlevel 1 exit /b 1 + echo. + echo.Build finished. The message catalogs are in %BUILDDIR%/locale. + goto end +) + +if "%1" == "changes" ( + %SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes + if errorlevel 1 exit /b 1 + echo. + echo.The overview file is in %BUILDDIR%/changes. + goto end +) + +if "%1" == "linkcheck" ( + %SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck + if errorlevel 1 exit /b 1 + echo. + echo.Link check complete; look for any errors in the above output ^ +or in %BUILDDIR%/linkcheck/output.txt. + goto end +) + +if "%1" == "doctest" ( + %SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest + if errorlevel 1 exit /b 1 + echo. + echo.Testing of doctests in the sources finished, look at the ^ +results in %BUILDDIR%/doctest/output.txt. + goto end +) + +if "%1" == "coverage" ( + %SPHINXBUILD% -b coverage %ALLSPHINXOPTS% %BUILDDIR%/coverage + if errorlevel 1 exit /b 1 + echo. + echo.Testing of coverage in the sources finished, look at the ^ +results in %BUILDDIR%/coverage/python.txt. + goto end +) + +if "%1" == "xml" ( + %SPHINXBUILD% -b xml %ALLSPHINXOPTS% %BUILDDIR%/xml + if errorlevel 1 exit /b 1 + echo. + echo.Build finished. The XML files are in %BUILDDIR%/xml. + goto end +) + +if "%1" == "pseudoxml" ( + %SPHINXBUILD% -b pseudoxml %ALLSPHINXOPTS% %BUILDDIR%/pseudoxml + if errorlevel 1 exit /b 1 + echo. + echo.Build finished. The pseudo-XML files are in %BUILDDIR%/pseudoxml. + goto end +) + +if "%1" == "dummy" ( + %SPHINXBUILD% -b dummy %ALLSPHINXOPTS% %BUILDDIR%/dummy + if errorlevel 1 exit /b 1 + echo. + echo.Build finished. Dummy builder generates no files. + goto end +) + +:end diff --git a/docs/quickstarts/index.rst b/docs/quickstarts/index.rst new file mode 100644 index 0000000..e3f408f --- /dev/null +++ b/docs/quickstarts/index.rst @@ -0,0 +1,2 @@ +Quick Start +########### diff --git a/docs/readme.rst b/docs/readme.rst new file mode 100644 index 0000000..72a3355 --- /dev/null +++ b/docs/readme.rst @@ -0,0 +1 @@ +.. include:: ../README.rst diff --git a/docs/references/index.rst b/docs/references/index.rst new file mode 100644 index 0000000..ba5ea57 --- /dev/null +++ b/docs/references/index.rst @@ -0,0 +1,2 @@ +References +########## diff --git a/docs/testing.rst b/docs/testing.rst new file mode 100644 index 0000000..a882d17 --- /dev/null +++ b/docs/testing.rst @@ -0,0 +1,44 @@ +.. _chapter-testing: + +Testing +####### + +xblocks-contrib has an assortment of test cases and code quality +checks to catch potential problems during development. To run them all in the +version of Python you chose for your virtualenv: + +.. code-block:: bash + + $ make validate + +To run just the unit tests: + +.. code-block:: bash + + $ make test + +To run just the unit tests and check diff coverage + +.. code-block:: bash + + $ make diff_cover + +To run just the code quality checks: + +.. code-block:: bash + + $ make quality + +To run the unit tests under every supported Python version and the code +quality checks: + +.. code-block:: bash + + $ make test-all + +To generate and open an HTML report of how much of the code is covered by +test cases: + +.. code-block:: bash + + $ make coverage diff --git a/manage.py b/manage.py new file mode 100755 index 0000000..cf73891 --- /dev/null +++ b/manage.py @@ -0,0 +1,16 @@ +#!/usr/bin/env python +""" +A django manage.py file. + +It eases running django related commands with the correct settings already +imported. +""" +import os +import sys + +from django.core.management import execute_from_command_line + +if __name__ == "__main__": + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "translation_settings") + + execute_from_command_line(sys.argv) diff --git a/pylintrc b/pylintrc new file mode 100644 index 0000000..65adcbc --- /dev/null +++ b/pylintrc @@ -0,0 +1,388 @@ +# *************************** +# ** DO NOT EDIT THIS FILE ** +# *************************** +# +# 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 pylintrc file is simply out-of-date relative to the latest +# pylintrc 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 pylintrc_tweaks file to add changes just to this +# repo's file. +# +# 2. Run: +# +# $ edx_lint write pylintrc +# +# 3. This will modify the local file. Submit a pull request to get it +# checked in so that others will benefit. +# +# +# CENTRAL CHANGE: +# +# 1. Edit the pylintrc file in the edx-lint repo at +# https://github.com/openedx/edx-lint/blob/master/edx_lint/files/pylintrc +# +# 2. install the updated version of edx-lint (in edx-lint): +# +# $ pip install . +# +# 3. Run (in edx-lint): +# +# $ edx_lint write pylintrc +# +# 4. Make a new version of edx_lint, submit and review a pull request with the +# pylintrc 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: +# +# $ edx_lint write pylintrc +# +# 7. This will modify the local file. Submit a pull request to get it +# checked in so that others will benefit. +# +# +# +# +# +# STAY AWAY FROM THIS FILE! +# +# +# +# +# +# SERIOUSLY. +# +# ------------------------------ +# Generated by edx-lint version: 5.3.6 +# ------------------------------ +[MASTER] +ignore = migrations +persistent = yes +load-plugins = edx_lint.pylint,pylint_celery + +[MESSAGES CONTROL] +enable = + blacklisted-name, + line-too-long, + + abstract-class-instantiated, + abstract-method, + access-member-before-definition, + anomalous-backslash-in-string, + anomalous-unicode-escape-in-string, + arguments-differ, + assert-on-tuple, + assigning-non-slot, + assignment-from-no-return, + assignment-from-none, + attribute-defined-outside-init, + bad-except-order, + bad-format-character, + bad-format-string-key, + bad-format-string, + bad-open-mode, + bad-reversed-sequence, + bad-staticmethod-argument, + bad-str-strip-call, + bad-super-call, + binary-op-exception, + boolean-datetime, + catching-non-exception, + cell-var-from-loop, + confusing-with-statement, + continue-in-finally, + dangerous-default-value, + duplicate-argument-name, + duplicate-bases, + duplicate-except, + duplicate-key, + expression-not-assigned, + format-combined-specification, + format-needs-mapping, + function-redefined, + global-variable-undefined, + import-error, + import-self, + inconsistent-mro, + inherit-non-class, + init-is-generator, + invalid-all-object, + invalid-format-index, + invalid-length-returned, + invalid-sequence-index, + invalid-slice-index, + invalid-slots-object, + invalid-slots, + invalid-unary-operand-type, + logging-too-few-args, + logging-too-many-args, + logging-unsupported-format, + lost-exception, + method-hidden, + misplaced-bare-raise, + misplaced-future, + missing-format-argument-key, + missing-format-attribute, + missing-format-string-key, + no-member, + no-method-argument, + no-name-in-module, + no-self-argument, + no-value-for-parameter, + non-iterator-returned, + non-parent-method-called, + nonexistent-operator, + not-a-mapping, + not-an-iterable, + not-callable, + not-context-manager, + not-in-loop, + pointless-statement, + pointless-string-statement, + raising-bad-type, + raising-non-exception, + redefined-builtin, + redefined-outer-name, + redundant-keyword-arg, + repeated-keyword, + return-arg-in-generator, + return-in-init, + return-outside-function, + signature-differs, + super-init-not-called, + super-method-not-called, + syntax-error, + test-inherits-tests, + too-few-format-args, + too-many-format-args, + too-many-function-args, + translation-of-non-string, + truncated-format-string, + undefined-all-variable, + undefined-loop-variable, + undefined-variable, + unexpected-keyword-arg, + unexpected-special-method-signature, + unpacking-non-sequence, + unreachable, + unsubscriptable-object, + unsupported-binary-operation, + unsupported-membership-test, + unused-format-string-argument, + unused-format-string-key, + used-before-assignment, + using-constant-test, + yield-outside-function, + + astroid-error, + fatal, + method-check-failed, + parse-error, + raw-checker-failed, + + empty-docstring, + invalid-characters-in-docstring, + missing-docstring, + wrong-spelling-in-comment, + wrong-spelling-in-docstring, + + unused-argument, + unused-import, + unused-variable, + + eval-used, + exec-used, + + bad-classmethod-argument, + bad-mcs-classmethod-argument, + bad-mcs-method-argument, + bare-except, + broad-except, + consider-iterating-dictionary, + consider-using-enumerate, + global-at-module-level, + global-variable-not-assigned, + literal-used-as-attribute, + logging-format-interpolation, + logging-not-lazy, + multiple-imports, + multiple-statements, + no-classmethod-decorator, + no-staticmethod-decorator, + protected-access, + redundant-unittest-assert, + reimported, + simplifiable-if-statement, + simplifiable-range, + singleton-comparison, + superfluous-parens, + unidiomatic-typecheck, + unnecessary-lambda, + unnecessary-pass, + unnecessary-semicolon, + unneeded-not, + useless-else-on-loop, + wrong-assert-type, + + deprecated-method, + deprecated-module, + + too-many-boolean-expressions, + too-many-nested-blocks, + too-many-statements, + + wildcard-import, + wrong-import-order, + wrong-import-position, + + missing-final-newline, + mixed-line-endings, + trailing-newlines, + trailing-whitespace, + unexpected-line-ending-format, + + bad-inline-option, + bad-option-value, + deprecated-pragma, + unrecognized-inline-option, + useless-suppression, +disable = + bad-indentation, + broad-exception-raised, + consider-using-f-string, + duplicate-code, + file-ignored, + fixme, + global-statement, + invalid-name, + locally-disabled, + no-else-return, + suppressed-message, + too-few-public-methods, + too-many-ancestors, + too-many-arguments, + too-many-branches, + too-many-instance-attributes, + too-many-lines, + too-many-locals, + too-many-public-methods, + too-many-return-statements, + ungrouped-imports, + unspecified-encoding, + unused-wildcard-import, + use-maxsplit-arg, + + feature-toggle-needs-doc, + illegal-waffle-usage, + + logging-fstring-interpolation, + consider-using-with, + bad-option-value, + +[REPORTS] +output-format = text +reports = no +score = no + +[BASIC] +module-rgx = (([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$ +const-rgx = (([A-Z_][A-Z0-9_]*)|(__.*__)|log|urlpatterns)$ +class-rgx = [A-Z_][a-zA-Z0-9]+$ +function-rgx = ([a-z_][a-z0-9_]{2,40}|test_[a-z0-9_]+)$ +method-rgx = ([a-z_][a-z0-9_]{2,40}|setUp|set[Uu]pClass|tearDown|tear[Dd]ownClass|assert[A-Z]\w*|maxDiff|test_[a-z0-9_]+)$ +attr-rgx = [a-z_][a-z0-9_]{2,30}$ +argument-rgx = [a-z_][a-z0-9_]{2,30}$ +variable-rgx = [a-z_][a-z0-9_]{2,30}$ +class-attribute-rgx = ([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$ +inlinevar-rgx = [A-Za-z_][A-Za-z0-9_]*$ +good-names = f,i,j,k,db,ex,Run,_,__ +bad-names = foo,bar,baz,toto,tutu,tata +no-docstring-rgx = __.*__$|test_.+|setUp$|setUpClass$|tearDown$|tearDownClass$|Meta$ +docstring-min-length = 5 + +[FORMAT] +max-line-length = 120 +ignore-long-lines = ^\s*(# )?((?)|(\.\. \w+: .*))$ +single-line-if-stmt = no +max-module-lines = 1000 +indent-string = ' ' + +[MISCELLANEOUS] +notes = FIXME,XXX,TODO + +[SIMILARITIES] +min-similarity-lines = 4 +ignore-comments = yes +ignore-docstrings = yes +ignore-imports = no + +[TYPECHECK] +ignore-mixin-members = yes +ignored-classes = SQLObject +unsafe-load-any-extension = yes +generated-members = + REQUEST, + acl_users, + aq_parent, + objects, + DoesNotExist, + can_read, + can_write, + get_url, + size, + content, + status_code, + create, + build, + fields, + tag, + org, + course, + category, + name, + revision, + _meta, + +[VARIABLES] +init-import = no +dummy-variables-rgx = _|dummy|unused|.*_unused +additional-builtins = + +[CLASSES] +defining-attr-methods = __init__,__new__,setUp +valid-classmethod-first-arg = cls +valid-metaclass-classmethod-first-arg = mcs + +[DESIGN] +max-args = 5 +ignored-argument-names = _.* +max-locals = 15 +max-returns = 6 +max-branches = 12 +max-statements = 50 +max-parents = 7 +max-attributes = 7 +min-public-methods = 2 +max-public-methods = 20 + +[IMPORTS] +deprecated-modules = regsub,TERMIOS,Bastion,rexec +import-graph = +ext-import-graph = +int-import-graph = + +[EXCEPTIONS] +overgeneral-exceptions = builtins.Exception + +# 336171d25c66bf0a83e6e9157e7bf581b8b4f59c diff --git a/pylintrc_tweaks b/pylintrc_tweaks new file mode 100644 index 0000000..6b02bbf --- /dev/null +++ b/pylintrc_tweaks @@ -0,0 +1,9 @@ +# pylintrc tweaks for use with edx_lint. +[MASTER] +ignore = migrations +load-plugins = edx_lint.pylint,pylint_celery + +[MESSAGES CONTROL] +disable+ = + consider-using-with, + bad-option-value, diff --git a/requirements/base.in b/requirements/base.in new file mode 100644 index 0000000..1dae69f --- /dev/null +++ b/requirements/base.in @@ -0,0 +1,8 @@ +# Core requirements for using this application +-c constraints.txt + +django-statici18n +edx-i18n-tools +Mako +XBlock +xblock-utils diff --git a/requirements/base.txt b/requirements/base.txt new file mode 100644 index 0000000..01dd480 --- /dev/null +++ b/requirements/base.txt @@ -0,0 +1,104 @@ +# +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: +# +# make upgrade +# +appdirs==1.4.4 + # via fs +asgiref==3.8.1 + # via django +boto3==1.34.139 + # via fs-s3fs +botocore==1.34.139 + # via + # boto3 + # s3transfer +django==4.2.13 + # via + # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt + # django-appconf + # django-statici18n + # edx-i18n-tools + # openedx-django-pyfs +django-appconf==1.0.6 + # via django-statici18n +django-statici18n==2.5.0 + # via -r requirements/base.in +edx-i18n-tools==1.6.0 + # via -r requirements/base.in +fs==2.4.16 + # via + # fs-s3fs + # openedx-django-pyfs + # xblock +fs-s3fs==1.1.1 + # via openedx-django-pyfs +jmespath==1.0.1 + # via + # boto3 + # botocore +lazy==1.6 + # via xblock +lxml[html-clean,html_clean]==5.2.2 + # via + # edx-i18n-tools + # lxml-html-clean + # xblock +lxml-html-clean==0.1.1 + # via lxml +mako==1.3.5 + # via + # -r requirements/base.in + # xblock + # xblock-utils +markupsafe==2.1.5 + # via + # mako + # xblock +openedx-django-pyfs==3.6.0 + # via xblock +path==16.14.0 + # via edx-i18n-tools +polib==1.2.0 + # via edx-i18n-tools +python-dateutil==2.9.0.post0 + # via + # botocore + # xblock +pytz==2024.1 + # via xblock +pyyaml==6.0.1 + # via + # edx-i18n-tools + # xblock +s3transfer==0.10.2 + # via boto3 +simplejson==3.19.2 + # via + # xblock + # xblock-utils +six==1.16.0 + # via + # fs + # fs-s3fs + # python-dateutil +sqlparse==0.5.0 + # via django +urllib3==2.2.2 + # via botocore +web-fragments==2.2.0 + # via + # xblock + # xblock-utils +webob==1.8.7 + # via xblock +xblock[django]==4.0.1 + # via + # -r requirements/base.in + # xblock-utils +xblock-utils==4.0.0 + # via -r requirements/base.in + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/requirements/ci.in b/requirements/ci.in new file mode 100644 index 0000000..3586cbe --- /dev/null +++ b/requirements/ci.in @@ -0,0 +1,5 @@ +# Requirements for running tests in CI + +-c constraints.txt + +tox # Virtualenv management for tests diff --git a/requirements/ci.txt b/requirements/ci.txt new file mode 100644 index 0000000..5aa00d0 --- /dev/null +++ b/requirements/ci.txt @@ -0,0 +1,34 @@ +# +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: +# +# make upgrade +# +cachetools==5.3.3 + # via tox +chardet==5.2.0 + # via tox +colorama==0.4.6 + # via tox +distlib==0.3.8 + # via virtualenv +filelock==3.15.4 + # via + # tox + # virtualenv +packaging==24.1 + # via + # pyproject-api + # tox +platformdirs==4.2.2 + # via + # tox + # virtualenv +pluggy==1.5.0 + # via tox +pyproject-api==1.7.1 + # via tox +tox==4.16.0 + # via -r requirements/ci.in +virtualenv==20.26.3 + # via tox diff --git a/requirements/constraints.txt b/requirements/constraints.txt new file mode 100644 index 0000000..d91704b --- /dev/null +++ b/requirements/constraints.txt @@ -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 https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt diff --git a/requirements/dev.in b/requirements/dev.in new file mode 100644 index 0000000..eb8c92c --- /dev/null +++ b/requirements/dev.in @@ -0,0 +1,9 @@ +# Additional requirements for development of this application +-c constraints.txt + +-r pip-tools.txt # pip-tools and its dependencies, for managing requirements files +-r quality.txt # Core and quality check dependencies +-r ci.txt # dependencies for setting up testing in CI + +diff-cover # Changeset diff test coverage +edx-i18n-tools # For i18n_tool dummy diff --git a/requirements/dev.txt b/requirements/dev.txt new file mode 100644 index 0000000..5ac7d5a --- /dev/null +++ b/requirements/dev.txt @@ -0,0 +1,399 @@ +# +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: +# +# make upgrade +# +appdirs==1.4.4 + # via + # -r requirements/quality.txt + # fs +arrow==1.3.0 + # via + # -r requirements/quality.txt + # cookiecutter +asgiref==3.8.1 + # via + # -r requirements/quality.txt + # django +astroid==3.2.2 + # via + # -r requirements/quality.txt + # pylint + # pylint-celery +binaryornot==0.4.4 + # via + # -r requirements/quality.txt + # cookiecutter +boto3==1.34.139 + # via + # -r requirements/quality.txt + # fs-s3fs +botocore==1.34.139 + # via + # -r requirements/quality.txt + # boto3 + # s3transfer +build==1.2.1 + # via + # -r requirements/pip-tools.txt + # pip-tools +cachetools==5.3.3 + # via + # -r requirements/ci.txt + # tox +certifi==2024.7.4 + # via + # -r requirements/quality.txt + # requests +chardet==5.2.0 + # via + # -r requirements/ci.txt + # -r requirements/quality.txt + # binaryornot + # diff-cover + # tox +charset-normalizer==3.3.2 + # via + # -r requirements/quality.txt + # requests +click==8.1.7 + # via + # -r requirements/pip-tools.txt + # -r requirements/quality.txt + # click-log + # code-annotations + # cookiecutter + # edx-lint + # pip-tools +click-log==0.4.0 + # via + # -r requirements/quality.txt + # edx-lint +code-annotations==1.8.0 + # via + # -r requirements/quality.txt + # edx-lint +colorama==0.4.6 + # via + # -r requirements/ci.txt + # tox +cookiecutter==2.6.0 + # via + # -r requirements/quality.txt + # xblock-sdk +coverage[toml]==7.5.4 + # via + # -r requirements/quality.txt + # pytest-cov +diff-cover==9.1.0 + # via -r requirements/dev.in +dill==0.3.8 + # via + # -r requirements/quality.txt + # pylint +distlib==0.3.8 + # via + # -r requirements/ci.txt + # virtualenv +django==4.2.13 + # via + # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt + # -r requirements/quality.txt + # django-appconf + # django-statici18n + # edx-i18n-tools + # openedx-django-pyfs + # xblock-sdk +django-appconf==1.0.6 + # via + # -r requirements/quality.txt + # django-statici18n +django-statici18n==2.5.0 + # via -r requirements/quality.txt +edx-i18n-tools==1.6.0 + # via + # -r requirements/dev.in + # -r requirements/quality.txt +edx-lint==5.3.6 + # via -r requirements/quality.txt +filelock==3.15.4 + # via + # -r requirements/ci.txt + # tox + # virtualenv +fs==2.4.16 + # via + # -r requirements/quality.txt + # fs-s3fs + # openedx-django-pyfs + # xblock +fs-s3fs==1.1.1 + # via + # -r requirements/quality.txt + # openedx-django-pyfs + # xblock-sdk +idna==3.7 + # via + # -r requirements/quality.txt + # requests +iniconfig==2.0.0 + # via + # -r requirements/quality.txt + # pytest +isort==5.13.2 + # via + # -r requirements/quality.txt + # pylint +jinja2==3.1.4 + # via + # -r requirements/quality.txt + # code-annotations + # cookiecutter + # diff-cover +jmespath==1.0.1 + # via + # -r requirements/quality.txt + # boto3 + # botocore +lazy==1.6 + # via + # -r requirements/quality.txt + # xblock +lxml[html-clean]==5.2.2 + # via + # -r requirements/quality.txt + # edx-i18n-tools + # lxml-html-clean + # xblock + # xblock-sdk +lxml-html-clean==0.1.1 + # via + # -r requirements/quality.txt + # lxml +mako==1.3.5 + # via + # -r requirements/quality.txt + # xblock + # xblock-utils +markdown-it-py==3.0.0 + # via + # -r requirements/quality.txt + # rich +markupsafe==2.1.5 + # via + # -r requirements/quality.txt + # jinja2 + # mako + # xblock +mccabe==0.7.0 + # via + # -r requirements/quality.txt + # pylint +mdurl==0.1.2 + # via + # -r requirements/quality.txt + # markdown-it-py +openedx-django-pyfs==3.6.0 + # via + # -r requirements/quality.txt + # xblock +packaging==24.1 + # via + # -r requirements/ci.txt + # -r requirements/pip-tools.txt + # -r requirements/quality.txt + # build + # pyproject-api + # pytest + # tox +path==16.14.0 + # via + # -r requirements/quality.txt + # edx-i18n-tools +pbr==6.0.0 + # via + # -r requirements/quality.txt + # stevedore +pip-tools==7.4.1 + # via -r requirements/pip-tools.txt +platformdirs==4.2.2 + # via + # -r requirements/ci.txt + # -r requirements/quality.txt + # pylint + # tox + # virtualenv +pluggy==1.5.0 + # via + # -r requirements/ci.txt + # -r requirements/quality.txt + # diff-cover + # pytest + # tox +polib==1.2.0 + # via + # -r requirements/quality.txt + # edx-i18n-tools +pycodestyle==2.12.0 + # via -r requirements/quality.txt +pydocstyle==6.3.0 + # via -r requirements/quality.txt +pygments==2.18.0 + # via + # -r requirements/quality.txt + # diff-cover + # rich +pylint==3.2.5 + # via + # -r requirements/quality.txt + # edx-lint + # pylint-celery + # pylint-django + # pylint-plugin-utils +pylint-celery==0.3 + # via + # -r requirements/quality.txt + # edx-lint +pylint-django==2.5.5 + # via + # -r requirements/quality.txt + # edx-lint +pylint-plugin-utils==0.8.2 + # via + # -r requirements/quality.txt + # pylint-celery + # pylint-django +pypng==0.20220715.0 + # via + # -r requirements/quality.txt + # xblock-sdk +pyproject-api==1.7.1 + # via + # -r requirements/ci.txt + # tox +pyproject-hooks==1.1.0 + # via + # -r requirements/pip-tools.txt + # build + # pip-tools +pytest==8.2.2 + # via + # -r requirements/quality.txt + # pytest-cov + # pytest-django +pytest-cov==5.0.0 + # via -r requirements/quality.txt +pytest-django==4.8.0 + # via -r requirements/quality.txt +python-dateutil==2.9.0.post0 + # via + # -r requirements/quality.txt + # arrow + # botocore + # xblock +python-slugify==8.0.4 + # via + # -r requirements/quality.txt + # code-annotations + # cookiecutter +pytz==2024.1 + # via + # -r requirements/quality.txt + # xblock +pyyaml==6.0.1 + # via + # -r requirements/quality.txt + # code-annotations + # cookiecutter + # edx-i18n-tools + # xblock +requests==2.32.3 + # via + # -r requirements/quality.txt + # cookiecutter + # xblock-sdk +rich==13.7.1 + # via + # -r requirements/quality.txt + # cookiecutter +s3transfer==0.10.2 + # via + # -r requirements/quality.txt + # boto3 +simplejson==3.19.2 + # via + # -r requirements/quality.txt + # xblock + # xblock-sdk + # xblock-utils +six==1.16.0 + # via + # -r requirements/quality.txt + # edx-lint + # fs + # fs-s3fs + # python-dateutil +snowballstemmer==2.2.0 + # via + # -r requirements/quality.txt + # pydocstyle +sqlparse==0.5.0 + # via + # -r requirements/quality.txt + # django +stevedore==5.2.0 + # via + # -r requirements/quality.txt + # code-annotations +text-unidecode==1.3 + # via + # -r requirements/quality.txt + # python-slugify +tomlkit==0.12.5 + # via + # -r requirements/quality.txt + # pylint +tox==4.16.0 + # via -r requirements/ci.txt +types-python-dateutil==2.9.0.20240316 + # via + # -r requirements/quality.txt + # arrow +urllib3==2.2.2 + # via + # -r requirements/quality.txt + # botocore + # requests +virtualenv==20.26.3 + # via + # -r requirements/ci.txt + # tox +web-fragments==2.2.0 + # via + # -r requirements/quality.txt + # xblock + # xblock-sdk + # xblock-utils +webob==1.8.7 + # via + # -r requirements/quality.txt + # xblock + # xblock-sdk +wheel==0.43.0 + # via + # -r requirements/pip-tools.txt + # pip-tools +xblock[django]==4.0.1 + # via + # -r requirements/quality.txt + # xblock-sdk + # xblock-utils +xblock-sdk==0.11.0 + # via -r requirements/quality.txt +xblock-utils==4.0.0 + # via -r requirements/quality.txt + +# The following packages are considered to be unsafe in a requirements file: +# pip +# setuptools diff --git a/requirements/doc.in b/requirements/doc.in new file mode 100644 index 0000000..e1f1740 --- /dev/null +++ b/requirements/doc.in @@ -0,0 +1,11 @@ +# Requirements for documentation validation + +-c constraints.txt + +-r test.txt # Core and testing dependencies for this package + +doc8 # reStructuredText style checker +sphinx-book-theme # Common theme for all Open edX projects +twine # Validates README.rst for usage on PyPI +build # Needed to build the wheel for twine README check +Sphinx # Documentation builder diff --git a/requirements/doc.txt b/requirements/doc.txt new file mode 100644 index 0000000..cb42bd1 --- /dev/null +++ b/requirements/doc.txt @@ -0,0 +1,372 @@ +# +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: +# +# make upgrade +# +accessible-pygments==0.0.5 + # via pydata-sphinx-theme +alabaster==0.7.16 + # via sphinx +appdirs==1.4.4 + # via + # -r requirements/test.txt + # fs +arrow==1.3.0 + # via + # -r requirements/test.txt + # cookiecutter +asgiref==3.8.1 + # via + # -r requirements/test.txt + # django +babel==2.15.0 + # via + # pydata-sphinx-theme + # sphinx +backports-tarfile==1.2.0 + # via jaraco-context +beautifulsoup4==4.12.3 + # via pydata-sphinx-theme +binaryornot==0.4.4 + # via + # -r requirements/test.txt + # cookiecutter +boto3==1.34.139 + # via + # -r requirements/test.txt + # fs-s3fs +botocore==1.34.139 + # via + # -r requirements/test.txt + # boto3 + # s3transfer +build==1.2.1 + # via -r requirements/doc.in +certifi==2024.7.4 + # via + # -r requirements/test.txt + # requests +chardet==5.2.0 + # via + # -r requirements/test.txt + # binaryornot +charset-normalizer==3.3.2 + # via + # -r requirements/test.txt + # requests +click==8.1.7 + # via + # -r requirements/test.txt + # code-annotations + # cookiecutter +code-annotations==1.8.0 + # via -r requirements/test.txt +cookiecutter==2.6.0 + # via + # -r requirements/test.txt + # xblock-sdk +coverage[toml]==7.5.4 + # via + # -r requirements/test.txt + # pytest-cov +django==4.2.13 + # via + # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt + # -r requirements/test.txt + # django-appconf + # django-statici18n + # edx-i18n-tools + # openedx-django-pyfs + # xblock-sdk +django-appconf==1.0.6 + # via + # -r requirements/test.txt + # django-statici18n +django-statici18n==2.5.0 + # via -r requirements/test.txt +doc8==1.1.1 + # via -r requirements/doc.in +docutils==0.20.1 + # via + # doc8 + # pydata-sphinx-theme + # readme-renderer + # restructuredtext-lint + # sphinx +edx-i18n-tools==1.6.0 + # via -r requirements/test.txt +fs==2.4.16 + # via + # -r requirements/test.txt + # fs-s3fs + # openedx-django-pyfs + # xblock +fs-s3fs==1.1.1 + # via + # -r requirements/test.txt + # openedx-django-pyfs + # xblock-sdk +idna==3.7 + # via + # -r requirements/test.txt + # requests +imagesize==1.4.1 + # via sphinx +importlib-metadata==6.11.0 + # via + # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt + # keyring + # twine +iniconfig==2.0.0 + # via + # -r requirements/test.txt + # pytest +jaraco-classes==3.4.0 + # via keyring +jaraco-context==5.3.0 + # via keyring +jaraco-functools==4.0.1 + # via keyring +jinja2==3.1.4 + # via + # -r requirements/test.txt + # code-annotations + # cookiecutter + # sphinx +jmespath==1.0.1 + # via + # -r requirements/test.txt + # boto3 + # botocore +keyring==25.2.1 + # via twine +lazy==1.6 + # via + # -r requirements/test.txt + # xblock +lxml[html-clean]==5.2.2 + # via + # -r requirements/test.txt + # edx-i18n-tools + # lxml-html-clean + # xblock + # xblock-sdk +lxml-html-clean==0.1.1 + # via + # -r requirements/test.txt + # lxml +mako==1.3.5 + # via + # -r requirements/test.txt + # xblock + # xblock-utils +markdown-it-py==3.0.0 + # via + # -r requirements/test.txt + # rich +markupsafe==2.1.5 + # via + # -r requirements/test.txt + # jinja2 + # mako + # xblock +mdurl==0.1.2 + # via + # -r requirements/test.txt + # markdown-it-py +more-itertools==10.3.0 + # via + # jaraco-classes + # jaraco-functools +nh3==0.2.17 + # via readme-renderer +openedx-django-pyfs==3.6.0 + # via + # -r requirements/test.txt + # xblock +packaging==24.1 + # via + # -r requirements/test.txt + # build + # pydata-sphinx-theme + # pytest + # sphinx +path==16.14.0 + # via + # -r requirements/test.txt + # edx-i18n-tools +pbr==6.0.0 + # via + # -r requirements/test.txt + # stevedore +pkginfo==1.10.0 + # via twine +pluggy==1.5.0 + # via + # -r requirements/test.txt + # pytest +polib==1.2.0 + # via + # -r requirements/test.txt + # edx-i18n-tools +pydata-sphinx-theme==0.15.4 + # via sphinx-book-theme +pygments==2.18.0 + # via + # -r requirements/test.txt + # accessible-pygments + # doc8 + # pydata-sphinx-theme + # readme-renderer + # rich + # sphinx +pypng==0.20220715.0 + # via + # -r requirements/test.txt + # xblock-sdk +pyproject-hooks==1.1.0 + # via build +pytest==8.2.2 + # via + # -r requirements/test.txt + # pytest-cov + # pytest-django +pytest-cov==5.0.0 + # via -r requirements/test.txt +pytest-django==4.8.0 + # via -r requirements/test.txt +python-dateutil==2.9.0.post0 + # via + # -r requirements/test.txt + # arrow + # botocore + # xblock +python-slugify==8.0.4 + # via + # -r requirements/test.txt + # code-annotations + # cookiecutter +pytz==2024.1 + # via + # -r requirements/test.txt + # xblock +pyyaml==6.0.1 + # via + # -r requirements/test.txt + # code-annotations + # cookiecutter + # edx-i18n-tools + # xblock +readme-renderer==43.0 + # via twine +requests==2.32.3 + # via + # -r requirements/test.txt + # cookiecutter + # requests-toolbelt + # sphinx + # twine + # xblock-sdk +requests-toolbelt==1.0.0 + # via twine +restructuredtext-lint==1.4.0 + # via doc8 +rfc3986==2.0.0 + # via twine +rich==13.7.1 + # via + # -r requirements/test.txt + # cookiecutter + # twine +s3transfer==0.10.2 + # via + # -r requirements/test.txt + # boto3 +simplejson==3.19.2 + # via + # -r requirements/test.txt + # xblock + # xblock-sdk + # xblock-utils +six==1.16.0 + # via + # -r requirements/test.txt + # fs + # fs-s3fs + # python-dateutil +snowballstemmer==2.2.0 + # via sphinx +soupsieve==2.5 + # via beautifulsoup4 +sphinx==7.3.7 + # via + # -r requirements/doc.in + # pydata-sphinx-theme + # sphinx-book-theme +sphinx-book-theme==1.1.3 + # via -r requirements/doc.in +sphinxcontrib-applehelp==1.0.8 + # via sphinx +sphinxcontrib-devhelp==1.0.6 + # via sphinx +sphinxcontrib-htmlhelp==2.0.5 + # via sphinx +sphinxcontrib-jsmath==1.0.1 + # via sphinx +sphinxcontrib-qthelp==1.0.7 + # via sphinx +sphinxcontrib-serializinghtml==1.1.10 + # via sphinx +sqlparse==0.5.0 + # via + # -r requirements/test.txt + # django +stevedore==5.2.0 + # via + # -r requirements/test.txt + # code-annotations + # doc8 +text-unidecode==1.3 + # via + # -r requirements/test.txt + # python-slugify +twine==5.1.1 + # via -r requirements/doc.in +types-python-dateutil==2.9.0.20240316 + # via + # -r requirements/test.txt + # arrow +typing-extensions==4.12.2 + # via pydata-sphinx-theme +urllib3==2.2.2 + # via + # -r requirements/test.txt + # botocore + # requests + # twine +web-fragments==2.2.0 + # via + # -r requirements/test.txt + # xblock + # xblock-sdk + # xblock-utils +webob==1.8.7 + # via + # -r requirements/test.txt + # xblock + # xblock-sdk +xblock[django]==4.0.1 + # via + # -r requirements/test.txt + # xblock-sdk + # xblock-utils +xblock-sdk==0.11.0 + # via -r requirements/test.txt +xblock-utils==4.0.0 + # via -r requirements/test.txt +zipp==3.19.2 + # via importlib-metadata + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/requirements/pip-tools.in b/requirements/pip-tools.in new file mode 100644 index 0000000..0295d2c --- /dev/null +++ b/requirements/pip-tools.in @@ -0,0 +1,5 @@ +# Just the dependencies to run pip-tools, mainly for the "upgrade" make target + +-c constraints.txt + +pip-tools # Contains pip-compile, used to generate pip requirements files diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt new file mode 100644 index 0000000..b544e9f --- /dev/null +++ b/requirements/pip-tools.txt @@ -0,0 +1,24 @@ +# +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: +# +# make upgrade +# +build==1.2.1 + # via pip-tools +click==8.1.7 + # via pip-tools +packaging==24.1 + # via build +pip-tools==7.4.1 + # via -r requirements/pip-tools.in +pyproject-hooks==1.1.0 + # via + # build + # pip-tools +wheel==0.43.0 + # via pip-tools + +# The following packages are considered to be unsafe in a requirements file: +# pip +# setuptools diff --git a/requirements/pip.in b/requirements/pip.in new file mode 100644 index 0000000..716c6f2 --- /dev/null +++ b/requirements/pip.in @@ -0,0 +1,6 @@ +# Core dependencies for installing other packages +-c constraints.txt + +pip +setuptools +wheel diff --git a/requirements/pip.txt b/requirements/pip.txt new file mode 100644 index 0000000..ff8ab2a --- /dev/null +++ b/requirements/pip.txt @@ -0,0 +1,14 @@ +# +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: +# +# make upgrade +# +wheel==0.43.0 + # via -r requirements/pip.in + +# The following packages are considered to be unsafe in a requirements file: +pip==24.1.1 + # via -r requirements/pip.in +setuptools==70.2.0 + # via -r requirements/pip.in diff --git a/requirements/private.readme b/requirements/private.readme new file mode 100644 index 0000000..5600a10 --- /dev/null +++ b/requirements/private.readme @@ -0,0 +1,15 @@ +# If there are any Python packages you want to keep in your virtualenv beyond +# those listed in the official requirements files, create a "private.in" file +# and list them there. Generate the corresponding "private.txt" file pinning +# all of their indirect dependencies to specific versions as follows: + +# pip-compile private.in + +# This allows you to use "pip-sync" without removing these packages: + +# pip-sync requirements/*.txt + +# "private.in" and "private.txt" aren't checked into git to avoid merge +# conflicts, and the presence of this file allows "private.*" to be +# included in scripted pip-sync usage without requiring that those files be +# created first. diff --git a/requirements/quality.in b/requirements/quality.in new file mode 100644 index 0000000..93661d9 --- /dev/null +++ b/requirements/quality.in @@ -0,0 +1,10 @@ +# Requirements for code quality checks + +-c constraints.txt + +-r test.txt # Core and testing dependencies for this package + +edx-lint # edX pylint rules and plugins +isort # to standardize order of imports +pycodestyle # PEP 8 compliance validation +pydocstyle # PEP 257 compliance validation diff --git a/requirements/quality.txt b/requirements/quality.txt new file mode 100644 index 0000000..0236525 --- /dev/null +++ b/requirements/quality.txt @@ -0,0 +1,315 @@ +# +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: +# +# make upgrade +# +appdirs==1.4.4 + # via + # -r requirements/test.txt + # fs +arrow==1.3.0 + # via + # -r requirements/test.txt + # cookiecutter +asgiref==3.8.1 + # via + # -r requirements/test.txt + # django +astroid==3.2.2 + # via + # pylint + # pylint-celery +binaryornot==0.4.4 + # via + # -r requirements/test.txt + # cookiecutter +boto3==1.34.139 + # via + # -r requirements/test.txt + # fs-s3fs +botocore==1.34.139 + # via + # -r requirements/test.txt + # boto3 + # s3transfer +certifi==2024.7.4 + # via + # -r requirements/test.txt + # requests +chardet==5.2.0 + # via + # -r requirements/test.txt + # binaryornot +charset-normalizer==3.3.2 + # via + # -r requirements/test.txt + # requests +click==8.1.7 + # via + # -r requirements/test.txt + # click-log + # code-annotations + # cookiecutter + # edx-lint +click-log==0.4.0 + # via edx-lint +code-annotations==1.8.0 + # via + # -r requirements/test.txt + # edx-lint +cookiecutter==2.6.0 + # via + # -r requirements/test.txt + # xblock-sdk +coverage[toml]==7.5.4 + # via + # -r requirements/test.txt + # pytest-cov +dill==0.3.8 + # via pylint +django==4.2.13 + # via + # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt + # -r requirements/test.txt + # django-appconf + # django-statici18n + # edx-i18n-tools + # openedx-django-pyfs + # xblock-sdk +django-appconf==1.0.6 + # via + # -r requirements/test.txt + # django-statici18n +django-statici18n==2.5.0 + # via -r requirements/test.txt +edx-i18n-tools==1.6.0 + # via -r requirements/test.txt +edx-lint==5.3.6 + # via -r requirements/quality.in +fs==2.4.16 + # via + # -r requirements/test.txt + # fs-s3fs + # openedx-django-pyfs + # xblock +fs-s3fs==1.1.1 + # via + # -r requirements/test.txt + # openedx-django-pyfs + # xblock-sdk +idna==3.7 + # via + # -r requirements/test.txt + # requests +iniconfig==2.0.0 + # via + # -r requirements/test.txt + # pytest +isort==5.13.2 + # via + # -r requirements/quality.in + # pylint +jinja2==3.1.4 + # via + # -r requirements/test.txt + # code-annotations + # cookiecutter +jmespath==1.0.1 + # via + # -r requirements/test.txt + # boto3 + # botocore +lazy==1.6 + # via + # -r requirements/test.txt + # xblock +lxml[html-clean]==5.2.2 + # via + # -r requirements/test.txt + # edx-i18n-tools + # lxml-html-clean + # xblock + # xblock-sdk +lxml-html-clean==0.1.1 + # via + # -r requirements/test.txt + # lxml +mako==1.3.5 + # via + # -r requirements/test.txt + # xblock + # xblock-utils +markdown-it-py==3.0.0 + # via + # -r requirements/test.txt + # rich +markupsafe==2.1.5 + # via + # -r requirements/test.txt + # jinja2 + # mako + # xblock +mccabe==0.7.0 + # via pylint +mdurl==0.1.2 + # via + # -r requirements/test.txt + # markdown-it-py +openedx-django-pyfs==3.6.0 + # via + # -r requirements/test.txt + # xblock +packaging==24.1 + # via + # -r requirements/test.txt + # pytest +path==16.14.0 + # via + # -r requirements/test.txt + # edx-i18n-tools +pbr==6.0.0 + # via + # -r requirements/test.txt + # stevedore +platformdirs==4.2.2 + # via pylint +pluggy==1.5.0 + # via + # -r requirements/test.txt + # pytest +polib==1.2.0 + # via + # -r requirements/test.txt + # edx-i18n-tools +pycodestyle==2.12.0 + # via -r requirements/quality.in +pydocstyle==6.3.0 + # via -r requirements/quality.in +pygments==2.18.0 + # via + # -r requirements/test.txt + # rich +pylint==3.2.5 + # via + # edx-lint + # pylint-celery + # pylint-django + # pylint-plugin-utils +pylint-celery==0.3 + # via edx-lint +pylint-django==2.5.5 + # via edx-lint +pylint-plugin-utils==0.8.2 + # via + # pylint-celery + # pylint-django +pypng==0.20220715.0 + # via + # -r requirements/test.txt + # xblock-sdk +pytest==8.2.2 + # via + # -r requirements/test.txt + # pytest-cov + # pytest-django +pytest-cov==5.0.0 + # via -r requirements/test.txt +pytest-django==4.8.0 + # via -r requirements/test.txt +python-dateutil==2.9.0.post0 + # via + # -r requirements/test.txt + # arrow + # botocore + # xblock +python-slugify==8.0.4 + # via + # -r requirements/test.txt + # code-annotations + # cookiecutter +pytz==2024.1 + # via + # -r requirements/test.txt + # xblock +pyyaml==6.0.1 + # via + # -r requirements/test.txt + # code-annotations + # cookiecutter + # edx-i18n-tools + # xblock +requests==2.32.3 + # via + # -r requirements/test.txt + # cookiecutter + # xblock-sdk +rich==13.7.1 + # via + # -r requirements/test.txt + # cookiecutter +s3transfer==0.10.2 + # via + # -r requirements/test.txt + # boto3 +simplejson==3.19.2 + # via + # -r requirements/test.txt + # xblock + # xblock-sdk + # xblock-utils +six==1.16.0 + # via + # -r requirements/test.txt + # edx-lint + # fs + # fs-s3fs + # python-dateutil +snowballstemmer==2.2.0 + # via pydocstyle +sqlparse==0.5.0 + # via + # -r requirements/test.txt + # django +stevedore==5.2.0 + # via + # -r requirements/test.txt + # code-annotations +text-unidecode==1.3 + # via + # -r requirements/test.txt + # python-slugify +tomlkit==0.12.5 + # via pylint +types-python-dateutil==2.9.0.20240316 + # via + # -r requirements/test.txt + # arrow +urllib3==2.2.2 + # via + # -r requirements/test.txt + # botocore + # requests +web-fragments==2.2.0 + # via + # -r requirements/test.txt + # xblock + # xblock-sdk + # xblock-utils +webob==1.8.7 + # via + # -r requirements/test.txt + # xblock + # xblock-sdk +xblock[django]==4.0.1 + # via + # -r requirements/test.txt + # xblock-sdk + # xblock-utils +xblock-sdk==0.11.0 + # via -r requirements/test.txt +xblock-utils==4.0.0 + # via -r requirements/test.txt + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/requirements/test.in b/requirements/test.in new file mode 100644 index 0000000..3a923b4 --- /dev/null +++ b/requirements/test.in @@ -0,0 +1,9 @@ +# Requirements for test runs. +-c constraints.txt + +-r base.txt # Core dependencies for this package + +pytest-cov # pytest extension for code coverage statistics +pytest-django # pytest extension for better Django support +code-annotations # provides commands used by the pii_check make target. +xblock-sdk # provides workbench settings for testing diff --git a/requirements/test.txt b/requirements/test.txt new file mode 100644 index 0000000..29f754f --- /dev/null +++ b/requirements/test.txt @@ -0,0 +1,224 @@ +# +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: +# +# make upgrade +# +appdirs==1.4.4 + # via + # -r requirements/base.txt + # fs +arrow==1.3.0 + # via cookiecutter +asgiref==3.8.1 + # via + # -r requirements/base.txt + # django +binaryornot==0.4.4 + # via cookiecutter +boto3==1.34.139 + # via + # -r requirements/base.txt + # fs-s3fs +botocore==1.34.139 + # via + # -r requirements/base.txt + # boto3 + # s3transfer +certifi==2024.7.4 + # via requests +chardet==5.2.0 + # via binaryornot +charset-normalizer==3.3.2 + # via requests +click==8.1.7 + # via + # code-annotations + # cookiecutter +code-annotations==1.8.0 + # via -r requirements/test.in +cookiecutter==2.6.0 + # via xblock-sdk +coverage[toml]==7.5.4 + # via pytest-cov + # via + # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt + # -r requirements/base.txt + # django-appconf + # django-statici18n + # edx-i18n-tools + # openedx-django-pyfs + # xblock-sdk +django-appconf==1.0.6 + # via + # -r requirements/base.txt + # django-statici18n +django-statici18n==2.5.0 + # via -r requirements/base.txt +edx-i18n-tools==1.6.0 + # via -r requirements/base.txt +fs==2.4.16 + # via + # -r requirements/base.txt + # fs-s3fs + # openedx-django-pyfs + # xblock +fs-s3fs==1.1.1 + # via + # -r requirements/base.txt + # openedx-django-pyfs + # xblock-sdk +idna==3.7 + # via requests +iniconfig==2.0.0 + # via pytest +jinja2==3.1.4 + # via + # code-annotations + # cookiecutter +jmespath==1.0.1 + # via + # -r requirements/base.txt + # boto3 + # botocore +lazy==1.6 + # via + # -r requirements/base.txt + # xblock +lxml[html-clean]==5.2.2 + # via + # -r requirements/base.txt + # edx-i18n-tools + # lxml-html-clean + # xblock + # xblock-sdk +lxml-html-clean==0.1.1 + # via + # -r requirements/base.txt + # lxml +mako==1.3.5 + # via + # -r requirements/base.txt + # xblock + # xblock-utils +markdown-it-py==3.0.0 + # via rich +markupsafe==2.1.5 + # via + # -r requirements/base.txt + # jinja2 + # mako + # xblock +mdurl==0.1.2 + # via markdown-it-py +openedx-django-pyfs==3.6.0 + # via + # -r requirements/base.txt + # xblock +packaging==24.1 + # via pytest +path==16.14.0 + # via + # -r requirements/base.txt + # edx-i18n-tools +pbr==6.0.0 + # via stevedore +pluggy==1.5.0 + # via pytest +polib==1.2.0 + # via + # -r requirements/base.txt + # edx-i18n-tools +pygments==2.18.0 + # via rich +pypng==0.20220715.0 + # via xblock-sdk +pytest==8.2.2 + # via + # pytest-cov + # pytest-django +pytest-cov==5.0.0 + # via -r requirements/test.in +pytest-django==4.8.0 + # via -r requirements/test.in +python-dateutil==2.9.0.post0 + # via + # -r requirements/base.txt + # arrow + # botocore + # xblock +python-slugify==8.0.4 + # via + # code-annotations + # cookiecutter +pytz==2024.1 + # via + # -r requirements/base.txt + # xblock +pyyaml==6.0.1 + # via + # -r requirements/base.txt + # code-annotations + # cookiecutter + # edx-i18n-tools + # xblock +requests==2.32.3 + # via + # cookiecutter + # xblock-sdk +rich==13.7.1 + # via cookiecutter +s3transfer==0.10.2 + # via + # -r requirements/base.txt + # boto3 +simplejson==3.19.2 + # via + # -r requirements/base.txt + # xblock + # xblock-sdk + # xblock-utils +six==1.16.0 + # via + # -r requirements/base.txt + # fs + # fs-s3fs + # python-dateutil +sqlparse==0.5.0 + # via + # -r requirements/base.txt + # django +stevedore==5.2.0 + # via code-annotations +text-unidecode==1.3 + # via python-slugify +types-python-dateutil==2.9.0.20240316 + # via arrow +urllib3==2.2.2 + # via + # -r requirements/base.txt + # botocore + # requests +web-fragments==2.2.0 + # via + # -r requirements/base.txt + # xblock + # xblock-sdk + # xblock-utils +webob==1.8.7 + # via + # -r requirements/base.txt + # xblock + # xblock-sdk +xblock[django]==4.0.1 + # via + # -r requirements/base.txt + # xblock-sdk + # xblock-utils +xblock-sdk==0.11.0 + # via -r requirements/test.in +xblock-utils==4.0.0 + # via -r requirements/base.txt + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..d782599 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,10 @@ +[isort] +include_trailing_comma = True +indent = ' ' +line_length = 120 +multi_line_output = 3 +skip= + migrations + +[wheel] +universal = 1 diff --git a/setup.py b/setup.py new file mode 100755 index 0000000..12f203e --- /dev/null +++ b/setup.py @@ -0,0 +1,205 @@ +#!/usr/bin/env python +""" +Package metadata for xblocks-contrib. +""" +import os +import re +import sys + +from setuptools import find_packages, setup + + +def get_version(*file_paths): + """ + Extract the version string from the file. + + Input: + - file_paths: relative path fragments to file with + version string + """ + filename = os.path.join(os.path.dirname(__file__), *file_paths) + version_file = open(filename, encoding="utf8").read() + version_match = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]", version_file, re.M) + if version_match: + return version_match.group(1) + raise RuntimeError("Unable to find version string.") + + +def load_requirements(*requirements_paths): + """ + Load all requirements from the specified requirements files. + + Requirements will include any constraints from files specified + with -c in the requirements files. + Returns a list of requirement strings. + """ + # e.g. {"django": "Django", "confluent-kafka": "confluent_kafka[avro]"} + by_canonical_name = {} + + def check_name_consistent(package): + """ + Raise exception if package is named different ways. + + This ensures that packages are named consistently so we can match + constraints to packages. It also ensures that if we require a package + with extras we don't constrain it without mentioning the extras (since + that too would interfere with matching constraints.) + """ + canonical = package.lower().replace("_", "-").split("[")[0] + seen_spelling = by_canonical_name.get(canonical) + if seen_spelling is None: + by_canonical_name[canonical] = package + elif seen_spelling != package: + raise Exception( + f'Encountered both "{seen_spelling}" and "{package}" in requirements ' + "and constraints files; please use just one or the other." + ) + + requirements = {} + constraint_files = set() + + # groups "pkg<=x.y.z,..." into ("pkg", "<=x.y.z,...") + re_package_name_base_chars = r"a-zA-Z0-9\-_." # chars allowed in base package name + # Two groups: name[maybe,extras], and optionally a constraint + requirement_line_regex = re.compile( + r"([%s]+(?:\[[%s,\s]+\])?)([<>=][^#\s]+)?" + % (re_package_name_base_chars, re_package_name_base_chars) + ) + + def add_version_constraint_or_raise( + current_line, current_requirements, add_if_not_present + ): + regex_match = requirement_line_regex.match(current_line) + if regex_match: + package = regex_match.group(1) + version_constraints = regex_match.group(2) + check_name_consistent(package) + existing_version_constraints = current_requirements.get(package, None) + # It's fine to add constraints to an unconstrained package, + # but raise an error if there are already constraints in place. + if ( + existing_version_constraints + and existing_version_constraints != version_constraints + ): + raise BaseException( + f"Multiple constraint definitions found for {package}:" + f' "{existing_version_constraints}" and "{version_constraints}".' + f"Combine constraints into one location with {package}" + f"{existing_version_constraints},{version_constraints}." + ) + if add_if_not_present or package in current_requirements: + current_requirements[package] = version_constraints + + # Read requirements from .in files and store the path to any + # constraint files that are pulled in. + for path in requirements_paths: + with open(path) as reqs: + for line in reqs: + if is_requirement(line): + add_version_constraint_or_raise(line, requirements, True) + if line and line.startswith("-c") and not line.startswith("-c http"): + constraint_files.add( + os.path.dirname(path) + + "/" + + line.split("#")[0].replace("-c", "").strip() + ) + + # process constraint files: add constraints to existing requirements + for constraint_file in constraint_files: + with open(constraint_file) as reader: + for line in reader: + if is_requirement(line): + add_version_constraint_or_raise(line, requirements, False) + + # process back into list of pkg><=constraints strings + constrained_requirements = [ + f'{pkg}{version or ""}' for (pkg, version) in sorted(requirements.items()) + ] + return constrained_requirements + + +def is_requirement(line): + """ + Return True if the requirement line is a package requirement. + + Returns: + bool: True if the line is not blank, a comment, + a URL, or an included file + """ + return ( + line and line.strip() and not line.startswith(("-r", "#", "-e", "git+", "-c")) + ) + + +def package_data(pkg, roots, sub_roots): + """ + Declare package_data based on `roots`. + + All of the files under each of the `roots` will be declared as package + data for package `pkg`. + + """ + data = [] + for root in roots: + for sub_root in sub_roots: + for dirname, _, files in os.walk(os.path.join(pkg, root, sub_root)): + for fname in files: + data.append(os.path.relpath(os.path.join(dirname, fname), pkg)) + + return {pkg: data} + + +VERSION = get_version("xblocks_contrib", "__init__.py") + +if sys.argv[-1] == "tag": + print("Tagging the version on github:") + os.system("git tag -a %s -m 'version %s'" % (VERSION, VERSION)) + os.system("git push --tags") + sys.exit() + +README = open( + os.path.join(os.path.dirname(__file__), "README.rst"), encoding="utf8" +).read() +CHANGELOG = open( + os.path.join(os.path.dirname(__file__), "CHANGELOG.rst"), encoding="utf8" +).read() + +setup( + name="xblocks-contrib", + version=VERSION, + description="""core xblocks""", + long_description=README + "\n\n" + CHANGELOG, + author="Open edX Project", + author_email="oscm@openedx.org", + url="https://github.com/openedx/xblocks-contrib", + packages=find_packages( + include=["xblocks_contrib", "xblocks_contrib.*"], + exclude=["*tests"], + ), + include_package_data=True, + install_requires=load_requirements("requirements/base.in"), + python_requires=">=3.11", + license="AGPL 3.0", + zip_safe=False, + keywords="Python edx", + classifiers=[ + "Development Status :: 3 - Alpha", + "Intended Audience :: Developers", + "License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)", + "Natural Language :: English", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + ], + entry_points={ + "xblock.v1": [ + # _xblock suffix is added for testing only. + "annotatable_xblock = xblocks_contrib:AnnotatableXBlock", + "poll_xblock = xblocks_contrib:PollXBlock", + "word_cloud_xblock = xblocks_contrib:WordCloudXBlock", + ] + }, + package_data=package_data( + "xblocks_contrib", ["annotatable", "poll", "wordcloud"], ["static", "public"] + ), +) diff --git a/test_utils/__init__.py b/test_utils/__init__.py new file mode 100644 index 0000000..7961e47 --- /dev/null +++ b/test_utils/__init__.py @@ -0,0 +1,10 @@ +""" +Test utilities. + +Since pytest discourages putting __init__.py into testdirectory +(i.e. making tests a package) one cannot import from anywhere +under tests folder. However, some utility classes/methods might be useful +in multiple test modules (i.e. factoryboy factories, base test classes). + +So this package is the place to put them. +""" diff --git a/tests/test_annotatable.py b/tests/test_annotatable.py new file mode 100644 index 0000000..ebc99f3 --- /dev/null +++ b/tests/test_annotatable.py @@ -0,0 +1,26 @@ +""" +Tests for PollXBlock +""" + +from django.test import TestCase +from xblock.fields import ScopeIds +from xblock.test.toy_runtime import ToyRuntime + +from xblocks_contrib import PollXBlock + + +class TestPollXBlock(TestCase): + """Tests for PollXBlock""" + + def test_my_student_view(self): + """Test the basic view loads.""" + scope_ids = ScopeIds("1", "2", "3", "4") + block = PollXBlock(ToyRuntime(), scope_ids=scope_ids) + frag = block.student_view() + as_dict = frag.to_dict() + content = as_dict["content"] + self.assertIn( + "PollXBlock: count is now", + content, + "XBlock did not render correct student view", + ) diff --git a/tests/test_poll.py b/tests/test_poll.py new file mode 100644 index 0000000..ebc99f3 --- /dev/null +++ b/tests/test_poll.py @@ -0,0 +1,26 @@ +""" +Tests for PollXBlock +""" + +from django.test import TestCase +from xblock.fields import ScopeIds +from xblock.test.toy_runtime import ToyRuntime + +from xblocks_contrib import PollXBlock + + +class TestPollXBlock(TestCase): + """Tests for PollXBlock""" + + def test_my_student_view(self): + """Test the basic view loads.""" + scope_ids = ScopeIds("1", "2", "3", "4") + block = PollXBlock(ToyRuntime(), scope_ids=scope_ids) + frag = block.student_view() + as_dict = frag.to_dict() + content = as_dict["content"] + self.assertIn( + "PollXBlock: count is now", + content, + "XBlock did not render correct student view", + ) diff --git a/tests/test_word_cloud.py b/tests/test_word_cloud.py new file mode 100644 index 0000000..ebc99f3 --- /dev/null +++ b/tests/test_word_cloud.py @@ -0,0 +1,26 @@ +""" +Tests for PollXBlock +""" + +from django.test import TestCase +from xblock.fields import ScopeIds +from xblock.test.toy_runtime import ToyRuntime + +from xblocks_contrib import PollXBlock + + +class TestPollXBlock(TestCase): + """Tests for PollXBlock""" + + def test_my_student_view(self): + """Test the basic view loads.""" + scope_ids = ScopeIds("1", "2", "3", "4") + block = PollXBlock(ToyRuntime(), scope_ids=scope_ids) + frag = block.student_view() + as_dict = frag.to_dict() + content = as_dict["content"] + self.assertIn( + "PollXBlock: count is now", + content, + "XBlock did not render correct student view", + ) diff --git a/tox.ini b/tox.ini new file mode 100644 index 0000000..b979155 --- /dev/null +++ b/tox.ini @@ -0,0 +1,85 @@ +[tox] +envlist = py{311,312}-django{42,50}, quality, docs +skipsdist = true + +[doc8] +; D001 = Line too long +ignore = D001 + +[pycodestyle] +exclude = .git,.tox,migrations +max-line-length = 120 + +[pydocstyle] +; D101 = Missing docstring in public class +; D200 = One-line docstring should fit on one line with quotes +; D203 = 1 blank line required before class docstring +; D212 = Multi-line docstring summary should start at the first line +; D215 = Section underline is over-indented (numpy style) +; D404 = First word of the docstring should not be This (numpy style) +; D405 = Section name should be properly capitalized (numpy style) +; D406 = Section name should end with a newline (numpy style) +; D407 = Missing dashed underline after section (numpy style) +; D408 = Section underline should be in the line following the section's name (numpy style) +; D409 = Section underline should match the length of its name (numpy style) +; D410 = Missing blank line after section (numpy style) +; D411 = Missing blank line before section (numpy style) +; D412 = No blank lines allowed between a section header and its content (numpy style) +; D413 = Missing blank line after last section (numpy style) +; D414 = Section has no content (numpy style) +ignore = D101,D200,D203,D212,D215,D404,D405,D406,D407,D408,D409,D410,D411,D412,D413,D414 +match-dir = (?!migrations) + +[pytest] +DJANGO_SETTINGS_MODULE = workbench.settings +addopts = --cov xblocks_contrib --cov-report term-missing --cov-report xml +norecursedirs = .* docs requirements site-packages + +[testenv] +deps = + django42: Django>=4.2,<5.0 + django50: Django>=5.0,<5.1 + -r{toxinidir}/requirements/test.txt +allowlist_externals = + mkdir +commands = + mkdir -p var + pytest {posargs} + +[testenv:docs] +setenv = + DJANGO_SETTINGS_MODULE = translation_settings + PYTHONPATH = {toxinidir} + # Adding the option here instead of as a default in the docs Makefile because that Makefile is generated by shpinx. + SPHINXOPTS = -W +allowlist_externals = + make + rm +deps = + -r{toxinidir}/requirements/doc.txt +commands = + doc8 --ignore-path docs/_build README.rst docs + rm -f docs/xblocks_contrib.rst + rm -f docs/modules.rst + make -e -C docs clean + make -e -C docs html + +[testenv:translations] +allowlist_externals = + make +deps = + -r{toxinidir}/requirements/dev.txt +commands = + make validate_translations + +[testenv:quality] +allowlist_externals = + make +deps = + -r{toxinidir}/requirements/quality.txt +commands = + pylint xblocks_contrib test_utils manage.py + pycodestyle xblocks_contrib manage.py + pydocstyle xblocks_contrib manage.py + isort --check-only --diff test_utils xblocks_contrib manage.py + make selfcheck diff --git a/translation_settings.py b/translation_settings.py new file mode 100644 index 0000000..4664d0c --- /dev/null +++ b/translation_settings.py @@ -0,0 +1,51 @@ +""" +Django settings for xblocks-contrib project to be used in translation commands. + +For more information on this file, see +https://docs.djangoproject.com/en/3.2/topics/settings/ +For the full list of settings and their values, see +https://docs.djangoproject.com/en/3.2/ref/settings/ +""" + +import os + +BASE_DIR = os.path.dirname(__file__) + +SECRET_KEY = os.getenv("DJANGO_SECRET", "open_secret") + +# Application definition + +INSTALLED_APPS = ( + "statici18n", + "xblocks-contrib", +) + +# Internationalization +# https://docs.djangoproject.com/en/3.2/topics/i18n/ + +LANGUAGE_CODE = "en-us" + +TIME_ZONE = "UTC" + +USE_I18N = True + +USE_L10N = True + +USE_TZ = True + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/3.2/howto/static-files/ + +STATIC_URL = "/static/" + +# statici18n +# https://django-statici18n.readthedocs.io/en/latest/settings.html + +LOCALE_PATHS = [os.path.join(BASE_DIR, "xblocks-contrib", "conf", "locale")] + +STATICI18N_DOMAIN = "text" +STATICI18N_NAMESPACE = "Xblocks-contribI18n" +STATICI18N_PACKAGES = ("xblocks-contrib",) +STATICI18N_ROOT = "xblocks-contrib/public/js" +STATICI18N_OUTPUT_DIR = "translations" diff --git a/xblocks_contrib/__init__.py b/xblocks_contrib/__init__.py new file mode 100644 index 0000000..14ffec3 --- /dev/null +++ b/xblocks_contrib/__init__.py @@ -0,0 +1,9 @@ +""" +Init for the xblocks_contrib package. +""" + +from .annotatable import AnnotatableXBlock +from .poll import PollXBlock +from .word_cloud import WordCloudXBlock + +__version__ = "0.1.0" diff --git a/xblocks_contrib/annotatable/.tx/config b/xblocks_contrib/annotatable/.tx/config new file mode 100644 index 0000000..5f1f3f6 --- /dev/null +++ b/xblocks_contrib/annotatable/.tx/config @@ -0,0 +1,8 @@ +[main] +host = https://www.transifex.com + +[o:open-edx:p:p:xblocks:r:annotatable] +file_filter = annotatable/translations//LC_MESSAGES/text.po +source_file = annotatable/translations/en/LC_MESSAGES/text.po +source_lang = en +type = PO diff --git a/xblocks_contrib/annotatable/__init__.py b/xblocks_contrib/annotatable/__init__.py new file mode 100644 index 0000000..c9b3612 --- /dev/null +++ b/xblocks_contrib/annotatable/__init__.py @@ -0,0 +1,7 @@ +""" +Init for the AnnotatableXBlock package. +""" + +from .annotatable import AnnotatableXBlock + +__version__ = "0.1.0" diff --git a/xblocks_contrib/annotatable/annotatable.py b/xblocks_contrib/annotatable/annotatable.py new file mode 100644 index 0000000..c704654 --- /dev/null +++ b/xblocks_contrib/annotatable/annotatable.py @@ -0,0 +1,115 @@ +"""TO-DO: Write a description of what this XBlock is.""" + +import pkg_resources +from django.utils import translation +from web_fragments.fragment import Fragment +from xblock.core import XBlock +from xblock.fields import Integer, Scope +from xblockutils.resources import ResourceLoader + + +class AnnotatableXBlock(XBlock): + """ + TO-DO: document what your XBlock does. + """ + + # Fields are defined on the class. You can access them in your code as + # self.. + + # TO-DO: delete count, and define your own fields. + count = Integer( + default=0, + scope=Scope.user_state, + help="A simple counter, to show something happening", + ) + + def resource_string(self, path): + """Handy helper for getting resources from our kit.""" + data = pkg_resources.resource_string(__name__, path) + return data.decode("utf8") + + # TO-DO: change this view to display your data your own way. + def student_view(self, context=None): + """ + Create primary view of the AnnotatableXBlock, shown to students when viewing courses. + """ + if context: + pass # TO-DO: do something based on the context. + html = self.resource_string("static/html/annotatable.html") + frag = Fragment(html.format(self=self)) + frag.add_css(self.resource_string("static/css/annotatable.css")) + + # Add i18n js + statici18n_js_url = self._get_statici18n_js_url() + if statici18n_js_url: + frag.add_javascript_url( + self.runtime.local_resource_url(self, statici18n_js_url) + ) + + frag.add_javascript(self.resource_string("static/js/src/annotatable.js")) + frag.initialize_js("AnnotatableXBlock") + return frag + + # TO-DO: change this handler to perform your own actions. You may need more + # than one handler, or you may not need any handlers at all. + @XBlock.json_handler + def increment_count(self, data, suffix=""): + """ + Increments data. An example handler. + """ + if suffix: + pass # TO-DO: Use the suffix when storing data. + # Just to show data coming in... + assert data["hello"] == "world" + + self.count += 1 + return {"count": self.count} + + # TO-DO: change this to create the scenarios you'd like to see in the + # workbench while developing your XBlock. + @staticmethod + def workbench_scenarios(): + """Create canned scenario for display in the workbench.""" + return [ + ( + "AnnotatableXBlock", + """ + """, + ), + ( + "Multiple AnnotatableXBlock", + """ + + + + + """, + ), + ] + + @staticmethod + def _get_statici18n_js_url(): + """ + Return the Javascript translation file for the currently selected language, if any. + + Defaults to English if available. + """ + locale_code = translation.get_language() + if locale_code is None: + return None + text_js = "public/js/translations/{locale_code}/text.js" + lang_code = locale_code.split("-")[0] + for code in (locale_code, lang_code, "en"): + loader = ResourceLoader(__name__) + if pkg_resources.resource_exists( + loader.module_name, text_js.format(locale_code=code) + ): + return text_js.format(locale_code=code) + return None + + @staticmethod + def get_dummy(): + """ + Generate initial i18n with dummy method. + """ + return translation.gettext_noop("Dummy") diff --git a/xblocks_contrib/annotatable/conf/locale/__init__.py b/xblocks_contrib/annotatable/conf/locale/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/xblocks_contrib/annotatable/conf/locale/config.yaml b/xblocks_contrib/annotatable/conf/locale/config.yaml new file mode 100644 index 0000000..4bfb0ca --- /dev/null +++ b/xblocks_contrib/annotatable/conf/locale/config.yaml @@ -0,0 +1,93 @@ +# Configuration for i18n workflow. + +locales: + - en # English - Source Language + # - am # Amharic + - ar # Arabic + # - az # Azerbaijani + # - bg_BG # Bulgarian (Bulgaria) + # - bn_BD # Bengali (Bangladesh) + # - bn_IN # Bengali (India) + # - bs # Bosnian + # - ca # Catalan + # - ca@valencia # Catalan (Valencia) + # - cs # Czech + # - cy # Welsh + # - da # Danish + # - de_DE # German (Germany) + # - el # Greek + # - en_GB # English (United Kingdom) + # # Don't pull these until we figure out why pages randomly display in these locales, + # # when the user's browser is in English and the user is not logged in. + # #- en@lolcat # LOLCAT English + # #- en@pirate # Pirate English + - es_419 # Spanish (Latin America) + # - es_AR # Spanish (Argentina) + # - es_EC # Spanish (Ecuador) + # - es_ES # Spanish (Spain) + # - es_MX # Spanish (Mexico) + # - es_PE # Spanish (Peru) + # - et_EE # Estonian (Estonia) + # - eu_ES # Basque (Spain) + # - fa # Persian + # - fa_IR # Persian (Iran) + # - fi_FI # Finnish (Finland) + # - fil # Filipino + - fr # French + # - gl # Galician + # - gu # Gujarati + - he # Hebrew + - hi # Hindi + # - hr # Croatian + # - hu # Hungarian + # - hy_AM # Armenian (Armenia) + # - id # Indonesian + # - it_IT # Italian (Italy) + # - ja_JP # Japanese (Japan) + # - kk_KZ # Kazakh (Kazakhstan) + # - km_KH # Khmer (Cambodia) + # - kn # Kannada + - ko_KR # Korean (Korea) + # - lt_LT # Lithuanian (Lithuania) + # - ml # Malayalam + # - mn # Mongolian + # - mr # Marathi + # - ms # Malay + # - nb # Norwegian Bokmål + # - ne # Nepali + # - nl_NL # Dutch (Netherlands) + # - or # Oriya + # - pl # Polish + - pt_BR # Portuguese (Brazil) + # - pt_PT # Portuguese (Portugal) + # - ro # Romanian + - ru # Russian + # - si # Sinhala + # - sk # Slovak + # - sl # Slovenian + # - sq # Albanian + # - sr # Serbian + # - sv # Swedish + # - sw # Swahili + # - ta # Tamil + # - te # Telugu + # - th # Thai + # - tr_TR # Turkish (Turkey) + # - uk # Ukranian + # - ur # Urdu + # - uz # Uzbek + # - vi # Vietnamese + - zh_CN # Chinese (China) + # - zh_HK # Chinese (Hong Kong) + # - zh_TW # Chinese (Taiwan) + + +# The locales used for fake-accented English, for testing. +dummy_locales: + - eo + - rtl # Fake testing language for Arabic + +# Directories we don't search for strings. +ignore_dirs: + - '*/css' + - 'public/js/translations' diff --git a/xblocks_contrib/annotatable/static/README.txt b/xblocks_contrib/annotatable/static/README.txt new file mode 100644 index 0000000..0472ef6 --- /dev/null +++ b/xblocks_contrib/annotatable/static/README.txt @@ -0,0 +1,19 @@ +This static directory is for files that should be included in your kit as plain +static files. + +You can ask the runtime for a URL that will retrieve these files with: + + url = self.runtime.local_resource_url(self, "static/js/lib.js") + +The default implementation is very strict though, and will not serve files from +the static directory. It will serve files from a directory named "public". +Create a directory alongside this one named "public", and put files there. +Then you can get a url with code like this: + + url = self.runtime.local_resource_url(self, "public/js/lib.js") + +The sample code includes a function you can use to read the content of files +in the static directory, like this: + + frag.add_javascript(self.resource_string("static/js/my_block.js")) + diff --git a/xblocks_contrib/annotatable/static/css/annotatable.css b/xblocks_contrib/annotatable/static/css/annotatable.css new file mode 100644 index 0000000..d3c8d81 --- /dev/null +++ b/xblocks_contrib/annotatable/static/css/annotatable.css @@ -0,0 +1,9 @@ +/* CSS for AnnotatableXBlock */ + +.annotatable_xblock .count { + font-weight: bold; +} + +.annotatable_xblock p { + cursor: pointer; +} diff --git a/xblocks_contrib/annotatable/static/html/annotatable.html b/xblocks_contrib/annotatable/static/html/annotatable.html new file mode 100644 index 0000000..937b84b --- /dev/null +++ b/xblocks_contrib/annotatable/static/html/annotatable.html @@ -0,0 +1,5 @@ +
+

AnnotatableXBlock: count is now + {self.count} (click me to increment). +

+
diff --git a/xblocks_contrib/annotatable/static/js/src/annotatable.js b/xblocks_contrib/annotatable/static/js/src/annotatable.js new file mode 100644 index 0000000..7258480 --- /dev/null +++ b/xblocks_contrib/annotatable/static/js/src/annotatable.js @@ -0,0 +1,33 @@ +/* Javascript for AnnotatableXBlock. */ +function AnnotatableXBlock(runtime, element) { + + function updateCount(result) { + $('.count', element).text(result.count); + } + + var handlerUrl = runtime.handlerUrl(element, 'increment_count'); + + $('p', element).click(function(eventObject) { + $.ajax({ + type: "POST", + url: handlerUrl, + data: JSON.stringify({"hello": "world"}), + success: updateCount + }); + }); + + $(function ($) { + /* + Use `gettext` provided by django-statici18n for static translations + + var gettext = AnnotatableXBlocki18n.gettext; + */ + + /* Here's where you'd do things on page load. */ + + // dummy_text is to have at least one string to translate in JS files. If you remove this line, + // and you don't have any other string to translate in JS files; then you must remove the (--merge-po-files) + // option from the "extract_translations" command in the Makefile + const dummy_text = gettext("Hello World"); + }); +} diff --git a/xblocks_contrib/annotatable/translation b/xblocks_contrib/annotatable/translation new file mode 120000 index 0000000..717deaa --- /dev/null +++ b/xblocks_contrib/annotatable/translation @@ -0,0 +1 @@ +/Users/irtaza.akram/openedx/edx-platform/src/xblocks-contrib/xblocks-contrib copy/xblocks-contrib/conf/locale \ No newline at end of file diff --git a/xblocks_contrib/poll/.tx/config b/xblocks_contrib/poll/.tx/config new file mode 100644 index 0000000..4455ffd --- /dev/null +++ b/xblocks_contrib/poll/.tx/config @@ -0,0 +1,8 @@ +[main] +host = https://www.transifex.com + +[o:open-edx:p:p:xblocks:r:poll] +file_filter = poll/translations//LC_MESSAGES/text.po +source_file = poll/translations/en/LC_MESSAGES/text.po +source_lang = en +type = PO diff --git a/xblocks_contrib/poll/__init__.py b/xblocks_contrib/poll/__init__.py new file mode 100644 index 0000000..08b85b3 --- /dev/null +++ b/xblocks_contrib/poll/__init__.py @@ -0,0 +1,7 @@ +""" +Init for the PollXBlock package. +""" + +from .poll import PollXBlock + +__version__ = "0.1.0" diff --git a/xblocks_contrib/poll/conf/locale/__init__.py b/xblocks_contrib/poll/conf/locale/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/xblocks_contrib/poll/conf/locale/config.yaml b/xblocks_contrib/poll/conf/locale/config.yaml new file mode 100644 index 0000000..4bfb0ca --- /dev/null +++ b/xblocks_contrib/poll/conf/locale/config.yaml @@ -0,0 +1,93 @@ +# Configuration for i18n workflow. + +locales: + - en # English - Source Language + # - am # Amharic + - ar # Arabic + # - az # Azerbaijani + # - bg_BG # Bulgarian (Bulgaria) + # - bn_BD # Bengali (Bangladesh) + # - bn_IN # Bengali (India) + # - bs # Bosnian + # - ca # Catalan + # - ca@valencia # Catalan (Valencia) + # - cs # Czech + # - cy # Welsh + # - da # Danish + # - de_DE # German (Germany) + # - el # Greek + # - en_GB # English (United Kingdom) + # # Don't pull these until we figure out why pages randomly display in these locales, + # # when the user's browser is in English and the user is not logged in. + # #- en@lolcat # LOLCAT English + # #- en@pirate # Pirate English + - es_419 # Spanish (Latin America) + # - es_AR # Spanish (Argentina) + # - es_EC # Spanish (Ecuador) + # - es_ES # Spanish (Spain) + # - es_MX # Spanish (Mexico) + # - es_PE # Spanish (Peru) + # - et_EE # Estonian (Estonia) + # - eu_ES # Basque (Spain) + # - fa # Persian + # - fa_IR # Persian (Iran) + # - fi_FI # Finnish (Finland) + # - fil # Filipino + - fr # French + # - gl # Galician + # - gu # Gujarati + - he # Hebrew + - hi # Hindi + # - hr # Croatian + # - hu # Hungarian + # - hy_AM # Armenian (Armenia) + # - id # Indonesian + # - it_IT # Italian (Italy) + # - ja_JP # Japanese (Japan) + # - kk_KZ # Kazakh (Kazakhstan) + # - km_KH # Khmer (Cambodia) + # - kn # Kannada + - ko_KR # Korean (Korea) + # - lt_LT # Lithuanian (Lithuania) + # - ml # Malayalam + # - mn # Mongolian + # - mr # Marathi + # - ms # Malay + # - nb # Norwegian Bokmål + # - ne # Nepali + # - nl_NL # Dutch (Netherlands) + # - or # Oriya + # - pl # Polish + - pt_BR # Portuguese (Brazil) + # - pt_PT # Portuguese (Portugal) + # - ro # Romanian + - ru # Russian + # - si # Sinhala + # - sk # Slovak + # - sl # Slovenian + # - sq # Albanian + # - sr # Serbian + # - sv # Swedish + # - sw # Swahili + # - ta # Tamil + # - te # Telugu + # - th # Thai + # - tr_TR # Turkish (Turkey) + # - uk # Ukranian + # - ur # Urdu + # - uz # Uzbek + # - vi # Vietnamese + - zh_CN # Chinese (China) + # - zh_HK # Chinese (Hong Kong) + # - zh_TW # Chinese (Taiwan) + + +# The locales used for fake-accented English, for testing. +dummy_locales: + - eo + - rtl # Fake testing language for Arabic + +# Directories we don't search for strings. +ignore_dirs: + - '*/css' + - 'public/js/translations' diff --git a/xblocks_contrib/poll/poll.py b/xblocks_contrib/poll/poll.py new file mode 100644 index 0000000..0739c4f --- /dev/null +++ b/xblocks_contrib/poll/poll.py @@ -0,0 +1,115 @@ +"""TO-DO: Write a description of what this XBlock is.""" + +import pkg_resources +from django.utils import translation +from web_fragments.fragment import Fragment +from xblock.core import XBlock +from xblock.fields import Integer, Scope +from xblockutils.resources import ResourceLoader + + +class PollXBlock(XBlock): + """ + TO-DO: document what your XBlock does. + """ + + # Fields are defined on the class. You can access them in your code as + # self.. + + # TO-DO: delete count, and define your own fields. + count = Integer( + default=0, + scope=Scope.user_state, + help="A simple counter, to show something happening", + ) + + def resource_string(self, path): + """Handy helper for getting resources from our kit.""" + data = pkg_resources.resource_string(__name__, path) + return data.decode("utf8") + + # TO-DO: change this view to display your data your own way. + def student_view(self, context=None): + """ + Create primary view of the PollXBlock, shown to students when viewing courses. + """ + if context: + pass # TO-DO: do something based on the context. + html = self.resource_string("static/html/poll.html") + frag = Fragment(html.format(self=self)) + frag.add_css(self.resource_string("static/css/poll.css")) + + # Add i18n js + statici18n_js_url = self._get_statici18n_js_url() + if statici18n_js_url: + frag.add_javascript_url( + self.runtime.local_resource_url(self, statici18n_js_url) + ) + + frag.add_javascript(self.resource_string("static/js/src/poll.js")) + frag.initialize_js("PollXBlock") + return frag + + # TO-DO: change this handler to perform your own actions. You may need more + # than one handler, or you may not need any handlers at all. + @XBlock.json_handler + def increment_count(self, data, suffix=""): + """ + Increments data. An example handler. + """ + if suffix: + pass # TO-DO: Use the suffix when storing data. + # Just to show data coming in... + assert data["hello"] == "world" + + self.count += 1 + return {"count": self.count} + + # TO-DO: change this to create the scenarios you'd like to see in the + # workbench while developing your XBlock. + @staticmethod + def workbench_scenarios(): + """Create canned scenario for display in the workbench.""" + return [ + ( + "PollXBlock", + """ + """, + ), + ( + "Multiple PollXBlock", + """ + + + + + """, + ), + ] + + @staticmethod + def _get_statici18n_js_url(): + """ + Return the Javascript translation file for the currently selected language, if any. + + Defaults to English if available. + """ + locale_code = translation.get_language() + if locale_code is None: + return None + text_js = "public/js/translations/{locale_code}/text.js" + lang_code = locale_code.split("-")[0] + for code in (locale_code, lang_code, "en"): + loader = ResourceLoader(__name__) + if pkg_resources.resource_exists( + loader.module_name, text_js.format(locale_code=code) + ): + return text_js.format(locale_code=code) + return None + + @staticmethod + def get_dummy(): + """ + Generate initial i18n with dummy method. + """ + return translation.gettext_noop("Dummy") diff --git a/xblocks_contrib/poll/static/README.txt b/xblocks_contrib/poll/static/README.txt new file mode 100644 index 0000000..0472ef6 --- /dev/null +++ b/xblocks_contrib/poll/static/README.txt @@ -0,0 +1,19 @@ +This static directory is for files that should be included in your kit as plain +static files. + +You can ask the runtime for a URL that will retrieve these files with: + + url = self.runtime.local_resource_url(self, "static/js/lib.js") + +The default implementation is very strict though, and will not serve files from +the static directory. It will serve files from a directory named "public". +Create a directory alongside this one named "public", and put files there. +Then you can get a url with code like this: + + url = self.runtime.local_resource_url(self, "public/js/lib.js") + +The sample code includes a function you can use to read the content of files +in the static directory, like this: + + frag.add_javascript(self.resource_string("static/js/my_block.js")) + diff --git a/xblocks_contrib/poll/static/css/poll.css b/xblocks_contrib/poll/static/css/poll.css new file mode 100644 index 0000000..226f458 --- /dev/null +++ b/xblocks_contrib/poll/static/css/poll.css @@ -0,0 +1,9 @@ +/* CSS for PollXBlock */ + +.poll_xblock .count { + font-weight: bold; +} + +.poll_xblock p { + cursor: pointer; +} diff --git a/xblocks_contrib/poll/static/html/poll.html b/xblocks_contrib/poll/static/html/poll.html new file mode 100644 index 0000000..30fa725 --- /dev/null +++ b/xblocks_contrib/poll/static/html/poll.html @@ -0,0 +1,5 @@ +
+

PollXBlock: count is now + {self.count} (click me to increment). +

+
diff --git a/xblocks_contrib/poll/static/js/src/poll.js b/xblocks_contrib/poll/static/js/src/poll.js new file mode 100644 index 0000000..c0d690b --- /dev/null +++ b/xblocks_contrib/poll/static/js/src/poll.js @@ -0,0 +1,33 @@ +/* Javascript for PollXBlock. */ +function PollXBlock(runtime, element) { + + function updateCount(result) { + $('.count', element).text(result.count); + } + + var handlerUrl = runtime.handlerUrl(element, 'increment_count'); + + $('p', element).click(function(eventObject) { + $.ajax({ + type: "POST", + url: handlerUrl, + data: JSON.stringify({"hello": "world"}), + success: updateCount + }); + }); + + $(function ($) { + /* + Use `gettext` provided by django-statici18n for static translations + + var gettext = PollXBlocki18n.gettext; + */ + + /* Here's where you'd do things on page load. */ + + // dummy_text is to have at least one string to translate in JS files. If you remove this line, + // and you don't have any other string to translate in JS files; then you must remove the (--merge-po-files) + // option from the "extract_translations" command in the Makefile + const dummy_text = gettext("Hello World"); + }); +} diff --git a/xblocks_contrib/poll/translation b/xblocks_contrib/poll/translation new file mode 120000 index 0000000..717deaa --- /dev/null +++ b/xblocks_contrib/poll/translation @@ -0,0 +1 @@ +/Users/irtaza.akram/openedx/edx-platform/src/xblocks-contrib/xblocks-contrib copy/xblocks-contrib/conf/locale \ No newline at end of file diff --git a/xblocks_contrib/word_cloud/.tx/config b/xblocks_contrib/word_cloud/.tx/config new file mode 100644 index 0000000..3d7b52d --- /dev/null +++ b/xblocks_contrib/word_cloud/.tx/config @@ -0,0 +1,8 @@ +[main] +host = https://www.transifex.com + +[o:open-edx:p:p:xblocks:r:word_cloud] +file_filter = word_cloud/translations//LC_MESSAGES/text.po +source_file = word_cloud/translations/en/LC_MESSAGES/text.po +source_lang = en +type = PO diff --git a/xblocks_contrib/word_cloud/__init__.py b/xblocks_contrib/word_cloud/__init__.py new file mode 100644 index 0000000..2da9a41 --- /dev/null +++ b/xblocks_contrib/word_cloud/__init__.py @@ -0,0 +1,7 @@ +""" +Init for the WordCloudXBlock package. +""" + +from .word_cloud import WordCloudXBlock + +__version__ = "0.1.0" diff --git a/xblocks_contrib/word_cloud/conf/locale/__init__.py b/xblocks_contrib/word_cloud/conf/locale/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/xblocks_contrib/word_cloud/conf/locale/config.yaml b/xblocks_contrib/word_cloud/conf/locale/config.yaml new file mode 100644 index 0000000..4bfb0ca --- /dev/null +++ b/xblocks_contrib/word_cloud/conf/locale/config.yaml @@ -0,0 +1,93 @@ +# Configuration for i18n workflow. + +locales: + - en # English - Source Language + # - am # Amharic + - ar # Arabic + # - az # Azerbaijani + # - bg_BG # Bulgarian (Bulgaria) + # - bn_BD # Bengali (Bangladesh) + # - bn_IN # Bengali (India) + # - bs # Bosnian + # - ca # Catalan + # - ca@valencia # Catalan (Valencia) + # - cs # Czech + # - cy # Welsh + # - da # Danish + # - de_DE # German (Germany) + # - el # Greek + # - en_GB # English (United Kingdom) + # # Don't pull these until we figure out why pages randomly display in these locales, + # # when the user's browser is in English and the user is not logged in. + # #- en@lolcat # LOLCAT English + # #- en@pirate # Pirate English + - es_419 # Spanish (Latin America) + # - es_AR # Spanish (Argentina) + # - es_EC # Spanish (Ecuador) + # - es_ES # Spanish (Spain) + # - es_MX # Spanish (Mexico) + # - es_PE # Spanish (Peru) + # - et_EE # Estonian (Estonia) + # - eu_ES # Basque (Spain) + # - fa # Persian + # - fa_IR # Persian (Iran) + # - fi_FI # Finnish (Finland) + # - fil # Filipino + - fr # French + # - gl # Galician + # - gu # Gujarati + - he # Hebrew + - hi # Hindi + # - hr # Croatian + # - hu # Hungarian + # - hy_AM # Armenian (Armenia) + # - id # Indonesian + # - it_IT # Italian (Italy) + # - ja_JP # Japanese (Japan) + # - kk_KZ # Kazakh (Kazakhstan) + # - km_KH # Khmer (Cambodia) + # - kn # Kannada + - ko_KR # Korean (Korea) + # - lt_LT # Lithuanian (Lithuania) + # - ml # Malayalam + # - mn # Mongolian + # - mr # Marathi + # - ms # Malay + # - nb # Norwegian Bokmål + # - ne # Nepali + # - nl_NL # Dutch (Netherlands) + # - or # Oriya + # - pl # Polish + - pt_BR # Portuguese (Brazil) + # - pt_PT # Portuguese (Portugal) + # - ro # Romanian + - ru # Russian + # - si # Sinhala + # - sk # Slovak + # - sl # Slovenian + # - sq # Albanian + # - sr # Serbian + # - sv # Swedish + # - sw # Swahili + # - ta # Tamil + # - te # Telugu + # - th # Thai + # - tr_TR # Turkish (Turkey) + # - uk # Ukranian + # - ur # Urdu + # - uz # Uzbek + # - vi # Vietnamese + - zh_CN # Chinese (China) + # - zh_HK # Chinese (Hong Kong) + # - zh_TW # Chinese (Taiwan) + + +# The locales used for fake-accented English, for testing. +dummy_locales: + - eo + - rtl # Fake testing language for Arabic + +# Directories we don't search for strings. +ignore_dirs: + - '*/css' + - 'public/js/translations' diff --git a/xblocks_contrib/word_cloud/static/README.txt b/xblocks_contrib/word_cloud/static/README.txt new file mode 100644 index 0000000..0472ef6 --- /dev/null +++ b/xblocks_contrib/word_cloud/static/README.txt @@ -0,0 +1,19 @@ +This static directory is for files that should be included in your kit as plain +static files. + +You can ask the runtime for a URL that will retrieve these files with: + + url = self.runtime.local_resource_url(self, "static/js/lib.js") + +The default implementation is very strict though, and will not serve files from +the static directory. It will serve files from a directory named "public". +Create a directory alongside this one named "public", and put files there. +Then you can get a url with code like this: + + url = self.runtime.local_resource_url(self, "public/js/lib.js") + +The sample code includes a function you can use to read the content of files +in the static directory, like this: + + frag.add_javascript(self.resource_string("static/js/my_block.js")) + diff --git a/xblocks_contrib/word_cloud/static/css/word_cloud.css b/xblocks_contrib/word_cloud/static/css/word_cloud.css new file mode 100644 index 0000000..64443fa --- /dev/null +++ b/xblocks_contrib/word_cloud/static/css/word_cloud.css @@ -0,0 +1,9 @@ +/* CSS for WordCloudXBlock */ + +.word_cloud_xblock .count { + font-weight: bold; +} + +.word_cloud_xblock p { + cursor: pointer; +} diff --git a/xblocks_contrib/word_cloud/static/html/word_cloud.html b/xblocks_contrib/word_cloud/static/html/word_cloud.html new file mode 100644 index 0000000..aa9e247 --- /dev/null +++ b/xblocks_contrib/word_cloud/static/html/word_cloud.html @@ -0,0 +1,5 @@ +
+

WordCloudXBlock: count is now + {self.count} (click me to increment). +

+
diff --git a/xblocks_contrib/word_cloud/static/js/src/word_cloud.js b/xblocks_contrib/word_cloud/static/js/src/word_cloud.js new file mode 100644 index 0000000..a1ca578 --- /dev/null +++ b/xblocks_contrib/word_cloud/static/js/src/word_cloud.js @@ -0,0 +1,33 @@ +/* Javascript for WordCloudXBlock. */ +function WordCloudXBlock(runtime, element) { + + function updateCount(result) { + $('.count', element).text(result.count); + } + + var handlerUrl = runtime.handlerUrl(element, 'increment_count'); + + $('p', element).click(function(eventObject) { + $.ajax({ + type: "POST", + url: handlerUrl, + data: JSON.stringify({"hello": "world"}), + success: updateCount + }); + }); + + $(function ($) { + /* + Use `gettext` provided by django-statici18n for static translations + + var gettext = WordCloudXBlocki18n.gettext; + */ + + /* Here's where you'd do things on page load. */ + + // dummy_text is to have at least one string to translate in JS files. If you remove this line, + // and you don't have any other string to translate in JS files; then you must remove the (--merge-po-files) + // option from the "extract_translations" command in the Makefile + const dummy_text = gettext("Hello World"); + }); +} diff --git a/xblocks_contrib/word_cloud/translation b/xblocks_contrib/word_cloud/translation new file mode 120000 index 0000000..bff8e44 --- /dev/null +++ b/xblocks_contrib/word_cloud/translation @@ -0,0 +1 @@ +/Users/irtaza.akram/openedx/edx-platform/src/xblocks-contrib/xblocks-contrib copy 2/xblocks-contrib/conf/locale \ No newline at end of file diff --git a/xblocks_contrib/word_cloud/word_cloud.py b/xblocks_contrib/word_cloud/word_cloud.py new file mode 100644 index 0000000..a84bb2c --- /dev/null +++ b/xblocks_contrib/word_cloud/word_cloud.py @@ -0,0 +1,115 @@ +"""TO-DO: Write a description of what this XBlock is.""" + +import pkg_resources +from django.utils import translation +from web_fragments.fragment import Fragment +from xblock.core import XBlock +from xblock.fields import Integer, Scope +from xblockutils.resources import ResourceLoader + + +class WordCloudXBlock(XBlock): + """ + TO-DO: document what your XBlock does. + """ + + # Fields are defined on the class. You can access them in your code as + # self.. + + # TO-DO: delete count, and define your own fields. + count = Integer( + default=0, + scope=Scope.user_state, + help="A simple counter, to show something happening", + ) + + def resource_string(self, path): + """Handy helper for getting resources from our kit.""" + data = pkg_resources.resource_string(__name__, path) + return data.decode("utf8") + + # TO-DO: change this view to display your data your own way. + def student_view(self, context=None): + """ + Create primary view of the WordCloudXBlock, shown to students when viewing courses. + """ + if context: + pass # TO-DO: do something based on the context. + html = self.resource_string("static/html/word_cloud.html") + frag = Fragment(html.format(self=self)) + frag.add_css(self.resource_string("static/css/word_cloud.css")) + + # Add i18n js + statici18n_js_url = self._get_statici18n_js_url() + if statici18n_js_url: + frag.add_javascript_url( + self.runtime.local_resource_url(self, statici18n_js_url) + ) + + frag.add_javascript(self.resource_string("static/js/src/word_cloud.js")) + frag.initialize_js("WordCloudXBlock") + return frag + + # TO-DO: change this handler to perform your own actions. You may need more + # than one handler, or you may not need any handlers at all. + @XBlock.json_handler + def increment_count(self, data, suffix=""): + """ + Increments data. An example handler. + """ + if suffix: + pass # TO-DO: Use the suffix when storing data. + # Just to show data coming in... + assert data["hello"] == "world" + + self.count += 1 + return {"count": self.count} + + # TO-DO: change this to create the scenarios you'd like to see in the + # workbench while developing your XBlock. + @staticmethod + def workbench_scenarios(): + """Create canned scenario for display in the workbench.""" + return [ + ( + "WordCloudXBlock", + """ + """, + ), + ( + "Multiple WordCloudXBlock", + """ + + + + + """, + ), + ] + + @staticmethod + def _get_statici18n_js_url(): + """ + Return the Javascript translation file for the currently selected language, if any. + + Defaults to English if available. + """ + locale_code = translation.get_language() + if locale_code is None: + return None + text_js = "public/js/translations/{locale_code}/text.js" + lang_code = locale_code.split("-")[0] + for code in (locale_code, lang_code, "en"): + loader = ResourceLoader(__name__) + if pkg_resources.resource_exists( + loader.module_name, text_js.format(locale_code=code) + ): + return text_js.format(locale_code=code) + return None + + @staticmethod + def get_dummy(): + """ + Generate initial i18n with dummy method. + """ + return translation.gettext_noop("Dummy") From c0a4db719ab57a304c5acb484dce1ab6fcd90129 Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Mon, 8 Jul 2024 16:06:41 +0500 Subject: [PATCH 02/22] fix: review changes --- requirements/base.in | 1 - requirements/base.txt | 44 +------ requirements/dev.txt | 23 +--- requirements/doc.txt | 25 +--- requirements/pip.txt | 2 +- requirements/quality.txt | 23 +--- requirements/test.txt | 38 +----- setup.py | 3 +- test_utils/__init__.py | 10 -- tests/test_annotatable.py | 12 +- tests/test_word_cloud.py | 26 ---- xblocks_contrib/__init__.py | 1 - xblocks_contrib/annotatable/__init__.py | 2 - xblocks_contrib/annotatable/annotatable.py | 49 +------- xblocks_contrib/poll/__init__.py | 2 - xblocks_contrib/poll/poll.py | 50 +------- xblocks_contrib/word_cloud/.tx/config | 8 -- xblocks_contrib/word_cloud/__init__.py | 7 -- .../word_cloud/conf/locale/__init__.py | 0 .../word_cloud/conf/locale/config.yaml | 93 -------------- xblocks_contrib/word_cloud/static/README.txt | 19 --- .../word_cloud/static/css/word_cloud.css | 9 -- .../word_cloud/static/html/word_cloud.html | 5 - .../word_cloud/static/js/src/word_cloud.js | 33 ----- xblocks_contrib/word_cloud/translation | 1 - xblocks_contrib/word_cloud/word_cloud.py | 115 ------------------ 26 files changed, 40 insertions(+), 561 deletions(-) delete mode 100644 test_utils/__init__.py delete mode 100644 tests/test_word_cloud.py delete mode 100644 xblocks_contrib/word_cloud/.tx/config delete mode 100644 xblocks_contrib/word_cloud/__init__.py delete mode 100644 xblocks_contrib/word_cloud/conf/locale/__init__.py delete mode 100644 xblocks_contrib/word_cloud/conf/locale/config.yaml delete mode 100644 xblocks_contrib/word_cloud/static/README.txt delete mode 100644 xblocks_contrib/word_cloud/static/css/word_cloud.css delete mode 100644 xblocks_contrib/word_cloud/static/html/word_cloud.html delete mode 100644 xblocks_contrib/word_cloud/static/js/src/word_cloud.js delete mode 120000 xblocks_contrib/word_cloud/translation delete mode 100644 xblocks_contrib/word_cloud/word_cloud.py diff --git a/requirements/base.in b/requirements/base.in index 1dae69f..9a57ef1 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -5,4 +5,3 @@ django-statici18n edx-i18n-tools Mako XBlock -xblock-utils diff --git a/requirements/base.txt b/requirements/base.txt index 01dd480..e38b0a4 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -8,19 +8,12 @@ appdirs==1.4.4 # via fs asgiref==3.8.1 # via django -boto3==1.34.139 - # via fs-s3fs -botocore==1.34.139 - # via - # boto3 - # s3transfer django==4.2.13 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # django-appconf # django-statici18n # edx-i18n-tools - # openedx-django-pyfs django-appconf==1.0.6 # via django-statici18n django-statici18n==2.5.0 @@ -28,17 +21,6 @@ django-statici18n==2.5.0 edx-i18n-tools==1.6.0 # via -r requirements/base.in fs==2.4.16 - # via - # fs-s3fs - # openedx-django-pyfs - # xblock -fs-s3fs==1.1.1 - # via openedx-django-pyfs -jmespath==1.0.1 - # via - # boto3 - # botocore -lazy==1.6 # via xblock lxml[html-clean,html_clean]==5.2.2 # via @@ -51,53 +33,35 @@ mako==1.3.5 # via # -r requirements/base.in # xblock - # xblock-utils markupsafe==2.1.5 # via # mako # xblock -openedx-django-pyfs==3.6.0 - # via xblock path==16.14.0 # via edx-i18n-tools polib==1.2.0 # via edx-i18n-tools python-dateutil==2.9.0.post0 - # via - # botocore - # xblock + # via xblock pytz==2024.1 # via xblock pyyaml==6.0.1 # via # edx-i18n-tools # xblock -s3transfer==0.10.2 - # via boto3 simplejson==3.19.2 - # via - # xblock - # xblock-utils + # via xblock six==1.16.0 # via # fs - # fs-s3fs # python-dateutil sqlparse==0.5.0 # via django -urllib3==2.2.2 - # via botocore web-fragments==2.2.0 - # via - # xblock - # xblock-utils + # via xblock webob==1.8.7 # via xblock -xblock[django]==4.0.1 - # via - # -r requirements/base.in - # xblock-utils -xblock-utils==4.0.0 +xblock==4.0.1 # via -r requirements/base.in # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/dev.txt b/requirements/dev.txt index 5ac7d5a..1c0e2cb 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -25,11 +25,11 @@ binaryornot==0.4.4 # via # -r requirements/quality.txt # cookiecutter -boto3==1.34.139 +boto3==1.34.140 # via # -r requirements/quality.txt # fs-s3fs -botocore==1.34.139 +botocore==1.34.140 # via # -r requirements/quality.txt # boto3 @@ -103,7 +103,6 @@ django==4.2.13 # django-appconf # django-statici18n # edx-i18n-tools - # openedx-django-pyfs # xblock-sdk django-appconf==1.0.6 # via @@ -126,12 +125,10 @@ fs==2.4.16 # via # -r requirements/quality.txt # fs-s3fs - # openedx-django-pyfs # xblock fs-s3fs==1.1.1 # via # -r requirements/quality.txt - # openedx-django-pyfs # xblock-sdk idna==3.7 # via @@ -156,10 +153,6 @@ jmespath==1.0.1 # -r requirements/quality.txt # boto3 # botocore -lazy==1.6 - # via - # -r requirements/quality.txt - # xblock lxml[html-clean]==5.2.2 # via # -r requirements/quality.txt @@ -175,7 +168,6 @@ mako==1.3.5 # via # -r requirements/quality.txt # xblock - # xblock-utils markdown-it-py==3.0.0 # via # -r requirements/quality.txt @@ -194,10 +186,6 @@ mdurl==0.1.2 # via # -r requirements/quality.txt # markdown-it-py -openedx-django-pyfs==3.6.0 - # via - # -r requirements/quality.txt - # xblock packaging==24.1 # via # -r requirements/ci.txt @@ -326,7 +314,6 @@ simplejson==3.19.2 # -r requirements/quality.txt # xblock # xblock-sdk - # xblock-utils six==1.16.0 # via # -r requirements/quality.txt @@ -374,7 +361,6 @@ web-fragments==2.2.0 # -r requirements/quality.txt # xblock # xblock-sdk - # xblock-utils webob==1.8.7 # via # -r requirements/quality.txt @@ -384,15 +370,12 @@ wheel==0.43.0 # via # -r requirements/pip-tools.txt # pip-tools -xblock[django]==4.0.1 +xblock==4.0.1 # via # -r requirements/quality.txt # xblock-sdk - # xblock-utils xblock-sdk==0.11.0 # via -r requirements/quality.txt -xblock-utils==4.0.0 - # via -r requirements/quality.txt # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/doc.txt b/requirements/doc.txt index cb42bd1..36f502e 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -32,11 +32,11 @@ binaryornot==0.4.4 # via # -r requirements/test.txt # cookiecutter -boto3==1.34.139 +boto3==1.34.140 # via # -r requirements/test.txt # fs-s3fs -botocore==1.34.139 +botocore==1.34.140 # via # -r requirements/test.txt # boto3 @@ -77,7 +77,6 @@ django==4.2.13 # django-appconf # django-statici18n # edx-i18n-tools - # openedx-django-pyfs # xblock-sdk django-appconf==1.0.6 # via @@ -100,12 +99,10 @@ fs==2.4.16 # via # -r requirements/test.txt # fs-s3fs - # openedx-django-pyfs # xblock fs-s3fs==1.1.1 # via # -r requirements/test.txt - # openedx-django-pyfs # xblock-sdk idna==3.7 # via @@ -141,10 +138,6 @@ jmespath==1.0.1 # botocore keyring==25.2.1 # via twine -lazy==1.6 - # via - # -r requirements/test.txt - # xblock lxml[html-clean]==5.2.2 # via # -r requirements/test.txt @@ -160,7 +153,6 @@ mako==1.3.5 # via # -r requirements/test.txt # xblock - # xblock-utils markdown-it-py==3.0.0 # via # -r requirements/test.txt @@ -179,12 +171,8 @@ more-itertools==10.3.0 # via # jaraco-classes # jaraco-functools -nh3==0.2.17 +nh3==0.2.18 # via readme-renderer -openedx-django-pyfs==3.6.0 - # via - # -r requirements/test.txt - # xblock packaging==24.1 # via # -r requirements/test.txt @@ -288,7 +276,6 @@ simplejson==3.19.2 # -r requirements/test.txt # xblock # xblock-sdk - # xblock-utils six==1.16.0 # via # -r requirements/test.txt @@ -350,21 +337,17 @@ web-fragments==2.2.0 # -r requirements/test.txt # xblock # xblock-sdk - # xblock-utils webob==1.8.7 # via # -r requirements/test.txt # xblock # xblock-sdk -xblock[django]==4.0.1 +xblock==4.0.1 # via # -r requirements/test.txt # xblock-sdk - # xblock-utils xblock-sdk==0.11.0 # via -r requirements/test.txt -xblock-utils==4.0.0 - # via -r requirements/test.txt zipp==3.19.2 # via importlib-metadata diff --git a/requirements/pip.txt b/requirements/pip.txt index ff8ab2a..d8d6210 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -8,7 +8,7 @@ wheel==0.43.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==24.1.1 +pip==24.1.2 # via -r requirements/pip.in setuptools==70.2.0 # via -r requirements/pip.in diff --git a/requirements/quality.txt b/requirements/quality.txt index 0236525..7e6ce32 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -24,11 +24,11 @@ binaryornot==0.4.4 # via # -r requirements/test.txt # cookiecutter -boto3==1.34.139 +boto3==1.34.140 # via # -r requirements/test.txt # fs-s3fs -botocore==1.34.139 +botocore==1.34.140 # via # -r requirements/test.txt # boto3 @@ -75,7 +75,6 @@ django==4.2.13 # django-appconf # django-statici18n # edx-i18n-tools - # openedx-django-pyfs # xblock-sdk django-appconf==1.0.6 # via @@ -91,12 +90,10 @@ fs==2.4.16 # via # -r requirements/test.txt # fs-s3fs - # openedx-django-pyfs # xblock fs-s3fs==1.1.1 # via # -r requirements/test.txt - # openedx-django-pyfs # xblock-sdk idna==3.7 # via @@ -120,10 +117,6 @@ jmespath==1.0.1 # -r requirements/test.txt # boto3 # botocore -lazy==1.6 - # via - # -r requirements/test.txt - # xblock lxml[html-clean]==5.2.2 # via # -r requirements/test.txt @@ -139,7 +132,6 @@ mako==1.3.5 # via # -r requirements/test.txt # xblock - # xblock-utils markdown-it-py==3.0.0 # via # -r requirements/test.txt @@ -156,10 +148,6 @@ mdurl==0.1.2 # via # -r requirements/test.txt # markdown-it-py -openedx-django-pyfs==3.6.0 - # via - # -r requirements/test.txt - # xblock packaging==24.1 # via # -r requirements/test.txt @@ -257,7 +245,6 @@ simplejson==3.19.2 # -r requirements/test.txt # xblock # xblock-sdk - # xblock-utils six==1.16.0 # via # -r requirements/test.txt @@ -295,21 +282,17 @@ web-fragments==2.2.0 # -r requirements/test.txt # xblock # xblock-sdk - # xblock-utils webob==1.8.7 # via # -r requirements/test.txt # xblock # xblock-sdk -xblock[django]==4.0.1 +xblock==4.0.1 # via # -r requirements/test.txt # xblock-sdk - # xblock-utils xblock-sdk==0.11.0 # via -r requirements/test.txt -xblock-utils==4.0.0 - # via -r requirements/test.txt # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/test.txt b/requirements/test.txt index 29f754f..595f673 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -16,13 +16,10 @@ asgiref==3.8.1 # django binaryornot==0.4.4 # via cookiecutter -boto3==1.34.139 +boto3==1.34.140 + # via fs-s3fs +botocore==1.34.140 # via - # -r requirements/base.txt - # fs-s3fs -botocore==1.34.139 - # via - # -r requirements/base.txt # boto3 # s3transfer certifi==2024.7.4 @@ -47,7 +44,6 @@ coverage[toml]==7.5.4 # django-appconf # django-statici18n # edx-i18n-tools - # openedx-django-pyfs # xblock-sdk django-appconf==1.0.6 # via @@ -61,13 +57,9 @@ fs==2.4.16 # via # -r requirements/base.txt # fs-s3fs - # openedx-django-pyfs # xblock fs-s3fs==1.1.1 - # via - # -r requirements/base.txt - # openedx-django-pyfs - # xblock-sdk + # via xblock-sdk idna==3.7 # via requests iniconfig==2.0.0 @@ -78,13 +70,8 @@ jinja2==3.1.4 # cookiecutter jmespath==1.0.1 # via - # -r requirements/base.txt # boto3 # botocore -lazy==1.6 - # via - # -r requirements/base.txt - # xblock lxml[html-clean]==5.2.2 # via # -r requirements/base.txt @@ -100,7 +87,6 @@ mako==1.3.5 # via # -r requirements/base.txt # xblock - # xblock-utils markdown-it-py==3.0.0 # via rich markupsafe==2.1.5 @@ -111,10 +97,6 @@ markupsafe==2.1.5 # xblock mdurl==0.1.2 # via markdown-it-py -openedx-django-pyfs==3.6.0 - # via - # -r requirements/base.txt - # xblock packaging==24.1 # via pytest path==16.14.0 @@ -169,15 +151,12 @@ requests==2.32.3 rich==13.7.1 # via cookiecutter s3transfer==0.10.2 - # via - # -r requirements/base.txt - # boto3 + # via boto3 simplejson==3.19.2 # via # -r requirements/base.txt # xblock # xblock-sdk - # xblock-utils six==1.16.0 # via # -r requirements/base.txt @@ -196,7 +175,6 @@ types-python-dateutil==2.9.0.20240316 # via arrow urllib3==2.2.2 # via - # -r requirements/base.txt # botocore # requests web-fragments==2.2.0 @@ -204,21 +182,17 @@ web-fragments==2.2.0 # -r requirements/base.txt # xblock # xblock-sdk - # xblock-utils webob==1.8.7 # via # -r requirements/base.txt # xblock # xblock-sdk -xblock[django]==4.0.1 +xblock==4.0.1 # via # -r requirements/base.txt # xblock-sdk - # xblock-utils xblock-sdk==0.11.0 # via -r requirements/test.in -xblock-utils==4.0.0 - # via -r requirements/base.txt # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/setup.py b/setup.py index 12f203e..cb91302 100755 --- a/setup.py +++ b/setup.py @@ -196,10 +196,9 @@ def package_data(pkg, roots, sub_roots): # _xblock suffix is added for testing only. "annotatable_xblock = xblocks_contrib:AnnotatableXBlock", "poll_xblock = xblocks_contrib:PollXBlock", - "word_cloud_xblock = xblocks_contrib:WordCloudXBlock", ] }, package_data=package_data( - "xblocks_contrib", ["annotatable", "poll", "wordcloud"], ["static", "public"] + "xblocks_contrib", ["annotatable", "poll"], ["static", "public"] ), ) diff --git a/test_utils/__init__.py b/test_utils/__init__.py deleted file mode 100644 index 7961e47..0000000 --- a/test_utils/__init__.py +++ /dev/null @@ -1,10 +0,0 @@ -""" -Test utilities. - -Since pytest discourages putting __init__.py into testdirectory -(i.e. making tests a package) one cannot import from anywhere -under tests folder. However, some utility classes/methods might be useful -in multiple test modules (i.e. factoryboy factories, base test classes). - -So this package is the place to put them. -""" diff --git a/tests/test_annotatable.py b/tests/test_annotatable.py index ebc99f3..aec2bb5 100644 --- a/tests/test_annotatable.py +++ b/tests/test_annotatable.py @@ -1,26 +1,26 @@ """ -Tests for PollXBlock +Tests for AnnotatableXBlock """ from django.test import TestCase from xblock.fields import ScopeIds from xblock.test.toy_runtime import ToyRuntime -from xblocks_contrib import PollXBlock +from xblocks_contrib import AnnotatableXBlock -class TestPollXBlock(TestCase): - """Tests for PollXBlock""" +class TestAnnotatableXBlock(TestCase): + """Tests for AnnotatableXBlock""" def test_my_student_view(self): """Test the basic view loads.""" scope_ids = ScopeIds("1", "2", "3", "4") - block = PollXBlock(ToyRuntime(), scope_ids=scope_ids) + block = AnnotatableXBlock(ToyRuntime(), scope_ids=scope_ids) frag = block.student_view() as_dict = frag.to_dict() content = as_dict["content"] self.assertIn( - "PollXBlock: count is now", + "AnnotatableXBlock: count is now", content, "XBlock did not render correct student view", ) diff --git a/tests/test_word_cloud.py b/tests/test_word_cloud.py deleted file mode 100644 index ebc99f3..0000000 --- a/tests/test_word_cloud.py +++ /dev/null @@ -1,26 +0,0 @@ -""" -Tests for PollXBlock -""" - -from django.test import TestCase -from xblock.fields import ScopeIds -from xblock.test.toy_runtime import ToyRuntime - -from xblocks_contrib import PollXBlock - - -class TestPollXBlock(TestCase): - """Tests for PollXBlock""" - - def test_my_student_view(self): - """Test the basic view loads.""" - scope_ids = ScopeIds("1", "2", "3", "4") - block = PollXBlock(ToyRuntime(), scope_ids=scope_ids) - frag = block.student_view() - as_dict = frag.to_dict() - content = as_dict["content"] - self.assertIn( - "PollXBlock: count is now", - content, - "XBlock did not render correct student view", - ) diff --git a/xblocks_contrib/__init__.py b/xblocks_contrib/__init__.py index 14ffec3..9115c00 100644 --- a/xblocks_contrib/__init__.py +++ b/xblocks_contrib/__init__.py @@ -4,6 +4,5 @@ from .annotatable import AnnotatableXBlock from .poll import PollXBlock -from .word_cloud import WordCloudXBlock __version__ = "0.1.0" diff --git a/xblocks_contrib/annotatable/__init__.py b/xblocks_contrib/annotatable/__init__.py index c9b3612..3c64eef 100644 --- a/xblocks_contrib/annotatable/__init__.py +++ b/xblocks_contrib/annotatable/__init__.py @@ -3,5 +3,3 @@ """ from .annotatable import AnnotatableXBlock - -__version__ = "0.1.0" diff --git a/xblocks_contrib/annotatable/annotatable.py b/xblocks_contrib/annotatable/annotatable.py index c704654..be4eee4 100644 --- a/xblocks_contrib/annotatable/annotatable.py +++ b/xblocks_contrib/annotatable/annotatable.py @@ -1,11 +1,9 @@ """TO-DO: Write a description of what this XBlock is.""" -import pkg_resources -from django.utils import translation +from importlib_resources import files from web_fragments.fragment import Fragment from xblock.core import XBlock from xblock.fields import Integer, Scope -from xblockutils.resources import ResourceLoader class AnnotatableXBlock(XBlock): @@ -25,8 +23,7 @@ class AnnotatableXBlock(XBlock): def resource_string(self, path): """Handy helper for getting resources from our kit.""" - data = pkg_resources.resource_string(__name__, path) - return data.decode("utf8") + return files(__name__).joinpath(path).read_text() # TO-DO: change this view to display your data your own way. def student_view(self, context=None): @@ -39,13 +36,6 @@ def student_view(self, context=None): frag = Fragment(html.format(self=self)) frag.add_css(self.resource_string("static/css/annotatable.css")) - # Add i18n js - statici18n_js_url = self._get_statici18n_js_url() - if statici18n_js_url: - frag.add_javascript_url( - self.runtime.local_resource_url(self, statici18n_js_url) - ) - frag.add_javascript(self.resource_string("static/js/src/annotatable.js")) frag.initialize_js("AnnotatableXBlock") return frag @@ -73,43 +63,16 @@ def workbench_scenarios(): return [ ( "AnnotatableXBlock", - """ + """ """, ), ( "Multiple AnnotatableXBlock", """ - - - + + + """, ), ] - - @staticmethod - def _get_statici18n_js_url(): - """ - Return the Javascript translation file for the currently selected language, if any. - - Defaults to English if available. - """ - locale_code = translation.get_language() - if locale_code is None: - return None - text_js = "public/js/translations/{locale_code}/text.js" - lang_code = locale_code.split("-")[0] - for code in (locale_code, lang_code, "en"): - loader = ResourceLoader(__name__) - if pkg_resources.resource_exists( - loader.module_name, text_js.format(locale_code=code) - ): - return text_js.format(locale_code=code) - return None - - @staticmethod - def get_dummy(): - """ - Generate initial i18n with dummy method. - """ - return translation.gettext_noop("Dummy") diff --git a/xblocks_contrib/poll/__init__.py b/xblocks_contrib/poll/__init__.py index 08b85b3..e39188f 100644 --- a/xblocks_contrib/poll/__init__.py +++ b/xblocks_contrib/poll/__init__.py @@ -3,5 +3,3 @@ """ from .poll import PollXBlock - -__version__ = "0.1.0" diff --git a/xblocks_contrib/poll/poll.py b/xblocks_contrib/poll/poll.py index 0739c4f..43dfc39 100644 --- a/xblocks_contrib/poll/poll.py +++ b/xblocks_contrib/poll/poll.py @@ -1,11 +1,9 @@ """TO-DO: Write a description of what this XBlock is.""" -import pkg_resources -from django.utils import translation +from importlib_resources import files from web_fragments.fragment import Fragment from xblock.core import XBlock from xblock.fields import Integer, Scope -from xblockutils.resources import ResourceLoader class PollXBlock(XBlock): @@ -25,8 +23,7 @@ class PollXBlock(XBlock): def resource_string(self, path): """Handy helper for getting resources from our kit.""" - data = pkg_resources.resource_string(__name__, path) - return data.decode("utf8") + return files(__name__).joinpath(path).read_text() # TO-DO: change this view to display your data your own way. def student_view(self, context=None): @@ -38,14 +35,6 @@ def student_view(self, context=None): html = self.resource_string("static/html/poll.html") frag = Fragment(html.format(self=self)) frag.add_css(self.resource_string("static/css/poll.css")) - - # Add i18n js - statici18n_js_url = self._get_statici18n_js_url() - if statici18n_js_url: - frag.add_javascript_url( - self.runtime.local_resource_url(self, statici18n_js_url) - ) - frag.add_javascript(self.resource_string("static/js/src/poll.js")) frag.initialize_js("PollXBlock") return frag @@ -73,43 +62,16 @@ def workbench_scenarios(): return [ ( "PollXBlock", - """ + """ """, ), ( "Multiple PollXBlock", """ - - - + + + """, ), ] - - @staticmethod - def _get_statici18n_js_url(): - """ - Return the Javascript translation file for the currently selected language, if any. - - Defaults to English if available. - """ - locale_code = translation.get_language() - if locale_code is None: - return None - text_js = "public/js/translations/{locale_code}/text.js" - lang_code = locale_code.split("-")[0] - for code in (locale_code, lang_code, "en"): - loader = ResourceLoader(__name__) - if pkg_resources.resource_exists( - loader.module_name, text_js.format(locale_code=code) - ): - return text_js.format(locale_code=code) - return None - - @staticmethod - def get_dummy(): - """ - Generate initial i18n with dummy method. - """ - return translation.gettext_noop("Dummy") diff --git a/xblocks_contrib/word_cloud/.tx/config b/xblocks_contrib/word_cloud/.tx/config deleted file mode 100644 index 3d7b52d..0000000 --- a/xblocks_contrib/word_cloud/.tx/config +++ /dev/null @@ -1,8 +0,0 @@ -[main] -host = https://www.transifex.com - -[o:open-edx:p:p:xblocks:r:word_cloud] -file_filter = word_cloud/translations//LC_MESSAGES/text.po -source_file = word_cloud/translations/en/LC_MESSAGES/text.po -source_lang = en -type = PO diff --git a/xblocks_contrib/word_cloud/__init__.py b/xblocks_contrib/word_cloud/__init__.py deleted file mode 100644 index 2da9a41..0000000 --- a/xblocks_contrib/word_cloud/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -""" -Init for the WordCloudXBlock package. -""" - -from .word_cloud import WordCloudXBlock - -__version__ = "0.1.0" diff --git a/xblocks_contrib/word_cloud/conf/locale/__init__.py b/xblocks_contrib/word_cloud/conf/locale/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/xblocks_contrib/word_cloud/conf/locale/config.yaml b/xblocks_contrib/word_cloud/conf/locale/config.yaml deleted file mode 100644 index 4bfb0ca..0000000 --- a/xblocks_contrib/word_cloud/conf/locale/config.yaml +++ /dev/null @@ -1,93 +0,0 @@ -# Configuration for i18n workflow. - -locales: - - en # English - Source Language - # - am # Amharic - - ar # Arabic - # - az # Azerbaijani - # - bg_BG # Bulgarian (Bulgaria) - # - bn_BD # Bengali (Bangladesh) - # - bn_IN # Bengali (India) - # - bs # Bosnian - # - ca # Catalan - # - ca@valencia # Catalan (Valencia) - # - cs # Czech - # - cy # Welsh - # - da # Danish - # - de_DE # German (Germany) - # - el # Greek - # - en_GB # English (United Kingdom) - # # Don't pull these until we figure out why pages randomly display in these locales, - # # when the user's browser is in English and the user is not logged in. - # #- en@lolcat # LOLCAT English - # #- en@pirate # Pirate English - - es_419 # Spanish (Latin America) - # - es_AR # Spanish (Argentina) - # - es_EC # Spanish (Ecuador) - # - es_ES # Spanish (Spain) - # - es_MX # Spanish (Mexico) - # - es_PE # Spanish (Peru) - # - et_EE # Estonian (Estonia) - # - eu_ES # Basque (Spain) - # - fa # Persian - # - fa_IR # Persian (Iran) - # - fi_FI # Finnish (Finland) - # - fil # Filipino - - fr # French - # - gl # Galician - # - gu # Gujarati - - he # Hebrew - - hi # Hindi - # - hr # Croatian - # - hu # Hungarian - # - hy_AM # Armenian (Armenia) - # - id # Indonesian - # - it_IT # Italian (Italy) - # - ja_JP # Japanese (Japan) - # - kk_KZ # Kazakh (Kazakhstan) - # - km_KH # Khmer (Cambodia) - # - kn # Kannada - - ko_KR # Korean (Korea) - # - lt_LT # Lithuanian (Lithuania) - # - ml # Malayalam - # - mn # Mongolian - # - mr # Marathi - # - ms # Malay - # - nb # Norwegian Bokmål - # - ne # Nepali - # - nl_NL # Dutch (Netherlands) - # - or # Oriya - # - pl # Polish - - pt_BR # Portuguese (Brazil) - # - pt_PT # Portuguese (Portugal) - # - ro # Romanian - - ru # Russian - # - si # Sinhala - # - sk # Slovak - # - sl # Slovenian - # - sq # Albanian - # - sr # Serbian - # - sv # Swedish - # - sw # Swahili - # - ta # Tamil - # - te # Telugu - # - th # Thai - # - tr_TR # Turkish (Turkey) - # - uk # Ukranian - # - ur # Urdu - # - uz # Uzbek - # - vi # Vietnamese - - zh_CN # Chinese (China) - # - zh_HK # Chinese (Hong Kong) - # - zh_TW # Chinese (Taiwan) - - -# The locales used for fake-accented English, for testing. -dummy_locales: - - eo - - rtl # Fake testing language for Arabic - -# Directories we don't search for strings. -ignore_dirs: - - '*/css' - - 'public/js/translations' diff --git a/xblocks_contrib/word_cloud/static/README.txt b/xblocks_contrib/word_cloud/static/README.txt deleted file mode 100644 index 0472ef6..0000000 --- a/xblocks_contrib/word_cloud/static/README.txt +++ /dev/null @@ -1,19 +0,0 @@ -This static directory is for files that should be included in your kit as plain -static files. - -You can ask the runtime for a URL that will retrieve these files with: - - url = self.runtime.local_resource_url(self, "static/js/lib.js") - -The default implementation is very strict though, and will not serve files from -the static directory. It will serve files from a directory named "public". -Create a directory alongside this one named "public", and put files there. -Then you can get a url with code like this: - - url = self.runtime.local_resource_url(self, "public/js/lib.js") - -The sample code includes a function you can use to read the content of files -in the static directory, like this: - - frag.add_javascript(self.resource_string("static/js/my_block.js")) - diff --git a/xblocks_contrib/word_cloud/static/css/word_cloud.css b/xblocks_contrib/word_cloud/static/css/word_cloud.css deleted file mode 100644 index 64443fa..0000000 --- a/xblocks_contrib/word_cloud/static/css/word_cloud.css +++ /dev/null @@ -1,9 +0,0 @@ -/* CSS for WordCloudXBlock */ - -.word_cloud_xblock .count { - font-weight: bold; -} - -.word_cloud_xblock p { - cursor: pointer; -} diff --git a/xblocks_contrib/word_cloud/static/html/word_cloud.html b/xblocks_contrib/word_cloud/static/html/word_cloud.html deleted file mode 100644 index aa9e247..0000000 --- a/xblocks_contrib/word_cloud/static/html/word_cloud.html +++ /dev/null @@ -1,5 +0,0 @@ -
-

WordCloudXBlock: count is now - {self.count} (click me to increment). -

-
diff --git a/xblocks_contrib/word_cloud/static/js/src/word_cloud.js b/xblocks_contrib/word_cloud/static/js/src/word_cloud.js deleted file mode 100644 index a1ca578..0000000 --- a/xblocks_contrib/word_cloud/static/js/src/word_cloud.js +++ /dev/null @@ -1,33 +0,0 @@ -/* Javascript for WordCloudXBlock. */ -function WordCloudXBlock(runtime, element) { - - function updateCount(result) { - $('.count', element).text(result.count); - } - - var handlerUrl = runtime.handlerUrl(element, 'increment_count'); - - $('p', element).click(function(eventObject) { - $.ajax({ - type: "POST", - url: handlerUrl, - data: JSON.stringify({"hello": "world"}), - success: updateCount - }); - }); - - $(function ($) { - /* - Use `gettext` provided by django-statici18n for static translations - - var gettext = WordCloudXBlocki18n.gettext; - */ - - /* Here's where you'd do things on page load. */ - - // dummy_text is to have at least one string to translate in JS files. If you remove this line, - // and you don't have any other string to translate in JS files; then you must remove the (--merge-po-files) - // option from the "extract_translations" command in the Makefile - const dummy_text = gettext("Hello World"); - }); -} diff --git a/xblocks_contrib/word_cloud/translation b/xblocks_contrib/word_cloud/translation deleted file mode 120000 index bff8e44..0000000 --- a/xblocks_contrib/word_cloud/translation +++ /dev/null @@ -1 +0,0 @@ -/Users/irtaza.akram/openedx/edx-platform/src/xblocks-contrib/xblocks-contrib copy 2/xblocks-contrib/conf/locale \ No newline at end of file diff --git a/xblocks_contrib/word_cloud/word_cloud.py b/xblocks_contrib/word_cloud/word_cloud.py deleted file mode 100644 index a84bb2c..0000000 --- a/xblocks_contrib/word_cloud/word_cloud.py +++ /dev/null @@ -1,115 +0,0 @@ -"""TO-DO: Write a description of what this XBlock is.""" - -import pkg_resources -from django.utils import translation -from web_fragments.fragment import Fragment -from xblock.core import XBlock -from xblock.fields import Integer, Scope -from xblockutils.resources import ResourceLoader - - -class WordCloudXBlock(XBlock): - """ - TO-DO: document what your XBlock does. - """ - - # Fields are defined on the class. You can access them in your code as - # self.. - - # TO-DO: delete count, and define your own fields. - count = Integer( - default=0, - scope=Scope.user_state, - help="A simple counter, to show something happening", - ) - - def resource_string(self, path): - """Handy helper for getting resources from our kit.""" - data = pkg_resources.resource_string(__name__, path) - return data.decode("utf8") - - # TO-DO: change this view to display your data your own way. - def student_view(self, context=None): - """ - Create primary view of the WordCloudXBlock, shown to students when viewing courses. - """ - if context: - pass # TO-DO: do something based on the context. - html = self.resource_string("static/html/word_cloud.html") - frag = Fragment(html.format(self=self)) - frag.add_css(self.resource_string("static/css/word_cloud.css")) - - # Add i18n js - statici18n_js_url = self._get_statici18n_js_url() - if statici18n_js_url: - frag.add_javascript_url( - self.runtime.local_resource_url(self, statici18n_js_url) - ) - - frag.add_javascript(self.resource_string("static/js/src/word_cloud.js")) - frag.initialize_js("WordCloudXBlock") - return frag - - # TO-DO: change this handler to perform your own actions. You may need more - # than one handler, or you may not need any handlers at all. - @XBlock.json_handler - def increment_count(self, data, suffix=""): - """ - Increments data. An example handler. - """ - if suffix: - pass # TO-DO: Use the suffix when storing data. - # Just to show data coming in... - assert data["hello"] == "world" - - self.count += 1 - return {"count": self.count} - - # TO-DO: change this to create the scenarios you'd like to see in the - # workbench while developing your XBlock. - @staticmethod - def workbench_scenarios(): - """Create canned scenario for display in the workbench.""" - return [ - ( - "WordCloudXBlock", - """ - """, - ), - ( - "Multiple WordCloudXBlock", - """ - - - - - """, - ), - ] - - @staticmethod - def _get_statici18n_js_url(): - """ - Return the Javascript translation file for the currently selected language, if any. - - Defaults to English if available. - """ - locale_code = translation.get_language() - if locale_code is None: - return None - text_js = "public/js/translations/{locale_code}/text.js" - lang_code = locale_code.split("-")[0] - for code in (locale_code, lang_code, "en"): - loader = ResourceLoader(__name__) - if pkg_resources.resource_exists( - loader.module_name, text_js.format(locale_code=code) - ): - return text_js.format(locale_code=code) - return None - - @staticmethod - def get_dummy(): - """ - Generate initial i18n with dummy method. - """ - return translation.gettext_noop("Dummy") From 7835810ec97c967d896e24ca00a59d7c7f0bef2f Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Mon, 8 Jul 2024 16:36:41 +0500 Subject: [PATCH 03/22] fix: errors --- requirements/base.in | 2 +- requirements/base.txt | 33 ++++++++++++++++++---- requirements/dev.txt | 5 ++++ requirements/doc.txt | 5 ++++ requirements/quality.txt | 5 ++++ requirements/test.txt | 20 +++++++++++-- tox.ini | 4 +-- xblocks_contrib/annotatable/annotatable.py | 5 ++-- xblocks_contrib/poll/poll.py | 5 ++-- 9 files changed, 69 insertions(+), 15 deletions(-) diff --git a/requirements/base.in b/requirements/base.in index 9a57ef1..ec7381e 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -3,5 +3,5 @@ django-statici18n edx-i18n-tools -Mako XBlock +django-pyfs diff --git a/requirements/base.txt b/requirements/base.txt index e38b0a4..a377802 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -8,20 +8,38 @@ appdirs==1.4.4 # via fs asgiref==3.8.1 # via django +boto3==1.34.140 + # via fs-s3fs +botocore==1.34.140 + # via + # boto3 + # s3transfer django==4.2.13 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # django-appconf + # django-pyfs # django-statici18n # edx-i18n-tools django-appconf==1.0.6 # via django-statici18n +django-pyfs==3.2.0 + # via -r requirements/base.in django-statici18n==2.5.0 # via -r requirements/base.in edx-i18n-tools==1.6.0 # via -r requirements/base.in fs==2.4.16 - # via xblock + # via + # django-pyfs + # fs-s3fs + # xblock +fs-s3fs==1.1.1 + # via django-pyfs +jmespath==1.0.1 + # via + # boto3 + # botocore lxml[html-clean,html_clean]==5.2.2 # via # edx-i18n-tools @@ -30,9 +48,7 @@ lxml[html-clean,html_clean]==5.2.2 lxml-html-clean==0.1.1 # via lxml mako==1.3.5 - # via - # -r requirements/base.in - # xblock + # via xblock markupsafe==2.1.5 # via # mako @@ -42,21 +58,28 @@ path==16.14.0 polib==1.2.0 # via edx-i18n-tools python-dateutil==2.9.0.post0 - # via xblock + # via + # botocore + # xblock pytz==2024.1 # via xblock pyyaml==6.0.1 # via # edx-i18n-tools # xblock +s3transfer==0.10.2 + # via boto3 simplejson==3.19.2 # via xblock six==1.16.0 # via # fs + # fs-s3fs # python-dateutil sqlparse==0.5.0 # via django +urllib3==2.2.2 + # via botocore web-fragments==2.2.0 # via xblock webob==1.8.7 diff --git a/requirements/dev.txt b/requirements/dev.txt index 1c0e2cb..a46a47b 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -101,6 +101,7 @@ django==4.2.13 # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/quality.txt # django-appconf + # django-pyfs # django-statici18n # edx-i18n-tools # xblock-sdk @@ -108,6 +109,8 @@ django-appconf==1.0.6 # via # -r requirements/quality.txt # django-statici18n +django-pyfs==3.2.0 + # via -r requirements/quality.txt django-statici18n==2.5.0 # via -r requirements/quality.txt edx-i18n-tools==1.6.0 @@ -124,11 +127,13 @@ filelock==3.15.4 fs==2.4.16 # via # -r requirements/quality.txt + # django-pyfs # fs-s3fs # xblock fs-s3fs==1.1.1 # via # -r requirements/quality.txt + # django-pyfs # xblock-sdk idna==3.7 # via diff --git a/requirements/doc.txt b/requirements/doc.txt index 36f502e..c3d1a25 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -75,6 +75,7 @@ django==4.2.13 # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt # django-appconf + # django-pyfs # django-statici18n # edx-i18n-tools # xblock-sdk @@ -82,6 +83,8 @@ django-appconf==1.0.6 # via # -r requirements/test.txt # django-statici18n +django-pyfs==3.2.0 + # via -r requirements/test.txt django-statici18n==2.5.0 # via -r requirements/test.txt doc8==1.1.1 @@ -98,11 +101,13 @@ edx-i18n-tools==1.6.0 fs==2.4.16 # via # -r requirements/test.txt + # django-pyfs # fs-s3fs # xblock fs-s3fs==1.1.1 # via # -r requirements/test.txt + # django-pyfs # xblock-sdk idna==3.7 # via diff --git a/requirements/quality.txt b/requirements/quality.txt index 7e6ce32..fb65b18 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -73,6 +73,7 @@ django==4.2.13 # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt # django-appconf + # django-pyfs # django-statici18n # edx-i18n-tools # xblock-sdk @@ -80,6 +81,8 @@ django-appconf==1.0.6 # via # -r requirements/test.txt # django-statici18n +django-pyfs==3.2.0 + # via -r requirements/test.txt django-statici18n==2.5.0 # via -r requirements/test.txt edx-i18n-tools==1.6.0 @@ -89,11 +92,13 @@ edx-lint==5.3.6 fs==2.4.16 # via # -r requirements/test.txt + # django-pyfs # fs-s3fs # xblock fs-s3fs==1.1.1 # via # -r requirements/test.txt + # django-pyfs # xblock-sdk idna==3.7 # via diff --git a/requirements/test.txt b/requirements/test.txt index 595f673..d498b8e 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -17,9 +17,12 @@ asgiref==3.8.1 binaryornot==0.4.4 # via cookiecutter boto3==1.34.140 - # via fs-s3fs + # via + # -r requirements/base.txt + # fs-s3fs botocore==1.34.140 # via + # -r requirements/base.txt # boto3 # s3transfer certifi==2024.7.4 @@ -42,6 +45,7 @@ coverage[toml]==7.5.4 # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.txt # django-appconf + # django-pyfs # django-statici18n # edx-i18n-tools # xblock-sdk @@ -49,6 +53,8 @@ django-appconf==1.0.6 # via # -r requirements/base.txt # django-statici18n +django-pyfs==3.2.0 + # via -r requirements/base.txt django-statici18n==2.5.0 # via -r requirements/base.txt edx-i18n-tools==1.6.0 @@ -56,10 +62,14 @@ edx-i18n-tools==1.6.0 fs==2.4.16 # via # -r requirements/base.txt + # django-pyfs # fs-s3fs # xblock fs-s3fs==1.1.1 - # via xblock-sdk + # via + # -r requirements/base.txt + # django-pyfs + # xblock-sdk idna==3.7 # via requests iniconfig==2.0.0 @@ -70,6 +80,7 @@ jinja2==3.1.4 # cookiecutter jmespath==1.0.1 # via + # -r requirements/base.txt # boto3 # botocore lxml[html-clean]==5.2.2 @@ -151,7 +162,9 @@ requests==2.32.3 rich==13.7.1 # via cookiecutter s3transfer==0.10.2 - # via boto3 + # via + # -r requirements/base.txt + # boto3 simplejson==3.19.2 # via # -r requirements/base.txt @@ -175,6 +188,7 @@ types-python-dateutil==2.9.0.20240316 # via arrow urllib3==2.2.2 # via + # -r requirements/base.txt # botocore # requests web-fragments==2.2.0 diff --git a/tox.ini b/tox.ini index b979155..7ffae9a 100644 --- a/tox.ini +++ b/tox.ini @@ -78,8 +78,8 @@ allowlist_externals = deps = -r{toxinidir}/requirements/quality.txt commands = - pylint xblocks_contrib test_utils manage.py + pylint xblocks_contrib manage.py pycodestyle xblocks_contrib manage.py pydocstyle xblocks_contrib manage.py - isort --check-only --diff test_utils xblocks_contrib manage.py + isort --check-only --diff xblocks_contrib manage.py make selfcheck diff --git a/xblocks_contrib/annotatable/annotatable.py b/xblocks_contrib/annotatable/annotatable.py index be4eee4..cfc9d37 100644 --- a/xblocks_contrib/annotatable/annotatable.py +++ b/xblocks_contrib/annotatable/annotatable.py @@ -1,6 +1,7 @@ """TO-DO: Write a description of what this XBlock is.""" -from importlib_resources import files +from importlib.resources import files + from web_fragments.fragment import Fragment from xblock.core import XBlock from xblock.fields import Integer, Scope @@ -23,7 +24,7 @@ class AnnotatableXBlock(XBlock): def resource_string(self, path): """Handy helper for getting resources from our kit.""" - return files(__name__).joinpath(path).read_text() + return files(__package__).joinpath(path).read_text() # TO-DO: change this view to display your data your own way. def student_view(self, context=None): diff --git a/xblocks_contrib/poll/poll.py b/xblocks_contrib/poll/poll.py index 43dfc39..10064e4 100644 --- a/xblocks_contrib/poll/poll.py +++ b/xblocks_contrib/poll/poll.py @@ -1,6 +1,7 @@ """TO-DO: Write a description of what this XBlock is.""" -from importlib_resources import files +from importlib.resources import files + from web_fragments.fragment import Fragment from xblock.core import XBlock from xblock.fields import Integer, Scope @@ -23,7 +24,7 @@ class PollXBlock(XBlock): def resource_string(self, path): """Handy helper for getting resources from our kit.""" - return files(__name__).joinpath(path).read_text() + return files(__package__).joinpath(path).read_text() # TO-DO: change this view to display your data your own way. def student_view(self, context=None): From 7b1cee1d9bbe599de466c46d61edf6b25c0ad4ad Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Thu, 11 Jul 2024 15:56:11 +0500 Subject: [PATCH 04/22] chore: add xblock script --- README.rst | 19 +++++ utils/config.yaml | 93 +++++++++++++++++++++ utils/create_xblock.sh | 180 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 292 insertions(+) create mode 100644 utils/config.yaml create mode 100755 utils/create_xblock.sh diff --git a/README.rst b/README.rst index 9085408..c3dcd93 100644 --- a/README.rst +++ b/README.rst @@ -1,6 +1,25 @@ core xblocks ############################# +Developing a new XBlock +*********************** + +There's a handy script `utils/create_xblock.sh` that you can use to create XBlock here. just run + + $ utils/create_xblock.sh + +It will ask for XBlock name and XBlock class name that you want to use. Just enter these values and XBlock should be ready +to work. + +Troubleshooting +*************** + +If faced with permission or access error run: + + $ chmod +x utils/create_xblock.sh + +and run it. + Testing with Docker ******************** diff --git a/utils/config.yaml b/utils/config.yaml new file mode 100644 index 0000000..4bfb0ca --- /dev/null +++ b/utils/config.yaml @@ -0,0 +1,93 @@ +# Configuration for i18n workflow. + +locales: + - en # English - Source Language + # - am # Amharic + - ar # Arabic + # - az # Azerbaijani + # - bg_BG # Bulgarian (Bulgaria) + # - bn_BD # Bengali (Bangladesh) + # - bn_IN # Bengali (India) + # - bs # Bosnian + # - ca # Catalan + # - ca@valencia # Catalan (Valencia) + # - cs # Czech + # - cy # Welsh + # - da # Danish + # - de_DE # German (Germany) + # - el # Greek + # - en_GB # English (United Kingdom) + # # Don't pull these until we figure out why pages randomly display in these locales, + # # when the user's browser is in English and the user is not logged in. + # #- en@lolcat # LOLCAT English + # #- en@pirate # Pirate English + - es_419 # Spanish (Latin America) + # - es_AR # Spanish (Argentina) + # - es_EC # Spanish (Ecuador) + # - es_ES # Spanish (Spain) + # - es_MX # Spanish (Mexico) + # - es_PE # Spanish (Peru) + # - et_EE # Estonian (Estonia) + # - eu_ES # Basque (Spain) + # - fa # Persian + # - fa_IR # Persian (Iran) + # - fi_FI # Finnish (Finland) + # - fil # Filipino + - fr # French + # - gl # Galician + # - gu # Gujarati + - he # Hebrew + - hi # Hindi + # - hr # Croatian + # - hu # Hungarian + # - hy_AM # Armenian (Armenia) + # - id # Indonesian + # - it_IT # Italian (Italy) + # - ja_JP # Japanese (Japan) + # - kk_KZ # Kazakh (Kazakhstan) + # - km_KH # Khmer (Cambodia) + # - kn # Kannada + - ko_KR # Korean (Korea) + # - lt_LT # Lithuanian (Lithuania) + # - ml # Malayalam + # - mn # Mongolian + # - mr # Marathi + # - ms # Malay + # - nb # Norwegian Bokmål + # - ne # Nepali + # - nl_NL # Dutch (Netherlands) + # - or # Oriya + # - pl # Polish + - pt_BR # Portuguese (Brazil) + # - pt_PT # Portuguese (Portugal) + # - ro # Romanian + - ru # Russian + # - si # Sinhala + # - sk # Slovak + # - sl # Slovenian + # - sq # Albanian + # - sr # Serbian + # - sv # Swedish + # - sw # Swahili + # - ta # Tamil + # - te # Telugu + # - th # Thai + # - tr_TR # Turkish (Turkey) + # - uk # Ukranian + # - ur # Urdu + # - uz # Uzbek + # - vi # Vietnamese + - zh_CN # Chinese (China) + # - zh_HK # Chinese (Hong Kong) + # - zh_TW # Chinese (Taiwan) + + +# The locales used for fake-accented English, for testing. +dummy_locales: + - eo + - rtl # Fake testing language for Arabic + +# Directories we don't search for strings. +ignore_dirs: + - '*/css' + - 'public/js/translations' diff --git a/utils/create_xblock.sh b/utils/create_xblock.sh new file mode 100755 index 0000000..3b2fb68 --- /dev/null +++ b/utils/create_xblock.sh @@ -0,0 +1,180 @@ +#!/bin/bash + +# Function to insert entry in alphabetical order in setup.py under "xblock.v1" +insert_in_alphabetical_order() { + local entry="$1" + local setup_file="$2" + + awk -v new_entry="$entry" ' + BEGIN { added = 0; indent = "" } + /entry_points/ { print; next } + /"xblock.v1"/ { + print; + getline + if (match($0, /^[ \t]+/)) { + indent = substr($0, RSTART, RLENGTH) + } + while (getline > 0) { + if ($0 ~ /^\s*\]/) { + if (added == 0) { + print indent new_entry "," + added = 1 + } + print + next + } + if (added == 0 && $0 > indent new_entry) { + print indent new_entry "," + added = 1 + } + print + } + next + } + { print } + ' "$setup_file" > temp_setup.py && mv temp_setup.py "$setup_file" +} + +# Function to insert import before __version__ variable in __init__.py +insert_import_before_version() { + local import_entry="$1" + local init_file="$2" + + awk -v new_import="$import_entry" ' + BEGIN { added = 0 } + { + if (added == 0 && /^__version__/) { + print new_import + print "" + added = 1 + } + print + } + ' "$init_file" > temp_init.py && mv temp_init.py "$init_file" +} + +# Prompt user for input +read -p "Enter XBlock name: " xblock_name +read -p "Enter XBlock class: " xblock_class + +# Define paths and filenames +base_dir="xblocks_contrib/$xblock_name" +init_file="$base_dir/__init__.py" +xblock_file="$base_dir/$xblock_name.py" +tx_dir="$base_dir/.tx" +static_dir="$base_dir/static" +css_file="$static_dir/css/$xblock_name.css" +js_file="$static_dir/js/$xblock_name.js" +templates_dir="$base_dir/templates" +html_file="$templates_dir/$xblock_name.html" +setup_file="setup.py" +main_init_file="xblocks_contrib/__init__.py" +conf_locale_dir="$base_dir/conf/locale" +utils_config_file="utils/config.yaml" + +# Create directories +mkdir -p "$base_dir" "$tx_dir" "$static_dir/css" "$static_dir/js" "$templates_dir" "$conf_locale_dir" + +# Create empty files +touch "$init_file" "$xblock_file" "$css_file" "$js_file" "$html_file" "$conf_locale_dir/__init__.py" + +# Copy config.yaml from utils folder to conf/locale +if [ -f "$utils_config_file" ]; then + cp "$utils_config_file" "$conf_locale_dir/" +else + echo "Warning: $utils_config_file does not exist." +fi + +# Add content to xblock_name/xblock_name.py +cat > "$xblock_file" <. + + def resource_string(self, path): + """Handy helper for getting resources from our kit.""" + return files(__package__).joinpath(path).read_text() + + # TO-DO: change this view to display your data your own way. + def student_view(self, context=None): + """ + Create primary view of the XBlock class, shown to students when viewing courses. + """ + if context: + pass # TO-DO: do something based on the context. + html = self.resource_string("static/html/$xblock_name.html") + frag = Fragment(html.format(self=self)) + frag.add_css(self.resource_string("static/css/$xblock_name.css")) + + frag.add_javascript(self.resource_string("static/js/src/$xblock_name.js")) + frag.initialize_js("$xblock_class") + return frag + + + # TO-DO: change this to create the scenarios you'd like to see in the + # workbench while developing your XBlock. + @staticmethod + def workbench_scenarios(): + """Create canned scenario for display in the workbench.""" + return [ + ( + "$xblock_class", + """<$xblock_name/> + """, + ), + ( + "Multiple $xblock_class", + """ + <$xblock_name/> + <$xblock_name/> + <$xblock_name/> + + """, + ), + ] +EOL + +# Add content to templates/xblock_name.html +cat > "$html_file" < + + +EOL + +# Add config file to .tx folder +cat > "$tx_dir/config" </LC_MESSAGES/text.po +source_file = $xblock_name/translations/en/LC_MESSAGES/text.po +source_lang = en +type = PO +EOL + +# Update setup.py +entry="\"$xblock_name = xblocks_contrib:$xblock_class\"" +insert_in_alphabetical_order "$entry" "$setup_file" + +# Update xblocks_contrib/__init__.py +import_entry="from .${xblock_name} import ${xblock_class}" +insert_import_before_version "$import_entry" "$main_init_file" + +# Update xblock_name/__init__.py +echo "$import_entry" > "$init_file" + +echo "XBlock $xblock_name with class $xblock_class created successfully." From 1ae58cbe8b60892dc68bc1e334411383d2b44f41 Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Wed, 24 Jul 2024 15:54:57 +0500 Subject: [PATCH 05/22] fix: remove annotatable xblock --- setup.py | 1 - tests/test_annotatable.py | 26 ------ xblocks_contrib/__init__.py | 1 - xblocks_contrib/annotatable/.tx/config | 8 -- xblocks_contrib/annotatable/__init__.py | 5 - xblocks_contrib/annotatable/annotatable.py | 79 ---------------- .../annotatable/conf/locale/__init__.py | 0 .../annotatable/conf/locale/config.yaml | 93 ------------------- xblocks_contrib/annotatable/static/README.txt | 19 ---- .../annotatable/static/css/annotatable.css | 9 -- .../annotatable/static/html/annotatable.html | 5 - .../annotatable/static/js/src/annotatable.js | 33 ------- xblocks_contrib/annotatable/translation | 1 - 13 files changed, 280 deletions(-) delete mode 100644 tests/test_annotatable.py delete mode 100644 xblocks_contrib/annotatable/.tx/config delete mode 100644 xblocks_contrib/annotatable/__init__.py delete mode 100644 xblocks_contrib/annotatable/annotatable.py delete mode 100644 xblocks_contrib/annotatable/conf/locale/__init__.py delete mode 100644 xblocks_contrib/annotatable/conf/locale/config.yaml delete mode 100644 xblocks_contrib/annotatable/static/README.txt delete mode 100644 xblocks_contrib/annotatable/static/css/annotatable.css delete mode 100644 xblocks_contrib/annotatable/static/html/annotatable.html delete mode 100644 xblocks_contrib/annotatable/static/js/src/annotatable.js delete mode 120000 xblocks_contrib/annotatable/translation diff --git a/setup.py b/setup.py index cb91302..b67eb52 100755 --- a/setup.py +++ b/setup.py @@ -194,7 +194,6 @@ def package_data(pkg, roots, sub_roots): entry_points={ "xblock.v1": [ # _xblock suffix is added for testing only. - "annotatable_xblock = xblocks_contrib:AnnotatableXBlock", "poll_xblock = xblocks_contrib:PollXBlock", ] }, diff --git a/tests/test_annotatable.py b/tests/test_annotatable.py deleted file mode 100644 index aec2bb5..0000000 --- a/tests/test_annotatable.py +++ /dev/null @@ -1,26 +0,0 @@ -""" -Tests for AnnotatableXBlock -""" - -from django.test import TestCase -from xblock.fields import ScopeIds -from xblock.test.toy_runtime import ToyRuntime - -from xblocks_contrib import AnnotatableXBlock - - -class TestAnnotatableXBlock(TestCase): - """Tests for AnnotatableXBlock""" - - def test_my_student_view(self): - """Test the basic view loads.""" - scope_ids = ScopeIds("1", "2", "3", "4") - block = AnnotatableXBlock(ToyRuntime(), scope_ids=scope_ids) - frag = block.student_view() - as_dict = frag.to_dict() - content = as_dict["content"] - self.assertIn( - "AnnotatableXBlock: count is now", - content, - "XBlock did not render correct student view", - ) diff --git a/xblocks_contrib/__init__.py b/xblocks_contrib/__init__.py index 9115c00..de30a8e 100644 --- a/xblocks_contrib/__init__.py +++ b/xblocks_contrib/__init__.py @@ -2,7 +2,6 @@ Init for the xblocks_contrib package. """ -from .annotatable import AnnotatableXBlock from .poll import PollXBlock __version__ = "0.1.0" diff --git a/xblocks_contrib/annotatable/.tx/config b/xblocks_contrib/annotatable/.tx/config deleted file mode 100644 index 5f1f3f6..0000000 --- a/xblocks_contrib/annotatable/.tx/config +++ /dev/null @@ -1,8 +0,0 @@ -[main] -host = https://www.transifex.com - -[o:open-edx:p:p:xblocks:r:annotatable] -file_filter = annotatable/translations//LC_MESSAGES/text.po -source_file = annotatable/translations/en/LC_MESSAGES/text.po -source_lang = en -type = PO diff --git a/xblocks_contrib/annotatable/__init__.py b/xblocks_contrib/annotatable/__init__.py deleted file mode 100644 index 3c64eef..0000000 --- a/xblocks_contrib/annotatable/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -""" -Init for the AnnotatableXBlock package. -""" - -from .annotatable import AnnotatableXBlock diff --git a/xblocks_contrib/annotatable/annotatable.py b/xblocks_contrib/annotatable/annotatable.py deleted file mode 100644 index cfc9d37..0000000 --- a/xblocks_contrib/annotatable/annotatable.py +++ /dev/null @@ -1,79 +0,0 @@ -"""TO-DO: Write a description of what this XBlock is.""" - -from importlib.resources import files - -from web_fragments.fragment import Fragment -from xblock.core import XBlock -from xblock.fields import Integer, Scope - - -class AnnotatableXBlock(XBlock): - """ - TO-DO: document what your XBlock does. - """ - - # Fields are defined on the class. You can access them in your code as - # self.. - - # TO-DO: delete count, and define your own fields. - count = Integer( - default=0, - scope=Scope.user_state, - help="A simple counter, to show something happening", - ) - - def resource_string(self, path): - """Handy helper for getting resources from our kit.""" - return files(__package__).joinpath(path).read_text() - - # TO-DO: change this view to display your data your own way. - def student_view(self, context=None): - """ - Create primary view of the AnnotatableXBlock, shown to students when viewing courses. - """ - if context: - pass # TO-DO: do something based on the context. - html = self.resource_string("static/html/annotatable.html") - frag = Fragment(html.format(self=self)) - frag.add_css(self.resource_string("static/css/annotatable.css")) - - frag.add_javascript(self.resource_string("static/js/src/annotatable.js")) - frag.initialize_js("AnnotatableXBlock") - return frag - - # TO-DO: change this handler to perform your own actions. You may need more - # than one handler, or you may not need any handlers at all. - @XBlock.json_handler - def increment_count(self, data, suffix=""): - """ - Increments data. An example handler. - """ - if suffix: - pass # TO-DO: Use the suffix when storing data. - # Just to show data coming in... - assert data["hello"] == "world" - - self.count += 1 - return {"count": self.count} - - # TO-DO: change this to create the scenarios you'd like to see in the - # workbench while developing your XBlock. - @staticmethod - def workbench_scenarios(): - """Create canned scenario for display in the workbench.""" - return [ - ( - "AnnotatableXBlock", - """ - """, - ), - ( - "Multiple AnnotatableXBlock", - """ - - - - - """, - ), - ] diff --git a/xblocks_contrib/annotatable/conf/locale/__init__.py b/xblocks_contrib/annotatable/conf/locale/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/xblocks_contrib/annotatable/conf/locale/config.yaml b/xblocks_contrib/annotatable/conf/locale/config.yaml deleted file mode 100644 index 4bfb0ca..0000000 --- a/xblocks_contrib/annotatable/conf/locale/config.yaml +++ /dev/null @@ -1,93 +0,0 @@ -# Configuration for i18n workflow. - -locales: - - en # English - Source Language - # - am # Amharic - - ar # Arabic - # - az # Azerbaijani - # - bg_BG # Bulgarian (Bulgaria) - # - bn_BD # Bengali (Bangladesh) - # - bn_IN # Bengali (India) - # - bs # Bosnian - # - ca # Catalan - # - ca@valencia # Catalan (Valencia) - # - cs # Czech - # - cy # Welsh - # - da # Danish - # - de_DE # German (Germany) - # - el # Greek - # - en_GB # English (United Kingdom) - # # Don't pull these until we figure out why pages randomly display in these locales, - # # when the user's browser is in English and the user is not logged in. - # #- en@lolcat # LOLCAT English - # #- en@pirate # Pirate English - - es_419 # Spanish (Latin America) - # - es_AR # Spanish (Argentina) - # - es_EC # Spanish (Ecuador) - # - es_ES # Spanish (Spain) - # - es_MX # Spanish (Mexico) - # - es_PE # Spanish (Peru) - # - et_EE # Estonian (Estonia) - # - eu_ES # Basque (Spain) - # - fa # Persian - # - fa_IR # Persian (Iran) - # - fi_FI # Finnish (Finland) - # - fil # Filipino - - fr # French - # - gl # Galician - # - gu # Gujarati - - he # Hebrew - - hi # Hindi - # - hr # Croatian - # - hu # Hungarian - # - hy_AM # Armenian (Armenia) - # - id # Indonesian - # - it_IT # Italian (Italy) - # - ja_JP # Japanese (Japan) - # - kk_KZ # Kazakh (Kazakhstan) - # - km_KH # Khmer (Cambodia) - # - kn # Kannada - - ko_KR # Korean (Korea) - # - lt_LT # Lithuanian (Lithuania) - # - ml # Malayalam - # - mn # Mongolian - # - mr # Marathi - # - ms # Malay - # - nb # Norwegian Bokmål - # - ne # Nepali - # - nl_NL # Dutch (Netherlands) - # - or # Oriya - # - pl # Polish - - pt_BR # Portuguese (Brazil) - # - pt_PT # Portuguese (Portugal) - # - ro # Romanian - - ru # Russian - # - si # Sinhala - # - sk # Slovak - # - sl # Slovenian - # - sq # Albanian - # - sr # Serbian - # - sv # Swedish - # - sw # Swahili - # - ta # Tamil - # - te # Telugu - # - th # Thai - # - tr_TR # Turkish (Turkey) - # - uk # Ukranian - # - ur # Urdu - # - uz # Uzbek - # - vi # Vietnamese - - zh_CN # Chinese (China) - # - zh_HK # Chinese (Hong Kong) - # - zh_TW # Chinese (Taiwan) - - -# The locales used for fake-accented English, for testing. -dummy_locales: - - eo - - rtl # Fake testing language for Arabic - -# Directories we don't search for strings. -ignore_dirs: - - '*/css' - - 'public/js/translations' diff --git a/xblocks_contrib/annotatable/static/README.txt b/xblocks_contrib/annotatable/static/README.txt deleted file mode 100644 index 0472ef6..0000000 --- a/xblocks_contrib/annotatable/static/README.txt +++ /dev/null @@ -1,19 +0,0 @@ -This static directory is for files that should be included in your kit as plain -static files. - -You can ask the runtime for a URL that will retrieve these files with: - - url = self.runtime.local_resource_url(self, "static/js/lib.js") - -The default implementation is very strict though, and will not serve files from -the static directory. It will serve files from a directory named "public". -Create a directory alongside this one named "public", and put files there. -Then you can get a url with code like this: - - url = self.runtime.local_resource_url(self, "public/js/lib.js") - -The sample code includes a function you can use to read the content of files -in the static directory, like this: - - frag.add_javascript(self.resource_string("static/js/my_block.js")) - diff --git a/xblocks_contrib/annotatable/static/css/annotatable.css b/xblocks_contrib/annotatable/static/css/annotatable.css deleted file mode 100644 index d3c8d81..0000000 --- a/xblocks_contrib/annotatable/static/css/annotatable.css +++ /dev/null @@ -1,9 +0,0 @@ -/* CSS for AnnotatableXBlock */ - -.annotatable_xblock .count { - font-weight: bold; -} - -.annotatable_xblock p { - cursor: pointer; -} diff --git a/xblocks_contrib/annotatable/static/html/annotatable.html b/xblocks_contrib/annotatable/static/html/annotatable.html deleted file mode 100644 index 937b84b..0000000 --- a/xblocks_contrib/annotatable/static/html/annotatable.html +++ /dev/null @@ -1,5 +0,0 @@ -
-

AnnotatableXBlock: count is now - {self.count} (click me to increment). -

-
diff --git a/xblocks_contrib/annotatable/static/js/src/annotatable.js b/xblocks_contrib/annotatable/static/js/src/annotatable.js deleted file mode 100644 index 7258480..0000000 --- a/xblocks_contrib/annotatable/static/js/src/annotatable.js +++ /dev/null @@ -1,33 +0,0 @@ -/* Javascript for AnnotatableXBlock. */ -function AnnotatableXBlock(runtime, element) { - - function updateCount(result) { - $('.count', element).text(result.count); - } - - var handlerUrl = runtime.handlerUrl(element, 'increment_count'); - - $('p', element).click(function(eventObject) { - $.ajax({ - type: "POST", - url: handlerUrl, - data: JSON.stringify({"hello": "world"}), - success: updateCount - }); - }); - - $(function ($) { - /* - Use `gettext` provided by django-statici18n for static translations - - var gettext = AnnotatableXBlocki18n.gettext; - */ - - /* Here's where you'd do things on page load. */ - - // dummy_text is to have at least one string to translate in JS files. If you remove this line, - // and you don't have any other string to translate in JS files; then you must remove the (--merge-po-files) - // option from the "extract_translations" command in the Makefile - const dummy_text = gettext("Hello World"); - }); -} diff --git a/xblocks_contrib/annotatable/translation b/xblocks_contrib/annotatable/translation deleted file mode 120000 index 717deaa..0000000 --- a/xblocks_contrib/annotatable/translation +++ /dev/null @@ -1 +0,0 @@ -/Users/irtaza.akram/openedx/edx-platform/src/xblocks-contrib/xblocks-contrib copy/xblocks-contrib/conf/locale \ No newline at end of file From 27e052babb47eff0d19f985975512cbe5eeace16 Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Wed, 24 Jul 2024 16:16:58 +0500 Subject: [PATCH 06/22] fix: review comments --- utils/create_xblock.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/create_xblock.sh b/utils/create_xblock.sh index 3b2fb68..d68ec2c 100755 --- a/utils/create_xblock.sh +++ b/utils/create_xblock.sh @@ -54,8 +54,8 @@ insert_import_before_version() { } # Prompt user for input -read -p "Enter XBlock name: " xblock_name -read -p "Enter XBlock class: " xblock_class +read -p "Enter XBlock name e.g thumbs: " xblock_name +read -p "Enter XBlock class e.g ThumbsXBlock: " xblock_class # Define paths and filenames base_dir="xblocks_contrib/$xblock_name" @@ -64,7 +64,7 @@ xblock_file="$base_dir/$xblock_name.py" tx_dir="$base_dir/.tx" static_dir="$base_dir/static" css_file="$static_dir/css/$xblock_name.css" -js_file="$static_dir/js/$xblock_name.js" +js_file="$static_dir/js/src/$xblock_name.js" templates_dir="$base_dir/templates" html_file="$templates_dir/$xblock_name.html" setup_file="setup.py" From 5dde2aea407a155702b9fc2dc316620cc83cd5ec Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Wed, 24 Jul 2024 17:31:10 +0500 Subject: [PATCH 07/22] fix: xblock path --- utils/create_xblock.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/create_xblock.sh b/utils/create_xblock.sh index d68ec2c..976a5f9 100755 --- a/utils/create_xblock.sh +++ b/utils/create_xblock.sh @@ -73,7 +73,7 @@ conf_locale_dir="$base_dir/conf/locale" utils_config_file="utils/config.yaml" # Create directories -mkdir -p "$base_dir" "$tx_dir" "$static_dir/css" "$static_dir/js" "$templates_dir" "$conf_locale_dir" +mkdir -p "$base_dir" "$tx_dir" "$static_dir/css" "$static_dir/js" "$static_dir/js/src" "$templates_dir" "$conf_locale_dir" # Create empty files touch "$init_file" "$xblock_file" "$css_file" "$js_file" "$html_file" "$conf_locale_dir/__init__.py" From 26207d4b31bc298ff8196aee85f704a6ef3c59b3 Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Wed, 24 Jul 2024 17:42:11 +0500 Subject: [PATCH 08/22] fix: xblock path --- utils/create_xblock.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/create_xblock.sh b/utils/create_xblock.sh index 976a5f9..ff832bd 100755 --- a/utils/create_xblock.sh +++ b/utils/create_xblock.sh @@ -115,7 +115,7 @@ class $xblock_class(XBlock): """ if context: pass # TO-DO: do something based on the context. - html = self.resource_string("static/html/$xblock_name.html") + html = self.resource_string("templates/$xblock_name.html") frag = Fragment(html.format(self=self)) frag.add_css(self.resource_string("static/css/$xblock_name.css")) @@ -150,7 +150,7 @@ EOL # Add content to templates/xblock_name.html cat > "$html_file" < - +Congratulations XBlock is running. EOL From b5c2a62f84193305b35bc89bce4edbb128cb18aa Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Wed, 24 Jul 2024 17:48:45 +0500 Subject: [PATCH 09/22] fix: add templates for package_data --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b67eb52..bf445de 100755 --- a/setup.py +++ b/setup.py @@ -198,6 +198,6 @@ def package_data(pkg, roots, sub_roots): ] }, package_data=package_data( - "xblocks_contrib", ["annotatable", "poll"], ["static", "public"] + "xblocks_contrib", ["annotatable", "poll"], ["static", "public", "templates"] ), ) From 0d2006a7ea6fc67c41b4ef0f623c61965629d701 Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Thu, 22 Aug 2024 11:28:55 +0500 Subject: [PATCH 10/22] fix: added translation & review changes --- .github/workflows/ci.yml | 4 +- .github/workflows/pypi-publish.yml | 2 +- .gitignore | 6 ++ .readthedocs.yaml | 2 +- Makefile | 53 +++++++++++----- README.rst | 6 +- docs/conf.py | 2 +- docs/decisions/0001-purpose-of-this-repo.rst | 39 ++---------- requirements/base.txt | 23 +++---- requirements/ci.txt | 6 +- requirements/dev.txt | 49 +++++++-------- requirements/doc.txt | 64 +++++++++----------- requirements/pip-tools.txt | 4 +- requirements/pip.txt | 8 +-- requirements/quality.txt | 41 ++++++------- requirements/test.txt | 29 ++++----- setup.py | 2 +- tests/test_poll.py | 12 ++-- tox.ini | 4 +- translation_settings.py | 6 +- xblocks_contrib/__init__.py | 2 +- xblocks_contrib/poll/__init__.py | 4 +- xblocks_contrib/poll/poll.py | 40 +++++++++--- xblocks_contrib/poll/static/css/poll.css | 2 +- xblocks_contrib/poll/static/html/poll.html | 2 +- xblocks_contrib/poll/static/js/src/poll.js | 6 +- 26 files changed, 206 insertions(+), 212 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f193a86..196e087 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: matrix: os: [ubuntu-20.04] python-version: ['3.11', '3.12'] - toxenv: [quality, docs, django42, django50] + toxenv: [quality, docs, django42, django51] steps: - uses: actions/checkout@v4 @@ -38,7 +38,7 @@ jobs: run: tox - name: Run coverage - if: matrix.python-version == '3.11' && matrix.toxenv == 'django42' + if: matrix.python-version == '3.12' && matrix.toxenv == 'django42' uses: codecov/codecov-action@v4 with: token: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml index a6c10dc..fa45483 100644 --- a/.github/workflows/pypi-publish.yml +++ b/.github/workflows/pypi-publish.yml @@ -15,7 +15,7 @@ jobs: - name: setup python uses: actions/setup-python@v5 with: - python-version: 3.11 + python-version: 3.12 - name: Install pip run: pip install -r requirements/pip.txt diff --git a/.gitignore b/.gitignore index 99a70ef..7ab8835 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,9 @@ docs/xblocks_contrib.*.rst # Private requirements requirements/private.in requirements/private.txt + +# Translations +*.mo +*.pot +*.po +*/translation diff --git a/.readthedocs.yaml b/.readthedocs.yaml index c9226ad..1d8cc9a 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -14,7 +14,7 @@ sphinx: build: os: "ubuntu-22.04" tools: - python: "3.11" + python: "3.12" python: install: diff --git a/Makefile b/Makefile index d0ad939..4b0b51b 100644 --- a/Makefile +++ b/Makefile @@ -51,31 +51,54 @@ dev.build: dev.run: dev.clean dev.build ## Clean, build and run test image docker run -p 8000:8000 -v $(CURDIR):/usr/local/src/$(REPO_NAME) --name $(REPO_NAME)-dev $(REPO_NAME)-dev -## Localization targets +# Auto-detect all XBlock directories +XBLOCKS=$(shell find $(PACKAGE_NAME) -maxdepth 2 -type d -name 'conf' -exec dirname {} \;) -extract_translations: ## extract strings to be translated, outputting .po files - cd $(PACKAGE_NAME) && i18n_tool extract --no-segment --merge-po-files - mv $(EXTRACT_DIR)/django.po $(EXTRACT_DIR)/text.po +## Localization targets -compile_translations: ## compile translation files, outputting .mo files for each supported language - cd $(PACKAGE_NAME) && i18n_tool generate - python manage.py compilejsi18n --namespace Xblocks-contribI18n --output $(JS_TARGET) +extract_translations: ## extract strings to be translated, outputting .po files for each XBlock + @for xblock in $(XBLOCKS); do \ + echo "Extracting translations for $$xblock..."; \ + cd $$xblock && i18n_tool extract --no-segment --merge-po-files; \ + if [ -f $(EXTRACT_DIR)/django.po ]; then \ + mv $(EXTRACT_DIR)/django.po $(EXTRACT_DIR)/text.po; \ + fi; \ + done + +compile_translations: ## compile translation files, outputting .mo files for each supported language for each XBlock + @for xblock in $(XBLOCKS); do \ + echo "Compiling translations for $$xblock..."; \ + cd $$xblock && i18n_tool generate; \ + python ../../manage.py compilejsi18n --namespace Xblocks-contribI18n --output $(JS_TARGET); \ + done detect_changed_source_translations: - cd $(PACKAGE_NAME) && i18n_tool changed + @for xblock in $(XBLOCKS); do \ + echo "Detecting changed translations for $$xblock..."; \ + cd $$xblock && i18n_tool changed; \ + done -dummy_translations: ## generate dummy translation (.po) files - cd $(PACKAGE_NAME) && i18n_tool dummy +dummy_translations: ## generate dummy translation (.po) files for each XBlock + @for xblock in $(XBLOCKS); do \ + echo "Generating dummy translations for $$xblock..."; \ + cd $$xblock && i18n_tool dummy; \ + done build_dummy_translations: dummy_translations compile_translations ## generate and compile dummy translation files validate_translations: build_dummy_translations detect_changed_source_translations ## validate translations -pull_translations: ## pull translations from transifex - cd $(PACKAGE_NAME) && i18n_tool transifex pull - -push_translations: extract_translations ## push translations to transifex - cd $(PACKAGE_NAME) && i18n_tool transifex push +pull_translations: ## pull translations from Transifex for each XBlock + @for xblock in $(XBLOCKS); do \ + echo "Pulling translations for $$xblock..."; \ + cd $$xblock && i18n_tool transifex pull; \ + done + +push_translations: extract_translations ## push translations to Transifex for each XBlock + @for xblock in $(XBLOCKS); do \ + echo "Pushing translations for $$xblock..."; \ + cd $$xblock && i18n_tool transifex push; \ + done install_transifex_client: ## Install the Transifex client # Instaling client will skip CHANGELOG and LICENSE files from git changes diff --git a/README.rst b/README.rst index c3dcd93..9cc28d4 100644 --- a/README.rst +++ b/README.rst @@ -90,7 +90,7 @@ These catalogs can be created by running:: The previous command will create the necessary ``.po`` files under ``xblocks-contrib/xblocks_contrib/conf/locale/en/LC_MESSAGES/text.po``. The ``text.po`` file is created from the ``django-partial.po`` file created by -``django-admin makemessages`` (`makemessages documentation `_), +``django-admin makemessages`` (`makemessages documentation `_), this is why you will not see a ``django-partial.po`` file. 3. Create language specific translations @@ -133,7 +133,7 @@ Once translations are in place, use the following Make target to compile the tra $ make compile_translations The previous command will compile ``.po`` files using -``django-admin compilemessages`` (`compilemessages documentation `_). +``django-admin compilemessages`` (`compilemessages documentation `_). After compiling the ``.po`` file(s), ``django-statici18n`` is used to create language specific catalogs. See ``django-statici18n`` `documentation `_ for more information. @@ -166,5 +166,5 @@ If there are any errors compiling ``.po`` files run the following command to val $ make validate See `django's i18n troubleshooting documentation -`_ +`_ for more information. diff --git a/docs/conf.py b/docs/conf.py index c6b5484..c8929ce 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -511,7 +511,7 @@ def get_version(*file_paths): # Example configuration for intersphinx: refer to the Python standard library. intersphinx_mapping = { - "python": ("https://docs.python.org/3.11", None), + "python": ("https://docs.python.org/3.12", None), } diff --git a/docs/decisions/0001-purpose-of-this-repo.rst b/docs/decisions/0001-purpose-of-this-repo.rst index d67cb89..049a685 100644 --- a/docs/decisions/0001-purpose-of-this-repo.rst +++ b/docs/decisions/0001-purpose-of-this-repo.rst @@ -6,52 +6,25 @@ Status **Draft** -.. TODO: When ready, update the status from Draft to Provisional or Accepted. - -.. Standard statuses - - **Draft** if the decision is newly proposed and in active discussion - - **Provisional** if the decision is still preliminary and in experimental phase - - **Accepted** *(date)* once it is agreed upon - - **Superseded** *(date)* with a reference to its replacement if a later ADR changes or reverses the decision - - If an ADR has Draft status and the PR is under review, you can either use the intended final status (e.g. Provisional, Accepted, etc.), or you can clarify both the current and intended status using something like the following: "Draft (=> Provisional)". Either of these options is especially useful if the merged status is not intended to be Accepted. - Context ******* -TODO: Add context of what led to the creation of this repo. - -.. This section describes the forces at play, including technological, political, social, and project local. These forces are probably in tension, and should be called out as such. The language in this section is value-neutral. It is simply describing facts. +XBlocks are currently embedded within the edx-platform. Over time, this has led to increased complexity and difficulties in maintaining and updating the platform, particularly as the platform has evolved. Decision ******** -We will create a repository... - -TODO: Clearly state how the context above led to the creation of this repo. - -.. This section describes our response to these forces. It is stated in full sentences, with active voice. "We will …" +The XBlocks will be extracted from the edx-platform and placed in this repository. Consequences ************ -TODO: Add what other things will change as a result of creating this repo. + - Easier refactoring, testing, and development of XBlocks. + - Simplified edx-platform leading to potential performance improvements and reduced complexity. -.. This section describes the resulting context, after applying the decision. All consequences should be listed here, not just the "positive" ones. A particular decision may have positive, negative, and neutral consequences, but all of them affect the team and project in the future. - -Rejected Alternatives -********************* - -TODO: If applicable, list viable alternatives to creating this new repo and give reasons for why they were rejected. If not applicable, remove section. - -.. This section lists alternate options considered, described briefly, with pros and cons. + - Potential challenges in synchronizing changes across multiple repositories. References ********** -TODO: If applicable, add any references. If not applicable, remove section. - -.. (Optional) List any additional references here that would be useful to the future reader. See `Documenting Architecture Decisions`_ and `OEP-19 on ADRs`_ for further input. - -.. _Documenting Architecture Decisions: https://cognitect.com/blog/2011/11/15/documenting-architecture-decisions -.. _OEP-19 on ADRs: https://open-edx-proposals.readthedocs.io/en/latest/best-practices/oep-0019-bp-developer-documentation.html#adrs +.. _edx-platform xblocks extraction: https://openedx.atlassian.net/wiki/x/A4Dn-/ diff --git a/requirements/base.txt b/requirements/base.txt index a377802..29de034 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade @@ -8,13 +8,13 @@ appdirs==1.4.4 # via fs asgiref==3.8.1 # via django -boto3==1.34.140 +boto3==1.34.159 # via fs-s3fs -botocore==1.34.140 +botocore==1.34.159 # via # boto3 # s3transfer -django==4.2.13 +django==4.2.15 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # django-appconf @@ -27,7 +27,7 @@ django-pyfs==3.2.0 # via -r requirements/base.in django-statici18n==2.5.0 # via -r requirements/base.in -edx-i18n-tools==1.6.0 +edx-i18n-tools==1.6.2 # via -r requirements/base.in fs==2.4.16 # via @@ -40,20 +40,17 @@ jmespath==1.0.1 # via # boto3 # botocore -lxml[html-clean,html_clean]==5.2.2 +lxml==5.3.0 # via # edx-i18n-tools - # lxml-html-clean # xblock -lxml-html-clean==0.1.1 - # via lxml mako==1.3.5 # via xblock markupsafe==2.1.5 # via # mako # xblock -path==16.14.0 +path==16.16.0 # via edx-i18n-tools polib==1.2.0 # via edx-i18n-tools @@ -63,7 +60,7 @@ python-dateutil==2.9.0.post0 # xblock pytz==2024.1 # via xblock -pyyaml==6.0.1 +pyyaml==6.0.2 # via # edx-i18n-tools # xblock @@ -76,7 +73,7 @@ six==1.16.0 # fs # fs-s3fs # python-dateutil -sqlparse==0.5.0 +sqlparse==0.5.1 # via django urllib3==2.2.2 # via botocore @@ -84,7 +81,7 @@ web-fragments==2.2.0 # via xblock webob==1.8.7 # via xblock -xblock==4.0.1 +xblock==5.0.0 # via -r requirements/base.in # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/ci.txt b/requirements/ci.txt index 5aa00d0..fd78c3f 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -1,10 +1,10 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade # -cachetools==5.3.3 +cachetools==5.4.0 # via tox chardet==5.2.0 # via tox @@ -28,7 +28,7 @@ pluggy==1.5.0 # via tox pyproject-api==1.7.1 # via tox -tox==4.16.0 +tox==4.17.1 # via -r requirements/ci.in virtualenv==20.26.3 # via tox diff --git a/requirements/dev.txt b/requirements/dev.txt index a46a47b..d2ea02b 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade @@ -16,7 +16,7 @@ asgiref==3.8.1 # via # -r requirements/quality.txt # django -astroid==3.2.2 +astroid==3.2.4 # via # -r requirements/quality.txt # pylint @@ -25,11 +25,11 @@ binaryornot==0.4.4 # via # -r requirements/quality.txt # cookiecutter -boto3==1.34.140 +boto3==1.34.159 # via # -r requirements/quality.txt # fs-s3fs -botocore==1.34.140 +botocore==1.34.159 # via # -r requirements/quality.txt # boto3 @@ -38,7 +38,7 @@ build==1.2.1 # via # -r requirements/pip-tools.txt # pip-tools -cachetools==5.3.3 +cachetools==5.4.0 # via # -r requirements/ci.txt # tox @@ -82,11 +82,11 @@ cookiecutter==2.6.0 # via # -r requirements/quality.txt # xblock-sdk -coverage[toml]==7.5.4 +coverage[toml]==7.6.1 # via # -r requirements/quality.txt # pytest-cov -diff-cover==9.1.0 +diff-cover==9.1.1 # via -r requirements/dev.in dill==0.3.8 # via @@ -96,7 +96,7 @@ distlib==0.3.8 # via # -r requirements/ci.txt # virtualenv -django==4.2.13 +django==4.2.15 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/quality.txt @@ -113,11 +113,11 @@ django-pyfs==3.2.0 # via -r requirements/quality.txt django-statici18n==2.5.0 # via -r requirements/quality.txt -edx-i18n-tools==1.6.0 +edx-i18n-tools==1.6.2 # via # -r requirements/dev.in # -r requirements/quality.txt -edx-lint==5.3.6 +edx-lint==5.3.7 # via -r requirements/quality.txt filelock==3.15.4 # via @@ -158,17 +158,12 @@ jmespath==1.0.1 # -r requirements/quality.txt # boto3 # botocore -lxml[html-clean]==5.2.2 +lxml==5.3.0 # via # -r requirements/quality.txt # edx-i18n-tools - # lxml-html-clean # xblock # xblock-sdk -lxml-html-clean==0.1.1 - # via - # -r requirements/quality.txt - # lxml mako==1.3.5 # via # -r requirements/quality.txt @@ -200,7 +195,7 @@ packaging==24.1 # pyproject-api # pytest # tox -path==16.14.0 +path==16.16.0 # via # -r requirements/quality.txt # edx-i18n-tools @@ -228,7 +223,7 @@ polib==1.2.0 # via # -r requirements/quality.txt # edx-i18n-tools -pycodestyle==2.12.0 +pycodestyle==2.12.1 # via -r requirements/quality.txt pydocstyle==6.3.0 # via -r requirements/quality.txt @@ -237,7 +232,7 @@ pygments==2.18.0 # -r requirements/quality.txt # diff-cover # rich -pylint==3.2.5 +pylint==3.2.6 # via # -r requirements/quality.txt # edx-lint @@ -270,7 +265,7 @@ pyproject-hooks==1.1.0 # -r requirements/pip-tools.txt # build # pip-tools -pytest==8.2.2 +pytest==8.3.2 # via # -r requirements/quality.txt # pytest-cov @@ -294,7 +289,7 @@ pytz==2024.1 # via # -r requirements/quality.txt # xblock -pyyaml==6.0.1 +pyyaml==6.0.2 # via # -r requirements/quality.txt # code-annotations @@ -330,7 +325,7 @@ snowballstemmer==2.2.0 # via # -r requirements/quality.txt # pydocstyle -sqlparse==0.5.0 +sqlparse==0.5.1 # via # -r requirements/quality.txt # django @@ -342,11 +337,11 @@ text-unidecode==1.3 # via # -r requirements/quality.txt # python-slugify -tomlkit==0.12.5 +tomlkit==0.13.0 # via # -r requirements/quality.txt # pylint -tox==4.16.0 +tox==4.17.1 # via -r requirements/ci.txt types-python-dateutil==2.9.0.20240316 # via @@ -371,15 +366,15 @@ webob==1.8.7 # -r requirements/quality.txt # xblock # xblock-sdk -wheel==0.43.0 +wheel==0.44.0 # via # -r requirements/pip-tools.txt # pip-tools -xblock==4.0.1 +xblock==5.0.0 # via # -r requirements/quality.txt # xblock-sdk -xblock-sdk==0.11.0 +xblock-sdk==0.12.0 # via -r requirements/quality.txt # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/doc.txt b/requirements/doc.txt index c3d1a25..e52abc7 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -1,12 +1,12 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade # accessible-pygments==0.0.5 # via pydata-sphinx-theme -alabaster==0.7.16 +alabaster==1.0.0 # via sphinx appdirs==1.4.4 # via @@ -20,23 +20,21 @@ asgiref==3.8.1 # via # -r requirements/test.txt # django -babel==2.15.0 +babel==2.16.0 # via # pydata-sphinx-theme # sphinx -backports-tarfile==1.2.0 - # via jaraco-context beautifulsoup4==4.12.3 # via pydata-sphinx-theme binaryornot==0.4.4 # via # -r requirements/test.txt # cookiecutter -boto3==1.34.140 +boto3==1.34.159 # via # -r requirements/test.txt # fs-s3fs -botocore==1.34.140 +botocore==1.34.159 # via # -r requirements/test.txt # boto3 @@ -66,11 +64,11 @@ cookiecutter==2.6.0 # via # -r requirements/test.txt # xblock-sdk -coverage[toml]==7.5.4 +coverage[toml]==7.6.1 # via # -r requirements/test.txt # pytest-cov -django==4.2.13 +django==4.2.15 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt @@ -96,7 +94,7 @@ docutils==0.20.1 # readme-renderer # restructuredtext-lint # sphinx -edx-i18n-tools==1.6.0 +edx-i18n-tools==1.6.2 # via -r requirements/test.txt fs==2.4.16 # via @@ -115,11 +113,8 @@ idna==3.7 # requests imagesize==1.4.1 # via sphinx -importlib-metadata==6.11.0 - # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt - # keyring - # twine +importlib-metadata==8.2.0 + # via twine iniconfig==2.0.0 # via # -r requirements/test.txt @@ -128,7 +123,7 @@ jaraco-classes==3.4.0 # via keyring jaraco-context==5.3.0 # via keyring -jaraco-functools==4.0.1 +jaraco-functools==4.0.2 # via keyring jinja2==3.1.4 # via @@ -141,19 +136,14 @@ jmespath==1.0.1 # -r requirements/test.txt # boto3 # botocore -keyring==25.2.1 +keyring==25.3.0 # via twine -lxml[html-clean]==5.2.2 +lxml==5.3.0 # via # -r requirements/test.txt # edx-i18n-tools - # lxml-html-clean # xblock # xblock-sdk -lxml-html-clean==0.1.1 - # via - # -r requirements/test.txt - # lxml mako==1.3.5 # via # -r requirements/test.txt @@ -172,7 +162,7 @@ mdurl==0.1.2 # via # -r requirements/test.txt # markdown-it-py -more-itertools==10.3.0 +more-itertools==10.4.0 # via # jaraco-classes # jaraco-functools @@ -185,7 +175,7 @@ packaging==24.1 # pydata-sphinx-theme # pytest # sphinx -path==16.14.0 +path==16.16.0 # via # -r requirements/test.txt # edx-i18n-tools @@ -220,7 +210,7 @@ pypng==0.20220715.0 # xblock-sdk pyproject-hooks==1.1.0 # via build -pytest==8.2.2 +pytest==8.3.2 # via # -r requirements/test.txt # pytest-cov @@ -244,7 +234,7 @@ pytz==2024.1 # via # -r requirements/test.txt # xblock -pyyaml==6.0.1 +pyyaml==6.0.2 # via # -r requirements/test.txt # code-annotations @@ -291,26 +281,26 @@ snowballstemmer==2.2.0 # via sphinx soupsieve==2.5 # via beautifulsoup4 -sphinx==7.3.7 +sphinx==8.0.2 # via # -r requirements/doc.in # pydata-sphinx-theme # sphinx-book-theme sphinx-book-theme==1.1.3 # via -r requirements/doc.in -sphinxcontrib-applehelp==1.0.8 +sphinxcontrib-applehelp==2.0.0 # via sphinx -sphinxcontrib-devhelp==1.0.6 +sphinxcontrib-devhelp==2.0.0 # via sphinx -sphinxcontrib-htmlhelp==2.0.5 +sphinxcontrib-htmlhelp==2.1.0 # via sphinx sphinxcontrib-jsmath==1.0.1 # via sphinx -sphinxcontrib-qthelp==1.0.7 +sphinxcontrib-qthelp==2.0.0 # via sphinx -sphinxcontrib-serializinghtml==1.1.10 +sphinxcontrib-serializinghtml==2.0.0 # via sphinx -sqlparse==0.5.0 +sqlparse==0.5.1 # via # -r requirements/test.txt # django @@ -347,13 +337,13 @@ webob==1.8.7 # -r requirements/test.txt # xblock # xblock-sdk -xblock==4.0.1 +xblock==5.0.0 # via # -r requirements/test.txt # xblock-sdk -xblock-sdk==0.11.0 +xblock-sdk==0.12.0 # via -r requirements/test.txt -zipp==3.19.2 +zipp==3.20.0 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index b544e9f..67b6039 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade @@ -16,7 +16,7 @@ pyproject-hooks==1.1.0 # via # build # pip-tools -wheel==0.43.0 +wheel==0.44.0 # via pip-tools # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip.txt b/requirements/pip.txt index d8d6210..11fc328 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,14 +1,14 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade # -wheel==0.43.0 +wheel==0.44.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==24.1.2 +pip==24.2 # via -r requirements/pip.in -setuptools==70.2.0 +setuptools==72.1.0 # via -r requirements/pip.in diff --git a/requirements/quality.txt b/requirements/quality.txt index fb65b18..1ddcaae 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade @@ -16,7 +16,7 @@ asgiref==3.8.1 # via # -r requirements/test.txt # django -astroid==3.2.2 +astroid==3.2.4 # via # pylint # pylint-celery @@ -24,11 +24,11 @@ binaryornot==0.4.4 # via # -r requirements/test.txt # cookiecutter -boto3==1.34.140 +boto3==1.34.159 # via # -r requirements/test.txt # fs-s3fs -botocore==1.34.140 +botocore==1.34.159 # via # -r requirements/test.txt # boto3 @@ -62,13 +62,13 @@ cookiecutter==2.6.0 # via # -r requirements/test.txt # xblock-sdk -coverage[toml]==7.5.4 +coverage[toml]==7.6.1 # via # -r requirements/test.txt # pytest-cov dill==0.3.8 # via pylint -django==4.2.13 +django==4.2.15 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt @@ -85,9 +85,9 @@ django-pyfs==3.2.0 # via -r requirements/test.txt django-statici18n==2.5.0 # via -r requirements/test.txt -edx-i18n-tools==1.6.0 +edx-i18n-tools==1.6.2 # via -r requirements/test.txt -edx-lint==5.3.6 +edx-lint==5.3.7 # via -r requirements/quality.in fs==2.4.16 # via @@ -122,17 +122,12 @@ jmespath==1.0.1 # -r requirements/test.txt # boto3 # botocore -lxml[html-clean]==5.2.2 +lxml==5.3.0 # via # -r requirements/test.txt # edx-i18n-tools - # lxml-html-clean # xblock # xblock-sdk -lxml-html-clean==0.1.1 - # via - # -r requirements/test.txt - # lxml mako==1.3.5 # via # -r requirements/test.txt @@ -157,7 +152,7 @@ packaging==24.1 # via # -r requirements/test.txt # pytest -path==16.14.0 +path==16.16.0 # via # -r requirements/test.txt # edx-i18n-tools @@ -175,7 +170,7 @@ polib==1.2.0 # via # -r requirements/test.txt # edx-i18n-tools -pycodestyle==2.12.0 +pycodestyle==2.12.1 # via -r requirements/quality.in pydocstyle==6.3.0 # via -r requirements/quality.in @@ -183,7 +178,7 @@ pygments==2.18.0 # via # -r requirements/test.txt # rich -pylint==3.2.5 +pylint==3.2.6 # via # edx-lint # pylint-celery @@ -201,7 +196,7 @@ pypng==0.20220715.0 # via # -r requirements/test.txt # xblock-sdk -pytest==8.2.2 +pytest==8.3.2 # via # -r requirements/test.txt # pytest-cov @@ -225,7 +220,7 @@ pytz==2024.1 # via # -r requirements/test.txt # xblock -pyyaml==6.0.1 +pyyaml==6.0.2 # via # -r requirements/test.txt # code-annotations @@ -259,7 +254,7 @@ six==1.16.0 # python-dateutil snowballstemmer==2.2.0 # via pydocstyle -sqlparse==0.5.0 +sqlparse==0.5.1 # via # -r requirements/test.txt # django @@ -271,7 +266,7 @@ text-unidecode==1.3 # via # -r requirements/test.txt # python-slugify -tomlkit==0.12.5 +tomlkit==0.13.0 # via pylint types-python-dateutil==2.9.0.20240316 # via @@ -292,11 +287,11 @@ webob==1.8.7 # -r requirements/test.txt # xblock # xblock-sdk -xblock==4.0.1 +xblock==5.0.0 # via # -r requirements/test.txt # xblock-sdk -xblock-sdk==0.11.0 +xblock-sdk==0.12.0 # via -r requirements/test.txt # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/test.txt b/requirements/test.txt index d498b8e..dc83bab 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade @@ -16,11 +16,11 @@ asgiref==3.8.1 # django binaryornot==0.4.4 # via cookiecutter -boto3==1.34.140 +boto3==1.34.159 # via # -r requirements/base.txt # fs-s3fs -botocore==1.34.140 +botocore==1.34.159 # via # -r requirements/base.txt # boto3 @@ -39,7 +39,7 @@ code-annotations==1.8.0 # via -r requirements/test.in cookiecutter==2.6.0 # via xblock-sdk -coverage[toml]==7.5.4 +coverage[toml]==7.6.1 # via pytest-cov # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt @@ -57,7 +57,7 @@ django-pyfs==3.2.0 # via -r requirements/base.txt django-statici18n==2.5.0 # via -r requirements/base.txt -edx-i18n-tools==1.6.0 +edx-i18n-tools==1.6.2 # via -r requirements/base.txt fs==2.4.16 # via @@ -83,17 +83,12 @@ jmespath==1.0.1 # -r requirements/base.txt # boto3 # botocore -lxml[html-clean]==5.2.2 +lxml==5.3.0 # via # -r requirements/base.txt # edx-i18n-tools - # lxml-html-clean # xblock # xblock-sdk -lxml-html-clean==0.1.1 - # via - # -r requirements/base.txt - # lxml mako==1.3.5 # via # -r requirements/base.txt @@ -110,7 +105,7 @@ mdurl==0.1.2 # via markdown-it-py packaging==24.1 # via pytest -path==16.14.0 +path==16.16.0 # via # -r requirements/base.txt # edx-i18n-tools @@ -126,7 +121,7 @@ pygments==2.18.0 # via rich pypng==0.20220715.0 # via xblock-sdk -pytest==8.2.2 +pytest==8.3.2 # via # pytest-cov # pytest-django @@ -148,7 +143,7 @@ pytz==2024.1 # via # -r requirements/base.txt # xblock -pyyaml==6.0.1 +pyyaml==6.0.2 # via # -r requirements/base.txt # code-annotations @@ -176,7 +171,7 @@ six==1.16.0 # fs # fs-s3fs # python-dateutil -sqlparse==0.5.0 +sqlparse==0.5.1 # via # -r requirements/base.txt # django @@ -201,11 +196,11 @@ webob==1.8.7 # -r requirements/base.txt # xblock # xblock-sdk -xblock==4.0.1 +xblock==5.0.0 # via # -r requirements/base.txt # xblock-sdk -xblock-sdk==0.11.0 +xblock-sdk==0.12.0 # via -r requirements/test.in # The following packages are considered to be unsafe in a requirements file: diff --git a/setup.py b/setup.py index bf445de..b77b376 100755 --- a/setup.py +++ b/setup.py @@ -194,7 +194,7 @@ def package_data(pkg, roots, sub_roots): entry_points={ "xblock.v1": [ # _xblock suffix is added for testing only. - "poll_xblock = xblocks_contrib:PollXBlock", + "poll_xblock = xblocks_contrib:PollBlock", ] }, package_data=package_data( diff --git a/tests/test_poll.py b/tests/test_poll.py index ebc99f3..a55cc7b 100644 --- a/tests/test_poll.py +++ b/tests/test_poll.py @@ -1,26 +1,26 @@ """ -Tests for PollXBlock +Tests for PollBlock """ from django.test import TestCase from xblock.fields import ScopeIds from xblock.test.toy_runtime import ToyRuntime -from xblocks_contrib import PollXBlock +from xblocks_contrib import PollBlock -class TestPollXBlock(TestCase): - """Tests for PollXBlock""" +class TestPollBlock(TestCase): + """Tests for PollBlock""" def test_my_student_view(self): """Test the basic view loads.""" scope_ids = ScopeIds("1", "2", "3", "4") - block = PollXBlock(ToyRuntime(), scope_ids=scope_ids) + block = PollBlock(ToyRuntime(), scope_ids=scope_ids) frag = block.student_view() as_dict = frag.to_dict() content = as_dict["content"] self.assertIn( - "PollXBlock: count is now", + "PollBlock: count is now", content, "XBlock did not render correct student view", ) diff --git a/tox.ini b/tox.ini index 7ffae9a..407b2ee 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{311,312}-django{42,50}, quality, docs +envlist = py{311,312}-django{42,51}, quality, docs skipsdist = true [doc8] @@ -38,7 +38,7 @@ norecursedirs = .* docs requirements site-packages [testenv] deps = django42: Django>=4.2,<5.0 - django50: Django>=5.0,<5.1 + django51: Django>=5.1,<5.2 -r{toxinidir}/requirements/test.txt allowlist_externals = mkdir diff --git a/translation_settings.py b/translation_settings.py index 4664d0c..fc00613 100644 --- a/translation_settings.py +++ b/translation_settings.py @@ -17,7 +17,7 @@ INSTALLED_APPS = ( "statici18n", - "xblocks-contrib", + "xblocks_contrib", ) # Internationalization @@ -46,6 +46,6 @@ STATICI18N_DOMAIN = "text" STATICI18N_NAMESPACE = "Xblocks-contribI18n" -STATICI18N_PACKAGES = ("xblocks-contrib",) -STATICI18N_ROOT = "xblocks-contrib/public/js" +STATICI18N_PACKAGES = ("xblocks_contrib",) +STATICI18N_ROOT = "xblocks_contrib/public/js" STATICI18N_OUTPUT_DIR = "translations" diff --git a/xblocks_contrib/__init__.py b/xblocks_contrib/__init__.py index de30a8e..a49d913 100644 --- a/xblocks_contrib/__init__.py +++ b/xblocks_contrib/__init__.py @@ -2,6 +2,6 @@ Init for the xblocks_contrib package. """ -from .poll import PollXBlock +from .poll import PollBlock __version__ = "0.1.0" diff --git a/xblocks_contrib/poll/__init__.py b/xblocks_contrib/poll/__init__.py index e39188f..006f95d 100644 --- a/xblocks_contrib/poll/__init__.py +++ b/xblocks_contrib/poll/__init__.py @@ -1,5 +1,5 @@ """ -Init for the PollXBlock package. +Init for the PollBlock package. """ -from .poll import PollXBlock +from .poll import PollBlock diff --git a/xblocks_contrib/poll/poll.py b/xblocks_contrib/poll/poll.py index 10064e4..3dfb978 100644 --- a/xblocks_contrib/poll/poll.py +++ b/xblocks_contrib/poll/poll.py @@ -2,12 +2,17 @@ from importlib.resources import files +from django.utils import translation from web_fragments.fragment import Fragment from xblock.core import XBlock from xblock.fields import Integer, Scope +from xblock.utils.resources import ResourceLoader +resource_loader = ResourceLoader(__name__) -class PollXBlock(XBlock): +# This Xblock is just to test the strucutre of xblocks-contrib +@XBlock.needs('i18n') +class PollBlock(XBlock): """ TO-DO: document what your XBlock does. """ @@ -24,20 +29,28 @@ class PollXBlock(XBlock): def resource_string(self, path): """Handy helper for getting resources from our kit.""" - return files(__package__).joinpath(path).read_text() + return files(__package__).joinpath(path).read_text(encoding="utf-8") # TO-DO: change this view to display your data your own way. def student_view(self, context=None): """ - Create primary view of the PollXBlock, shown to students when viewing courses. + Create primary view of the PollBlock, shown to students when viewing courses. """ if context: pass # TO-DO: do something based on the context. - html = self.resource_string("static/html/poll.html") - frag = Fragment(html.format(self=self)) + + frag = Fragment() + frag.add_content(resource_loader.render_django_template( + 'static/html/poll.html', + { + 'count': self.count, + }, + i18n_service=self.runtime.service(self, 'i18n') + )) + frag.add_css(self.resource_string("static/css/poll.css")) frag.add_javascript(self.resource_string("static/js/src/poll.js")) - frag.initialize_js("PollXBlock") + frag.initialize_js("PollBlock") return frag # TO-DO: change this handler to perform your own actions. You may need more @@ -62,17 +75,24 @@ def workbench_scenarios(): """Create canned scenario for display in the workbench.""" return [ ( - "PollXBlock", + "PollBlock", """ - """, + """, ), ( - "Multiple PollXBlock", + "Multiple PollBlock", """ - """, + """, ), ] + + @staticmethod + def get_dummy(): + """ + Generate initial i18n with dummy method. + """ + return translation.gettext_noop("Dummy") diff --git a/xblocks_contrib/poll/static/css/poll.css b/xblocks_contrib/poll/static/css/poll.css index 226f458..033a4b6 100644 --- a/xblocks_contrib/poll/static/css/poll.css +++ b/xblocks_contrib/poll/static/css/poll.css @@ -1,4 +1,4 @@ -/* CSS for PollXBlock */ +/* CSS for PollBlock */ .poll_xblock .count { font-weight: bold; diff --git a/xblocks_contrib/poll/static/html/poll.html b/xblocks_contrib/poll/static/html/poll.html index 30fa725..08bc4e0 100644 --- a/xblocks_contrib/poll/static/html/poll.html +++ b/xblocks_contrib/poll/static/html/poll.html @@ -1,5 +1,5 @@
-

PollXBlock: count is now +

PollBlock: count is now {self.count} (click me to increment).

diff --git a/xblocks_contrib/poll/static/js/src/poll.js b/xblocks_contrib/poll/static/js/src/poll.js index c0d690b..cd44d8a 100644 --- a/xblocks_contrib/poll/static/js/src/poll.js +++ b/xblocks_contrib/poll/static/js/src/poll.js @@ -1,5 +1,5 @@ -/* Javascript for PollXBlock. */ -function PollXBlock(runtime, element) { +/* Javascript for PollBlock. */ +function PollBlock(runtime, element) { function updateCount(result) { $('.count', element).text(result.count); @@ -20,7 +20,7 @@ function PollXBlock(runtime, element) { /* Use `gettext` provided by django-statici18n for static translations - var gettext = PollXBlocki18n.gettext; + var gettext = PollBlocki18n.gettext; */ /* Here's where you'd do things on page load. */ From 0d098f29e3395be07be815dc6e44467a85413ccd Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Thu, 22 Aug 2024 12:36:07 +0500 Subject: [PATCH 11/22] fix: testing issues --- requirements/base.in | 5 ++++- requirements/base.txt | 20 ++++++++++---------- requirements/ci.txt | 4 ++-- requirements/dev.txt | 28 ++++++++++++++-------------- requirements/doc.txt | 28 ++++++++++++++-------------- requirements/pip.txt | 2 +- requirements/quality.txt | 24 ++++++++++++------------ requirements/test.txt | 22 +++++++++++----------- xblocks_contrib/poll/poll.py | 1 + xblocks_contrib/poll/translation | 1 - 10 files changed, 69 insertions(+), 66 deletions(-) delete mode 120000 xblocks_contrib/poll/translation diff --git a/requirements/base.in b/requirements/base.in index ec7381e..f488ff3 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -4,4 +4,7 @@ django-statici18n edx-i18n-tools XBlock -django-pyfs +# openedx-django-pyfs + +# temporary test related PR https://github.com/openedx/django-pyfs/pull/219 +git+https://github.com/irtazaakram/django-pyfs.git@py312-django51#egg=openedx-django-pyfs diff --git a/requirements/base.txt b/requirements/base.txt index 29de034..a26b033 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -8,9 +8,9 @@ appdirs==1.4.4 # via fs asgiref==3.8.1 # via django -boto3==1.34.159 +boto3==1.35.3 # via fs-s3fs -botocore==1.34.159 +botocore==1.35.3 # via # boto3 # s3transfer @@ -18,24 +18,22 @@ django==4.2.15 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # django-appconf - # django-pyfs # django-statici18n # edx-i18n-tools + # openedx-django-pyfs django-appconf==1.0.6 # via django-statici18n -django-pyfs==3.2.0 - # via -r requirements/base.in django-statici18n==2.5.0 # via -r requirements/base.in edx-i18n-tools==1.6.2 # via -r requirements/base.in fs==2.4.16 # via - # django-pyfs # fs-s3fs + # openedx-django-pyfs # xblock fs-s3fs==1.1.1 - # via django-pyfs + # via openedx-django-pyfs jmespath==1.0.1 # via # boto3 @@ -50,6 +48,8 @@ markupsafe==2.1.5 # via # mako # xblock +openedx-django-pyfs @ git+https://github.com/irtazaakram/django-pyfs.git@py312-django51 + # via -r requirements/base.in path==16.16.0 # via edx-i18n-tools polib==1.2.0 @@ -66,7 +66,7 @@ pyyaml==6.0.2 # xblock s3transfer==0.10.2 # via boto3 -simplejson==3.19.2 +simplejson==3.19.3 # via xblock six==1.16.0 # via @@ -79,9 +79,9 @@ urllib3==2.2.2 # via botocore web-fragments==2.2.0 # via xblock -webob==1.8.7 +webob==1.8.8 # via xblock -xblock==5.0.0 +xblock==5.1.0 # via -r requirements/base.in # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/ci.txt b/requirements/ci.txt index fd78c3f..d15675b 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -4,7 +4,7 @@ # # make upgrade # -cachetools==5.4.0 +cachetools==5.5.0 # via tox chardet==5.2.0 # via tox @@ -28,7 +28,7 @@ pluggy==1.5.0 # via tox pyproject-api==1.7.1 # via tox -tox==4.17.1 +tox==4.18.0 # via -r requirements/ci.in virtualenv==20.26.3 # via tox diff --git a/requirements/dev.txt b/requirements/dev.txt index d2ea02b..7ccd4b9 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -25,11 +25,11 @@ binaryornot==0.4.4 # via # -r requirements/quality.txt # cookiecutter -boto3==1.34.159 +boto3==1.35.3 # via # -r requirements/quality.txt # fs-s3fs -botocore==1.34.159 +botocore==1.35.3 # via # -r requirements/quality.txt # boto3 @@ -38,7 +38,7 @@ build==1.2.1 # via # -r requirements/pip-tools.txt # pip-tools -cachetools==5.4.0 +cachetools==5.5.0 # via # -r requirements/ci.txt # tox @@ -101,16 +101,14 @@ django==4.2.15 # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/quality.txt # django-appconf - # django-pyfs # django-statici18n # edx-i18n-tools + # openedx-django-pyfs # xblock-sdk django-appconf==1.0.6 # via # -r requirements/quality.txt # django-statici18n -django-pyfs==3.2.0 - # via -r requirements/quality.txt django-statici18n==2.5.0 # via -r requirements/quality.txt edx-i18n-tools==1.6.2 @@ -127,13 +125,13 @@ filelock==3.15.4 fs==2.4.16 # via # -r requirements/quality.txt - # django-pyfs # fs-s3fs + # openedx-django-pyfs # xblock fs-s3fs==1.1.1 # via # -r requirements/quality.txt - # django-pyfs + # openedx-django-pyfs # xblock-sdk idna==3.7 # via @@ -186,6 +184,8 @@ mdurl==0.1.2 # via # -r requirements/quality.txt # markdown-it-py +openedx-django-pyfs @ git+https://github.com/irtazaakram/django-pyfs.git@py312-django51 + # via -r requirements/quality.txt packaging==24.1 # via # -r requirements/ci.txt @@ -309,7 +309,7 @@ s3transfer==0.10.2 # via # -r requirements/quality.txt # boto3 -simplejson==3.19.2 +simplejson==3.19.3 # via # -r requirements/quality.txt # xblock @@ -337,13 +337,13 @@ text-unidecode==1.3 # via # -r requirements/quality.txt # python-slugify -tomlkit==0.13.0 +tomlkit==0.13.2 # via # -r requirements/quality.txt # pylint -tox==4.17.1 +tox==4.18.0 # via -r requirements/ci.txt -types-python-dateutil==2.9.0.20240316 +types-python-dateutil==2.9.0.20240821 # via # -r requirements/quality.txt # arrow @@ -361,7 +361,7 @@ web-fragments==2.2.0 # -r requirements/quality.txt # xblock # xblock-sdk -webob==1.8.7 +webob==1.8.8 # via # -r requirements/quality.txt # xblock @@ -370,7 +370,7 @@ wheel==0.44.0 # via # -r requirements/pip-tools.txt # pip-tools -xblock==5.0.0 +xblock==5.1.0 # via # -r requirements/quality.txt # xblock-sdk diff --git a/requirements/doc.txt b/requirements/doc.txt index e52abc7..bc85be8 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -30,11 +30,11 @@ binaryornot==0.4.4 # via # -r requirements/test.txt # cookiecutter -boto3==1.34.159 +boto3==1.35.3 # via # -r requirements/test.txt # fs-s3fs -botocore==1.34.159 +botocore==1.35.3 # via # -r requirements/test.txt # boto3 @@ -73,16 +73,14 @@ django==4.2.15 # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt # django-appconf - # django-pyfs # django-statici18n # edx-i18n-tools + # openedx-django-pyfs # xblock-sdk django-appconf==1.0.6 # via # -r requirements/test.txt # django-statici18n -django-pyfs==3.2.0 - # via -r requirements/test.txt django-statici18n==2.5.0 # via -r requirements/test.txt doc8==1.1.1 @@ -99,13 +97,13 @@ edx-i18n-tools==1.6.2 fs==2.4.16 # via # -r requirements/test.txt - # django-pyfs # fs-s3fs + # openedx-django-pyfs # xblock fs-s3fs==1.1.1 # via # -r requirements/test.txt - # django-pyfs + # openedx-django-pyfs # xblock-sdk idna==3.7 # via @@ -113,7 +111,7 @@ idna==3.7 # requests imagesize==1.4.1 # via sphinx -importlib-metadata==8.2.0 +importlib-metadata==8.4.0 # via twine iniconfig==2.0.0 # via @@ -121,7 +119,7 @@ iniconfig==2.0.0 # pytest jaraco-classes==3.4.0 # via keyring -jaraco-context==5.3.0 +jaraco-context==6.0.1 # via keyring jaraco-functools==4.0.2 # via keyring @@ -168,6 +166,8 @@ more-itertools==10.4.0 # jaraco-functools nh3==0.2.18 # via readme-renderer +openedx-django-pyfs @ git+https://github.com/irtazaakram/django-pyfs.git@py312-django51 + # via -r requirements/test.txt packaging==24.1 # via # -r requirements/test.txt @@ -266,7 +266,7 @@ s3transfer==0.10.2 # via # -r requirements/test.txt # boto3 -simplejson==3.19.2 +simplejson==3.19.3 # via # -r requirements/test.txt # xblock @@ -279,7 +279,7 @@ six==1.16.0 # python-dateutil snowballstemmer==2.2.0 # via sphinx -soupsieve==2.5 +soupsieve==2.6 # via beautifulsoup4 sphinx==8.0.2 # via @@ -315,7 +315,7 @@ text-unidecode==1.3 # python-slugify twine==5.1.1 # via -r requirements/doc.in -types-python-dateutil==2.9.0.20240316 +types-python-dateutil==2.9.0.20240821 # via # -r requirements/test.txt # arrow @@ -332,12 +332,12 @@ web-fragments==2.2.0 # -r requirements/test.txt # xblock # xblock-sdk -webob==1.8.7 +webob==1.8.8 # via # -r requirements/test.txt # xblock # xblock-sdk -xblock==5.0.0 +xblock==5.1.0 # via # -r requirements/test.txt # xblock-sdk diff --git a/requirements/pip.txt b/requirements/pip.txt index 11fc328..0d30cd7 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -10,5 +10,5 @@ wheel==0.44.0 # The following packages are considered to be unsafe in a requirements file: pip==24.2 # via -r requirements/pip.in -setuptools==72.1.0 +setuptools==73.0.1 # via -r requirements/pip.in diff --git a/requirements/quality.txt b/requirements/quality.txt index 1ddcaae..ddcceb7 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -24,11 +24,11 @@ binaryornot==0.4.4 # via # -r requirements/test.txt # cookiecutter -boto3==1.34.159 +boto3==1.35.3 # via # -r requirements/test.txt # fs-s3fs -botocore==1.34.159 +botocore==1.35.3 # via # -r requirements/test.txt # boto3 @@ -73,16 +73,14 @@ django==4.2.15 # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt # django-appconf - # django-pyfs # django-statici18n # edx-i18n-tools + # openedx-django-pyfs # xblock-sdk django-appconf==1.0.6 # via # -r requirements/test.txt # django-statici18n -django-pyfs==3.2.0 - # via -r requirements/test.txt django-statici18n==2.5.0 # via -r requirements/test.txt edx-i18n-tools==1.6.2 @@ -92,13 +90,13 @@ edx-lint==5.3.7 fs==2.4.16 # via # -r requirements/test.txt - # django-pyfs # fs-s3fs + # openedx-django-pyfs # xblock fs-s3fs==1.1.1 # via # -r requirements/test.txt - # django-pyfs + # openedx-django-pyfs # xblock-sdk idna==3.7 # via @@ -148,6 +146,8 @@ mdurl==0.1.2 # via # -r requirements/test.txt # markdown-it-py +openedx-django-pyfs @ git+https://github.com/irtazaakram/django-pyfs.git@py312-django51 + # via -r requirements/test.txt packaging==24.1 # via # -r requirements/test.txt @@ -240,7 +240,7 @@ s3transfer==0.10.2 # via # -r requirements/test.txt # boto3 -simplejson==3.19.2 +simplejson==3.19.3 # via # -r requirements/test.txt # xblock @@ -266,9 +266,9 @@ text-unidecode==1.3 # via # -r requirements/test.txt # python-slugify -tomlkit==0.13.0 +tomlkit==0.13.2 # via pylint -types-python-dateutil==2.9.0.20240316 +types-python-dateutil==2.9.0.20240821 # via # -r requirements/test.txt # arrow @@ -282,12 +282,12 @@ web-fragments==2.2.0 # -r requirements/test.txt # xblock # xblock-sdk -webob==1.8.7 +webob==1.8.8 # via # -r requirements/test.txt # xblock # xblock-sdk -xblock==5.0.0 +xblock==5.1.0 # via # -r requirements/test.txt # xblock-sdk diff --git a/requirements/test.txt b/requirements/test.txt index dc83bab..4b32b0c 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -16,11 +16,11 @@ asgiref==3.8.1 # django binaryornot==0.4.4 # via cookiecutter -boto3==1.34.159 +boto3==1.35.3 # via # -r requirements/base.txt # fs-s3fs -botocore==1.34.159 +botocore==1.35.3 # via # -r requirements/base.txt # boto3 @@ -45,16 +45,14 @@ coverage[toml]==7.6.1 # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.txt # django-appconf - # django-pyfs # django-statici18n # edx-i18n-tools + # openedx-django-pyfs # xblock-sdk django-appconf==1.0.6 # via # -r requirements/base.txt # django-statici18n -django-pyfs==3.2.0 - # via -r requirements/base.txt django-statici18n==2.5.0 # via -r requirements/base.txt edx-i18n-tools==1.6.2 @@ -62,13 +60,13 @@ edx-i18n-tools==1.6.2 fs==2.4.16 # via # -r requirements/base.txt - # django-pyfs # fs-s3fs + # openedx-django-pyfs # xblock fs-s3fs==1.1.1 # via # -r requirements/base.txt - # django-pyfs + # openedx-django-pyfs # xblock-sdk idna==3.7 # via requests @@ -103,6 +101,8 @@ markupsafe==2.1.5 # xblock mdurl==0.1.2 # via markdown-it-py +openedx-django-pyfs @ git+https://github.com/irtazaakram/django-pyfs.git@py312-django51 + # via -r requirements/base.txt packaging==24.1 # via pytest path==16.16.0 @@ -160,7 +160,7 @@ s3transfer==0.10.2 # via # -r requirements/base.txt # boto3 -simplejson==3.19.2 +simplejson==3.19.3 # via # -r requirements/base.txt # xblock @@ -179,7 +179,7 @@ stevedore==5.2.0 # via code-annotations text-unidecode==1.3 # via python-slugify -types-python-dateutil==2.9.0.20240316 +types-python-dateutil==2.9.0.20240821 # via arrow urllib3==2.2.2 # via @@ -191,12 +191,12 @@ web-fragments==2.2.0 # -r requirements/base.txt # xblock # xblock-sdk -webob==1.8.7 +webob==1.8.8 # via # -r requirements/base.txt # xblock # xblock-sdk -xblock==5.0.0 +xblock==5.1.0 # via # -r requirements/base.txt # xblock-sdk diff --git a/xblocks_contrib/poll/poll.py b/xblocks_contrib/poll/poll.py index 3dfb978..57c42cf 100644 --- a/xblocks_contrib/poll/poll.py +++ b/xblocks_contrib/poll/poll.py @@ -10,6 +10,7 @@ resource_loader = ResourceLoader(__name__) + # This Xblock is just to test the strucutre of xblocks-contrib @XBlock.needs('i18n') class PollBlock(XBlock): diff --git a/xblocks_contrib/poll/translation b/xblocks_contrib/poll/translation deleted file mode 120000 index 717deaa..0000000 --- a/xblocks_contrib/poll/translation +++ /dev/null @@ -1 +0,0 @@ -/Users/irtaza.akram/openedx/edx-platform/src/xblocks-contrib/xblocks-contrib copy/xblocks-contrib/conf/locale \ No newline at end of file From e3fb58a6f8d5c28774ce0428f5b9bf311ec186ea Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Thu, 22 Aug 2024 14:54:37 +0500 Subject: [PATCH 12/22] fix: create xblock script --- Makefile | 3 +- utils/create_xblock.sh | 95 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 90 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 4b0b51b..482f963 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,7 @@ dev.build: dev.run: dev.clean dev.build ## Clean, build and run test image docker run -p 8000:8000 -v $(CURDIR):/usr/local/src/$(REPO_NAME) --name $(REPO_NAME)-dev $(REPO_NAME)-dev -# Auto-detect all XBlock directories +# XBlock directories XBLOCKS=$(shell find $(PACKAGE_NAME) -maxdepth 2 -type d -name 'conf' -exec dirname {} \;) ## Localization targets @@ -62,6 +62,7 @@ extract_translations: ## extract strings to be translated, outputting .po files cd $$xblock && i18n_tool extract --no-segment --merge-po-files; \ if [ -f $(EXTRACT_DIR)/django.po ]; then \ mv $(EXTRACT_DIR)/django.po $(EXTRACT_DIR)/text.po; \ + for i in `ls`; do echo $i; done; \ fi; \ done diff --git a/utils/create_xblock.sh b/utils/create_xblock.sh index ff832bd..6008412 100755 --- a/utils/create_xblock.sh +++ b/utils/create_xblock.sh @@ -85,17 +85,22 @@ else echo "Warning: $utils_config_file does not exist." fi -# Add content to xblock_name/xblock_name.py +# Add content to xblock.py cat > "$xblock_file" <. + # TO-DO: delete count, and define your own fields. + count = Integer( + default=0, + scope=Scope.user_state, + help="A simple counter, to show something happening", + ) + def resource_string(self, path): """Handy helper for getting resources from our kit.""" - return files(__package__).joinpath(path).read_text() + return files(__package__).joinpath(path).read_text(encoding="utf-8") # TO-DO: change this view to display your data your own way. def student_view(self, context=None): """ - Create primary view of the XBlock class, shown to students when viewing courses. + Create primary view of the XBlock, shown to students when viewing courses. """ if context: pass # TO-DO: do something based on the context. - html = self.resource_string("templates/$xblock_name.html") - frag = Fragment(html.format(self=self)) - frag.add_css(self.resource_string("static/css/$xblock_name.css")) + frag = Fragment() + frag.add_content(resource_loader.render_django_template( + 'templates/$xblock_name.html', + { + 'count': self.count, + }, + i18n_service=self.runtime.service(self, 'i18n') + )) + + frag.add_css(self.resource_string("static/css/$xblock_name.css")) frag.add_javascript(self.resource_string("static/js/src/$xblock_name.js")) frag.initialize_js("$xblock_class") return frag + # TO-DO: change this handler to perform your own actions. You may need more + # than one handler, or you may not need any handlers at all. + @XBlock.json_handler + def increment_count(self, data, suffix=""): + """ + Increments data. An example handler. + """ + if suffix: + pass # TO-DO: Use the suffix when storing data. + # Just to show data coming in... + assert data["hello"] == "world" + + self.count += 1 + return {"count": self.count} # TO-DO: change this to create the scenarios you'd like to see in the # workbench while developing your XBlock. @@ -145,15 +178,63 @@ class $xblock_class(XBlock): """, ), ] + + @staticmethod + def get_dummy(): + """ + Generate initial i18n with dummy method. + """ + return translation.gettext_noop("Dummy") + EOL # Add content to templates/xblock_name.html cat > "$html_file" < -Congratulations XBlock is running. +

$xblock_class: count is now + {self.count} (click me to increment). +

EOL +# Add content to js file +cat > "$js_file" < "$tx_dir/config" < Date: Thu, 22 Aug 2024 15:21:19 +0500 Subject: [PATCH 13/22] fix: translations --- .gitignore | 1 - Makefile | 5 ++--- translation_settings.py | 13 ++++++------- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 7ab8835..0d04148 100644 --- a/.gitignore +++ b/.gitignore @@ -68,4 +68,3 @@ requirements/private.txt *.mo *.pot *.po -*/translation diff --git a/Makefile b/Makefile index 482f963..6f34a01 100644 --- a/Makefile +++ b/Makefile @@ -52,7 +52,7 @@ dev.run: dev.clean dev.build ## Clean, build and run test image docker run -p 8000:8000 -v $(CURDIR):/usr/local/src/$(REPO_NAME) --name $(REPO_NAME)-dev $(REPO_NAME)-dev # XBlock directories -XBLOCKS=$(shell find $(PACKAGE_NAME) -maxdepth 2 -type d -name 'conf' -exec dirname {} \;) +XBLOCKS=$(shell find $(shell pwd)/$(PACKAGE_NAME) -maxdepth 2 -type d -name 'conf' -exec dirname {} \;) ## Localization targets @@ -62,7 +62,6 @@ extract_translations: ## extract strings to be translated, outputting .po files cd $$xblock && i18n_tool extract --no-segment --merge-po-files; \ if [ -f $(EXTRACT_DIR)/django.po ]; then \ mv $(EXTRACT_DIR)/django.po $(EXTRACT_DIR)/text.po; \ - for i in `ls`; do echo $i; done; \ fi; \ done @@ -70,7 +69,7 @@ compile_translations: ## compile translation files, outputting .mo files for eac @for xblock in $(XBLOCKS); do \ echo "Compiling translations for $$xblock..."; \ cd $$xblock && i18n_tool generate; \ - python ../../manage.py compilejsi18n --namespace Xblocks-contribI18n --output $(JS_TARGET); \ + python ../../manage.py compilejsi18n --namespace Xblocks-contribI18n --output public/js; \ done detect_changed_source_translations: diff --git a/translation_settings.py b/translation_settings.py index fc00613..c3185de 100644 --- a/translation_settings.py +++ b/translation_settings.py @@ -2,9 +2,10 @@ Django settings for xblocks-contrib project to be used in translation commands. For more information on this file, see -https://docs.djangoproject.com/en/3.2/topics/settings/ +https://docs.djangoproject.com/en/5.1/topics/settings/ + For the full list of settings and their values, see -https://docs.djangoproject.com/en/3.2/ref/settings/ +https://docs.djangoproject.com/en/5.1/ref/settings/ """ import os @@ -21,7 +22,7 @@ ) # Internationalization -# https://docs.djangoproject.com/en/3.2/topics/i18n/ +# https://docs.djangoproject.com/en/5.1/topics/i18n/ LANGUAGE_CODE = "en-us" @@ -29,18 +30,16 @@ USE_I18N = True -USE_L10N = True - USE_TZ = True # Static files (CSS, JavaScript, Images) -# https://docs.djangoproject.com/en/3.2/howto/static-files/ +# https://docs.djangoproject.com/en/5.1/howto/static-files/ STATIC_URL = "/static/" # statici18n -# https://django-statici18n.readthedocs.io/en/latest/settings.html +# https://django-statici18n.readthedocs.io/en/v2.5.0/settings.html LOCALE_PATHS = [os.path.join(BASE_DIR, "xblocks-contrib", "conf", "locale")] From 439df11ede38a3ab701557b0069c6ee43cf2a3f2 Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Thu, 29 Aug 2024 16:48:57 +0500 Subject: [PATCH 14/22] fix: translation issues --- .github/workflows/ci.yml | 2 +- .github/workflows/pypi-publish.yml | 2 +- .readthedocs.yaml | 2 +- Makefile | 20 ++--- README.rst | 91 +++++++++++++--------- manage.py | 16 ---- requirements/base.in | 5 +- requirements/base.txt | 6 +- requirements/dev.txt | 16 ++-- requirements/doc.txt | 16 ++-- requirements/pip.txt | 2 +- requirements/quality.txt | 16 ++-- requirements/test.txt | 14 ++-- translation_settings.py | 50 ------------ xblocks_contrib/poll/static/html/poll.html | 6 +- 15 files changed, 101 insertions(+), 163 deletions(-) delete mode 100755 manage.py delete mode 100644 translation_settings.py diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 196e087..4e5431c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04] + os: [ubuntu-24.04] python-version: ['3.11', '3.12'] toxenv: [quality, docs, django42, django51] diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml index fa45483..f808079 100644 --- a/.github/workflows/pypi-publish.yml +++ b/.github/workflows/pypi-publish.yml @@ -7,7 +7,7 @@ on: jobs: push: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Checkout diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 1d8cc9a..cf70d37 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -12,7 +12,7 @@ sphinx: # Set the version of python needed to build these docs. build: - os: "ubuntu-22.04" + os: "ubuntu-24.04" tools: python: "3.12" diff --git a/Makefile b/Makefile index 6f34a01..116111a 100644 --- a/Makefile +++ b/Makefile @@ -66,11 +66,7 @@ extract_translations: ## extract strings to be translated, outputting .po files done compile_translations: ## compile translation files, outputting .mo files for each supported language for each XBlock - @for xblock in $(XBLOCKS); do \ - echo "Compiling translations for $$xblock..."; \ - cd $$xblock && i18n_tool generate; \ - python ../../manage.py compilejsi18n --namespace Xblocks-contribI18n --output public/js; \ - done + django-admin compilemessages --locale en detect_changed_source_translations: @for xblock in $(XBLOCKS); do \ @@ -88,17 +84,11 @@ build_dummy_translations: dummy_translations compile_translations ## generate an validate_translations: build_dummy_translations detect_changed_source_translations ## validate translations -pull_translations: ## pull translations from Transifex for each XBlock - @for xblock in $(XBLOCKS); do \ - echo "Pulling translations for $$xblock..."; \ - cd $$xblock && i18n_tool transifex pull; \ - done +pull_translations: ## pull translations from transifex + cd $(PACKAGE_NAME) && i18n_tool transifex pull -push_translations: extract_translations ## push translations to Transifex for each XBlock - @for xblock in $(XBLOCKS); do \ - echo "Pushing translations for $$xblock..."; \ - cd $$xblock && i18n_tool transifex push; \ - done +push_translations: extract_translations ## push translations to transifex + cd $(PACKAGE_NAME) && i18n_tool transifex push install_transifex_client: ## Install the Transifex client # Instaling client will skip CHANGELOG and LICENSE files from git changes diff --git a/README.rst b/README.rst index 9cc28d4..e6e085b 100644 --- a/README.rst +++ b/README.rst @@ -1,20 +1,47 @@ -core xblocks -############################# +=============== +xblocks-contrib +=============== + +This repository is the new home for XBlocks, a core component of the Open edX ecosystem. +This project involves the extraction of XBlocks from the edx-platform. + +Project Overview +======================= + +XBlocks are modular components that enable rich interactive learning experiences in Open edX courses. +Historically, the XBlock code was tightly coupled with the edx-platform, making it challenging to manage and extend. +By extracting XBlocks into this dedicated repository, we can reduce the complexity of the edx-platform, making it more maintainable and scalable. + +Xblocks being moved here are:: + poll_question + + word_cloud + + annotatable + + lti + + html + + discussion + + problem + + video + + videoalpha + Developing a new XBlock -*********************** +======================= -There's a handy script `utils/create_xblock.sh` that you can use to create XBlock here. just run +There's a handy script ``utils/create_xblock.sh`` that you can use to create XBlock here. just run :: $ utils/create_xblock.sh -It will ask for XBlock name and XBlock class name that you want to use. Just enter these values and XBlock should be ready -to work. - -Troubleshooting -*************** +It will ask for XBlock name and XBlock class name that you want to use. Just enter these values and XBlock should be ready to work. -If faced with permission or access error run: +If faced with permission or access error run:: $ chmod +x utils/create_xblock.sh @@ -35,12 +62,7 @@ Translating Internationalization (i18n) is when a program is made aware of multiple languages. Localization (l10n) is adapting a program to local language and cultural habits. -Use the locale directory to provide internationalized strings for your XBlock project. -For more information on how to enable translations, visit the -`Open edX XBlock tutorial on Internationalization `_. - -This cookiecutter template uses `django-statici18n `_ -to provide translations to static javascript using ``gettext``. +For information on how to enable translations, visit the `Open edX XBlock tutorial on Internationalization `_. The included Makefile contains targets for extracting, compiling and validating translatable strings. The general steps to provide multilingual messages for a Python program (or an XBlock) are: @@ -50,18 +72,17 @@ The general steps to provide multilingual messages for a Python program (or an X 3. Create language specific translations for each message in the catalogs. 4. Use ``gettext`` to translate strings. -1. Mark translatable strings -============================= +5. Mark translatable strings +---------------------------- Mark translatable strings in python:: - from django.utils.translation import ugettext as _ # Translators: This comment will appear in the `.po` file. message = _("This will be marked.") -See `edx-developer-guide `__ +See `edx-developer-guide `__ for more information. You can also use ``gettext`` to mark strings in javascript:: @@ -70,34 +91,30 @@ You can also use ``gettext`` to mark strings in javascript:: // Translators: This comment will appear in the `.po` file. var message = gettext("Custom message."); -See `edx-developer-guide `__ +See `edx-developer-guide `__ for more information. 2. Run i18n tools to create Raw message catalogs -================================================= - -This cookiecutter template offers multiple make targets which are shortcuts to -use `edx-i18n-tools `_. +------------------------------------------------ After marking strings as translatable we have to create the raw message catalogs. These catalogs are created in ``.po`` files. For more information see `GNU PO file documentation `_. These catalogs can be created by running:: - $ make extract_translations -The previous command will create the necessary ``.po`` files under -``xblocks-contrib/xblocks_contrib/conf/locale/en/LC_MESSAGES/text.po``. +This command will create the necessary ``.po`` files under +``xblocks-contrib/xblocks_contrib//conf/locale/en/LC_MESSAGES/text.po``. The ``text.po`` file is created from the ``django-partial.po`` file created by ``django-admin makemessages`` (`makemessages documentation `_), this is why you will not see a ``django-partial.po`` file. 3. Create language specific translations -============================================== +---------------------------------------- 3.1 Add translated strings ---------------------------- +~~~~~~~~~~~~~~~~~~~~~~~~~~ After creating the raw message catalogs, all translations should be filled out by the translator. One or more translators must edit the entries created in the message catalog, i.e. the ``.po`` file(s). @@ -121,11 +138,11 @@ To use translations from transifex use the follow Make target to pull translatio See `config instructions `_ for information on how to set up your transifex credentials. -See `transifex documentation `_ for more details about integrating +See `transifex documentation `_ for more details about integrating django with transiflex. 3.2 Compile translations -------------------------- +~~~~~~~~~~~~~~~~~~~~~~~~ Once translations are in place, use the following Make target to compile the translation catalogs ``.po`` into ``.mo`` message files:: @@ -135,7 +152,7 @@ Once translations are in place, use the following Make target to compile the tra The previous command will compile ``.po`` files using ``django-admin compilemessages`` (`compilemessages documentation `_). After compiling the ``.po`` file(s), ``django-statici18n`` is used to create language specific catalogs. See -``django-statici18n`` `documentation `_ for more information. +``django-statici18n`` `documentation `_ for more information. To upload translations to transiflex use the follow Make target:: @@ -144,22 +161,22 @@ To upload translations to transiflex use the follow Make target:: See `config instructions `_ for information on how to set up your transifex credentials. -See `transifex documentation `_ for more details about integrating +See `transifex documentation `_ for more details about integrating django with transiflex. **Note:** The ``dev.run`` make target will automatically compile any translations. **Note:** To check if the source translation files (``.po``) are up-to-date run:: - $ make detect_changed_source_translations + $ make detect_changed_source_translations 4. Use ``gettext`` to translate strings -======================================== +--------------------------------------- Django will automatically use ``gettext`` and the compiled translations to translate strings. Troubleshooting -**************** +~~~~~~~~~~~~~~~ If there are any errors compiling ``.po`` files run the following command to validate your ``.po`` files:: diff --git a/manage.py b/manage.py deleted file mode 100755 index cf73891..0000000 --- a/manage.py +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env python -""" -A django manage.py file. - -It eases running django related commands with the correct settings already -imported. -""" -import os -import sys - -from django.core.management import execute_from_command_line - -if __name__ == "__main__": - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "translation_settings") - - execute_from_command_line(sys.argv) diff --git a/requirements/base.in b/requirements/base.in index f488ff3..4ce83cb 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -4,7 +4,4 @@ django-statici18n edx-i18n-tools XBlock -# openedx-django-pyfs - -# temporary test related PR https://github.com/openedx/django-pyfs/pull/219 -git+https://github.com/irtazaakram/django-pyfs.git@py312-django51#egg=openedx-django-pyfs +openedx-django-pyfs diff --git a/requirements/base.txt b/requirements/base.txt index a26b033..9c8957c 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -8,9 +8,9 @@ appdirs==1.4.4 # via fs asgiref==3.8.1 # via django -boto3==1.35.3 +boto3==1.35.8 # via fs-s3fs -botocore==1.35.3 +botocore==1.35.8 # via # boto3 # s3transfer @@ -48,7 +48,7 @@ markupsafe==2.1.5 # via # mako # xblock -openedx-django-pyfs @ git+https://github.com/irtazaakram/django-pyfs.git@py312-django51 +openedx-django-pyfs==3.7.0 # via -r requirements/base.in path==16.16.0 # via edx-i18n-tools diff --git a/requirements/dev.txt b/requirements/dev.txt index 7ccd4b9..865bff6 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -25,11 +25,11 @@ binaryornot==0.4.4 # via # -r requirements/quality.txt # cookiecutter -boto3==1.35.3 +boto3==1.35.8 # via # -r requirements/quality.txt # fs-s3fs -botocore==1.35.3 +botocore==1.35.8 # via # -r requirements/quality.txt # boto3 @@ -115,7 +115,7 @@ edx-i18n-tools==1.6.2 # via # -r requirements/dev.in # -r requirements/quality.txt -edx-lint==5.3.7 +edx-lint==5.4.0 # via -r requirements/quality.txt filelock==3.15.4 # via @@ -133,7 +133,7 @@ fs-s3fs==1.1.1 # -r requirements/quality.txt # openedx-django-pyfs # xblock-sdk -idna==3.7 +idna==3.8 # via # -r requirements/quality.txt # requests @@ -184,7 +184,7 @@ mdurl==0.1.2 # via # -r requirements/quality.txt # markdown-it-py -openedx-django-pyfs @ git+https://github.com/irtazaakram/django-pyfs.git@py312-django51 +openedx-django-pyfs==3.7.0 # via -r requirements/quality.txt packaging==24.1 # via @@ -199,7 +199,7 @@ path==16.16.0 # via # -r requirements/quality.txt # edx-i18n-tools -pbr==6.0.0 +pbr==6.1.0 # via # -r requirements/quality.txt # stevedore @@ -301,7 +301,7 @@ requests==2.32.3 # -r requirements/quality.txt # cookiecutter # xblock-sdk -rich==13.7.1 +rich==13.8.0 # via # -r requirements/quality.txt # cookiecutter @@ -329,7 +329,7 @@ sqlparse==0.5.1 # via # -r requirements/quality.txt # django -stevedore==5.2.0 +stevedore==5.3.0 # via # -r requirements/quality.txt # code-annotations diff --git a/requirements/doc.txt b/requirements/doc.txt index bc85be8..bd6b1d7 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -30,11 +30,11 @@ binaryornot==0.4.4 # via # -r requirements/test.txt # cookiecutter -boto3==1.35.3 +boto3==1.35.8 # via # -r requirements/test.txt # fs-s3fs -botocore==1.35.3 +botocore==1.35.8 # via # -r requirements/test.txt # boto3 @@ -105,7 +105,7 @@ fs-s3fs==1.1.1 # -r requirements/test.txt # openedx-django-pyfs # xblock-sdk -idna==3.7 +idna==3.8 # via # -r requirements/test.txt # requests @@ -166,7 +166,7 @@ more-itertools==10.4.0 # jaraco-functools nh3==0.2.18 # via readme-renderer -openedx-django-pyfs @ git+https://github.com/irtazaakram/django-pyfs.git@py312-django51 +openedx-django-pyfs==3.7.0 # via -r requirements/test.txt packaging==24.1 # via @@ -179,7 +179,7 @@ path==16.16.0 # via # -r requirements/test.txt # edx-i18n-tools -pbr==6.0.0 +pbr==6.1.0 # via # -r requirements/test.txt # stevedore @@ -257,7 +257,7 @@ restructuredtext-lint==1.4.0 # via doc8 rfc3986==2.0.0 # via twine -rich==13.7.1 +rich==13.8.0 # via # -r requirements/test.txt # cookiecutter @@ -304,7 +304,7 @@ sqlparse==0.5.1 # via # -r requirements/test.txt # django -stevedore==5.2.0 +stevedore==5.3.0 # via # -r requirements/test.txt # code-annotations @@ -343,7 +343,7 @@ xblock==5.1.0 # xblock-sdk xblock-sdk==0.12.0 # via -r requirements/test.txt -zipp==3.20.0 +zipp==3.20.1 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip.txt b/requirements/pip.txt index 0d30cd7..8631391 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -10,5 +10,5 @@ wheel==0.44.0 # The following packages are considered to be unsafe in a requirements file: pip==24.2 # via -r requirements/pip.in -setuptools==73.0.1 +setuptools==74.0.0 # via -r requirements/pip.in diff --git a/requirements/quality.txt b/requirements/quality.txt index ddcceb7..18b237c 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -24,11 +24,11 @@ binaryornot==0.4.4 # via # -r requirements/test.txt # cookiecutter -boto3==1.35.3 +boto3==1.35.8 # via # -r requirements/test.txt # fs-s3fs -botocore==1.35.3 +botocore==1.35.8 # via # -r requirements/test.txt # boto3 @@ -85,7 +85,7 @@ django-statici18n==2.5.0 # via -r requirements/test.txt edx-i18n-tools==1.6.2 # via -r requirements/test.txt -edx-lint==5.3.7 +edx-lint==5.4.0 # via -r requirements/quality.in fs==2.4.16 # via @@ -98,7 +98,7 @@ fs-s3fs==1.1.1 # -r requirements/test.txt # openedx-django-pyfs # xblock-sdk -idna==3.7 +idna==3.8 # via # -r requirements/test.txt # requests @@ -146,7 +146,7 @@ mdurl==0.1.2 # via # -r requirements/test.txt # markdown-it-py -openedx-django-pyfs @ git+https://github.com/irtazaakram/django-pyfs.git@py312-django51 +openedx-django-pyfs==3.7.0 # via -r requirements/test.txt packaging==24.1 # via @@ -156,7 +156,7 @@ path==16.16.0 # via # -r requirements/test.txt # edx-i18n-tools -pbr==6.0.0 +pbr==6.1.0 # via # -r requirements/test.txt # stevedore @@ -232,7 +232,7 @@ requests==2.32.3 # -r requirements/test.txt # cookiecutter # xblock-sdk -rich==13.7.1 +rich==13.8.0 # via # -r requirements/test.txt # cookiecutter @@ -258,7 +258,7 @@ sqlparse==0.5.1 # via # -r requirements/test.txt # django -stevedore==5.2.0 +stevedore==5.3.0 # via # -r requirements/test.txt # code-annotations diff --git a/requirements/test.txt b/requirements/test.txt index 4b32b0c..5cda2d6 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -16,11 +16,11 @@ asgiref==3.8.1 # django binaryornot==0.4.4 # via cookiecutter -boto3==1.35.3 +boto3==1.35.8 # via # -r requirements/base.txt # fs-s3fs -botocore==1.35.3 +botocore==1.35.8 # via # -r requirements/base.txt # boto3 @@ -68,7 +68,7 @@ fs-s3fs==1.1.1 # -r requirements/base.txt # openedx-django-pyfs # xblock-sdk -idna==3.7 +idna==3.8 # via requests iniconfig==2.0.0 # via pytest @@ -101,7 +101,7 @@ markupsafe==2.1.5 # xblock mdurl==0.1.2 # via markdown-it-py -openedx-django-pyfs @ git+https://github.com/irtazaakram/django-pyfs.git@py312-django51 +openedx-django-pyfs==3.7.0 # via -r requirements/base.txt packaging==24.1 # via pytest @@ -109,7 +109,7 @@ path==16.16.0 # via # -r requirements/base.txt # edx-i18n-tools -pbr==6.0.0 +pbr==6.1.0 # via stevedore pluggy==1.5.0 # via pytest @@ -154,7 +154,7 @@ requests==2.32.3 # via # cookiecutter # xblock-sdk -rich==13.7.1 +rich==13.8.0 # via cookiecutter s3transfer==0.10.2 # via @@ -175,7 +175,7 @@ sqlparse==0.5.1 # via # -r requirements/base.txt # django -stevedore==5.2.0 +stevedore==5.3.0 # via code-annotations text-unidecode==1.3 # via python-slugify diff --git a/translation_settings.py b/translation_settings.py deleted file mode 100644 index c3185de..0000000 --- a/translation_settings.py +++ /dev/null @@ -1,50 +0,0 @@ -""" -Django settings for xblocks-contrib project to be used in translation commands. - -For more information on this file, see -https://docs.djangoproject.com/en/5.1/topics/settings/ - -For the full list of settings and their values, see -https://docs.djangoproject.com/en/5.1/ref/settings/ -""" - -import os - -BASE_DIR = os.path.dirname(__file__) - -SECRET_KEY = os.getenv("DJANGO_SECRET", "open_secret") - -# Application definition - -INSTALLED_APPS = ( - "statici18n", - "xblocks_contrib", -) - -# Internationalization -# https://docs.djangoproject.com/en/5.1/topics/i18n/ - -LANGUAGE_CODE = "en-us" - -TIME_ZONE = "UTC" - -USE_I18N = True - -USE_TZ = True - - -# Static files (CSS, JavaScript, Images) -# https://docs.djangoproject.com/en/5.1/howto/static-files/ - -STATIC_URL = "/static/" - -# statici18n -# https://django-statici18n.readthedocs.io/en/v2.5.0/settings.html - -LOCALE_PATHS = [os.path.join(BASE_DIR, "xblocks-contrib", "conf", "locale")] - -STATICI18N_DOMAIN = "text" -STATICI18N_NAMESPACE = "Xblocks-contribI18n" -STATICI18N_PACKAGES = ("xblocks_contrib",) -STATICI18N_ROOT = "xblocks_contrib/public/js" -STATICI18N_OUTPUT_DIR = "translations" diff --git a/xblocks_contrib/poll/static/html/poll.html b/xblocks_contrib/poll/static/html/poll.html index 08bc4e0..442e98d 100644 --- a/xblocks_contrib/poll/static/html/poll.html +++ b/xblocks_contrib/poll/static/html/poll.html @@ -1,5 +1,5 @@ +{% load i18n %} +
-

PollBlock: count is now - {self.count} (click me to increment). -

+

PollBlock: {% trans "count is now" %} {{ count }} {% trans "click me to increment." %}

From 949cc02bd7aea2798660e392e5b1c97a737fa584 Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Thu, 29 Aug 2024 17:57:56 +0500 Subject: [PATCH 15/22] fix: test issues --- tox.ini | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tox.ini b/tox.ini index 407b2ee..292b6f2 100644 --- a/tox.ini +++ b/tox.ini @@ -43,6 +43,7 @@ deps = allowlist_externals = mkdir commands = + pip install -e . mkdir -p var pytest {posargs} @@ -78,8 +79,8 @@ allowlist_externals = deps = -r{toxinidir}/requirements/quality.txt commands = - pylint xblocks_contrib manage.py - pycodestyle xblocks_contrib manage.py - pydocstyle xblocks_contrib manage.py - isort --check-only --diff xblocks_contrib manage.py + pylint xblocks_contrib + pycodestyle xblocks_contrib + pydocstyle xblocks_contrib + isort --check-only --diff xblocks_contrib make selfcheck From 028421f5998d1a59837e90f75f74e68bbe312752 Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Thu, 5 Sep 2024 12:14:42 +0500 Subject: [PATCH 16/22] fix: add all xblocks & update docker --- Dockerfile | 8 +- README.rst | 26 ++--- setup.py | 9 +- tests/test_annotatable.py | 27 +++++ tests/test_discussion.py | 27 +++++ tests/test_html.py | 27 +++++ tests/test_lti.py | 27 +++++ tests/test_problem.py | 27 +++++ tests/test_video.py | 27 +++++ tests/test_word_cloud.py | 27 +++++ utils/create_xblock.sh | 101 ++++++++++++++---- xblocks_contrib/__init__.py | 7 ++ xblocks_contrib/annotatable/.tx/config | 8 ++ xblocks_contrib/annotatable/__init__.py | 5 + xblocks_contrib/annotatable/annotatable.py | 99 +++++++++++++++++ .../annotatable/conf/locale/__init__.py | 0 .../annotatable/conf/locale/config.yaml | 93 ++++++++++++++++ .../annotatable/static/css/annotatable.css | 9 ++ .../annotatable/static/js/src/annotatable.js | 38 +++++++ .../annotatable/templates/annotatable.html | 7 ++ xblocks_contrib/discussion/.tx/config | 8 ++ xblocks_contrib/discussion/__init__.py | 5 + .../discussion/conf/locale/__init__.py | 0 .../discussion/conf/locale/config.yaml | 93 ++++++++++++++++ xblocks_contrib/discussion/discussion.py | 99 +++++++++++++++++ .../discussion/static/css/discussion.css | 9 ++ .../discussion/static/js/src/discussion.js | 38 +++++++ .../discussion/templates/discussion.html | 7 ++ xblocks_contrib/html/.tx/config | 8 ++ xblocks_contrib/html/__init__.py | 5 + xblocks_contrib/html/conf/locale/__init__.py | 0 xblocks_contrib/html/conf/locale/config.yaml | 93 ++++++++++++++++ xblocks_contrib/html/html.py | 99 +++++++++++++++++ xblocks_contrib/html/static/css/html.css | 9 ++ xblocks_contrib/html/static/js/src/html.js | 38 +++++++ xblocks_contrib/html/templates/html.html | 7 ++ xblocks_contrib/lti/.tx/config | 8 ++ xblocks_contrib/lti/__init__.py | 5 + xblocks_contrib/lti/conf/locale/__init__.py | 0 xblocks_contrib/lti/conf/locale/config.yaml | 93 ++++++++++++++++ xblocks_contrib/lti/lti.py | 99 +++++++++++++++++ xblocks_contrib/lti/static/css/lti.css | 9 ++ xblocks_contrib/lti/static/js/src/lti.js | 38 +++++++ xblocks_contrib/lti/templates/lti.html | 7 ++ xblocks_contrib/poll/__init__.py | 2 +- xblocks_contrib/poll/poll.py | 12 +-- xblocks_contrib/poll/static/README.txt | 19 ---- xblocks_contrib/poll/static/css/poll.css | 4 +- xblocks_contrib/poll/static/html/poll.html | 5 - xblocks_contrib/poll/static/js/src/poll.js | 37 ++++--- xblocks_contrib/poll/templates/poll.html | 7 ++ xblocks_contrib/problem/.tx/config | 8 ++ xblocks_contrib/problem/__init__.py | 5 + .../problem/conf/locale/__init__.py | 0 .../problem/conf/locale/config.yaml | 93 ++++++++++++++++ xblocks_contrib/problem/problem.py | 99 +++++++++++++++++ .../problem/static/css/problem.css | 9 ++ .../problem/static/js/src/problem.js | 38 +++++++ .../problem/templates/problem.html | 7 ++ xblocks_contrib/video/.tx/config | 8 ++ xblocks_contrib/video/__init__.py | 5 + xblocks_contrib/video/conf/locale/__init__.py | 0 xblocks_contrib/video/conf/locale/config.yaml | 93 ++++++++++++++++ xblocks_contrib/video/static/css/video.css | 9 ++ xblocks_contrib/video/static/js/src/video.js | 38 +++++++ xblocks_contrib/video/templates/video.html | 7 ++ xblocks_contrib/video/video.py | 100 +++++++++++++++++ xblocks_contrib/word_cloud/.tx/config | 8 ++ xblocks_contrib/word_cloud/__init__.py | 5 + .../word_cloud/conf/locale/__init__.py | 0 .../word_cloud/conf/locale/config.yaml | 93 ++++++++++++++++ .../word_cloud/static/css/word_cloud.css | 9 ++ .../word_cloud/static/js/src/word_cloud.js | 38 +++++++ .../word_cloud/templates/word_cloud.html | 7 ++ xblocks_contrib/word_cloud/word_cloud.py | 99 +++++++++++++++++ 75 files changed, 2151 insertions(+), 89 deletions(-) mode change 100755 => 100644 setup.py create mode 100644 tests/test_annotatable.py create mode 100644 tests/test_discussion.py create mode 100644 tests/test_html.py create mode 100644 tests/test_lti.py create mode 100644 tests/test_problem.py create mode 100644 tests/test_video.py create mode 100644 tests/test_word_cloud.py create mode 100644 xblocks_contrib/annotatable/.tx/config create mode 100644 xblocks_contrib/annotatable/__init__.py create mode 100644 xblocks_contrib/annotatable/annotatable.py create mode 100644 xblocks_contrib/annotatable/conf/locale/__init__.py create mode 100644 xblocks_contrib/annotatable/conf/locale/config.yaml create mode 100644 xblocks_contrib/annotatable/static/css/annotatable.css create mode 100644 xblocks_contrib/annotatable/static/js/src/annotatable.js create mode 100644 xblocks_contrib/annotatable/templates/annotatable.html create mode 100644 xblocks_contrib/discussion/.tx/config create mode 100644 xblocks_contrib/discussion/__init__.py create mode 100644 xblocks_contrib/discussion/conf/locale/__init__.py create mode 100644 xblocks_contrib/discussion/conf/locale/config.yaml create mode 100644 xblocks_contrib/discussion/discussion.py create mode 100644 xblocks_contrib/discussion/static/css/discussion.css create mode 100644 xblocks_contrib/discussion/static/js/src/discussion.js create mode 100644 xblocks_contrib/discussion/templates/discussion.html create mode 100644 xblocks_contrib/html/.tx/config create mode 100644 xblocks_contrib/html/__init__.py create mode 100644 xblocks_contrib/html/conf/locale/__init__.py create mode 100644 xblocks_contrib/html/conf/locale/config.yaml create mode 100644 xblocks_contrib/html/html.py create mode 100644 xblocks_contrib/html/static/css/html.css create mode 100644 xblocks_contrib/html/static/js/src/html.js create mode 100644 xblocks_contrib/html/templates/html.html create mode 100644 xblocks_contrib/lti/.tx/config create mode 100644 xblocks_contrib/lti/__init__.py create mode 100644 xblocks_contrib/lti/conf/locale/__init__.py create mode 100644 xblocks_contrib/lti/conf/locale/config.yaml create mode 100644 xblocks_contrib/lti/lti.py create mode 100644 xblocks_contrib/lti/static/css/lti.css create mode 100644 xblocks_contrib/lti/static/js/src/lti.js create mode 100644 xblocks_contrib/lti/templates/lti.html delete mode 100644 xblocks_contrib/poll/static/README.txt delete mode 100644 xblocks_contrib/poll/static/html/poll.html create mode 100644 xblocks_contrib/poll/templates/poll.html create mode 100644 xblocks_contrib/problem/.tx/config create mode 100644 xblocks_contrib/problem/__init__.py create mode 100644 xblocks_contrib/problem/conf/locale/__init__.py create mode 100644 xblocks_contrib/problem/conf/locale/config.yaml create mode 100644 xblocks_contrib/problem/problem.py create mode 100644 xblocks_contrib/problem/static/css/problem.css create mode 100644 xblocks_contrib/problem/static/js/src/problem.js create mode 100644 xblocks_contrib/problem/templates/problem.html create mode 100644 xblocks_contrib/video/.tx/config create mode 100644 xblocks_contrib/video/__init__.py create mode 100644 xblocks_contrib/video/conf/locale/__init__.py create mode 100644 xblocks_contrib/video/conf/locale/config.yaml create mode 100644 xblocks_contrib/video/static/css/video.css create mode 100644 xblocks_contrib/video/static/js/src/video.js create mode 100644 xblocks_contrib/video/templates/video.html create mode 100644 xblocks_contrib/video/video.py create mode 100644 xblocks_contrib/word_cloud/.tx/config create mode 100644 xblocks_contrib/word_cloud/__init__.py create mode 100644 xblocks_contrib/word_cloud/conf/locale/__init__.py create mode 100644 xblocks_contrib/word_cloud/conf/locale/config.yaml create mode 100644 xblocks_contrib/word_cloud/static/css/word_cloud.css create mode 100644 xblocks_contrib/word_cloud/static/js/src/word_cloud.js create mode 100644 xblocks_contrib/word_cloud/templates/word_cloud.html create mode 100644 xblocks_contrib/word_cloud/word_cloud.py diff --git a/Dockerfile b/Dockerfile index 645cb68..f0e89e2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,14 @@ +# This Dockerfile sets up an XBlock SDK environment for developing and testing XBlocks. +# The following commands in the Makefile facilitate the Docker lifecycle: +# - `make dev.clean`: Cleans up any existing Docker containers and images. +# - `make dev.build`: Builds the Docker image for the XBlock SDK environment. +# - `make dev.run`: Cleans, builds, and runs the container, mapping the local project directory. + FROM openedx/xblock-sdk RUN mkdir -p /usr/local/src/xblocks-contrib VOLUME ["/usr/local/src/xblocks-contrib"] RUN apt-get update && apt-get install -y gettext -RUN echo "pip install -r /usr/local/src/xblocks-contrib/requirements.txt" >> /usr/local/src/xblock-sdk/install_and_run_xblock.sh +RUN echo "pip install -r /usr/local/src/xblocks-contrib/requirements/dev.txt" >> /usr/local/src/xblock-sdk/install_and_run_xblock.sh RUN echo "pip install -e /usr/local/src/xblocks-contrib" >> /usr/local/src/xblock-sdk/install_and_run_xblock.sh RUN echo "cd /usr/local/src/xblocks-contrib && make compile_translations && cd /usr/local/src/xblock-sdk" >> /usr/local/src/xblock-sdk/install_and_run_xblock.sh RUN echo "exec python /usr/local/src/xblock-sdk/manage.py \"\$@\"" >> /usr/local/src/xblock-sdk/install_and_run_xblock.sh diff --git a/README.rst b/README.rst index e6e085b..fd3c12b 100644 --- a/README.rst +++ b/README.rst @@ -13,23 +13,15 @@ Historically, the XBlock code was tightly coupled with the edx-platform, making By extracting XBlocks into this dedicated repository, we can reduce the complexity of the edx-platform, making it more maintainable and scalable. Xblocks being moved here are:: - poll_question - - word_cloud - - annotatable - - lti - - html - - discussion - - problem - - video - - videoalpha +* poll_question +* word_cloud +* annotatable +* lti +* html +* discussion +* problem +* video +* videoalpha Developing a new XBlock diff --git a/setup.py b/setup.py old mode 100755 new mode 100644 index b77b376..34f8b6c --- a/setup.py +++ b/setup.py @@ -194,7 +194,14 @@ def package_data(pkg, roots, sub_roots): entry_points={ "xblock.v1": [ # _xblock suffix is added for testing only. - "poll_xblock = xblocks_contrib:PollBlock", + "annotatable_xblock = xblocks_contrib:AnnotatableBlock", + "discussion_xblock = xblocks_contrib:DiscussionXBlock", + "html_xblock = xblocks_contrib:HtmlBlock", + "lti_xblock = xblocks_contrib:LTIBlock", + "poll_question_xblock = xblocks_contrib:PollBlock", + "problem_xblock = xblocks_contrib:ProblemBlock", + "video_xblock = xblocks_contrib:VideoBlock", + "word_cloud_xblock = xblocks_contrib:WordCloudBlock", ] }, package_data=package_data( diff --git a/tests/test_annotatable.py b/tests/test_annotatable.py new file mode 100644 index 0000000..db20e07 --- /dev/null +++ b/tests/test_annotatable.py @@ -0,0 +1,27 @@ +""" +Tests for AnnotatableBlock +""" + + +from django.test import TestCase +from xblock.fields import ScopeIds +from xblock.test.toy_runtime import ToyRuntime + +from xblocks_contrib import AnnotatableBlock + + +class TestAnnotatableBlock(TestCase): + """Tests for AnnotatableBlock""" + + def test_my_student_view(self): + """Test the basic view loads.""" + scope_ids = ScopeIds("1", "2", "3", "4") + block = AnnotatableBlock(ToyRuntime(), scope_ids=scope_ids) + frag = block.student_view() + as_dict = frag.to_dict() + content = as_dict["content"] + self.assertIn( + "AnnotatableBlock: count is now", + content, + "XBlock did not render correct student view", + ) diff --git a/tests/test_discussion.py b/tests/test_discussion.py new file mode 100644 index 0000000..3478867 --- /dev/null +++ b/tests/test_discussion.py @@ -0,0 +1,27 @@ +""" +Tests for DiscussionXBlock +""" + + +from django.test import TestCase +from xblock.fields import ScopeIds +from xblock.test.toy_runtime import ToyRuntime + +from xblocks_contrib import DiscussionXBlock + + +class TestDiscussionXBlock(TestCase): + """Tests for DiscussionXBlock""" + + def test_my_student_view(self): + """Test the basic view loads.""" + scope_ids = ScopeIds("1", "2", "3", "4") + block = DiscussionXBlock(ToyRuntime(), scope_ids=scope_ids) + frag = block.student_view() + as_dict = frag.to_dict() + content = as_dict["content"] + self.assertIn( + "DiscussionXBlock: count is now", + content, + "XBlock did not render correct student view", + ) diff --git a/tests/test_html.py b/tests/test_html.py new file mode 100644 index 0000000..1195944 --- /dev/null +++ b/tests/test_html.py @@ -0,0 +1,27 @@ +""" +Tests for HtmlBlock +""" + + +from django.test import TestCase +from xblock.fields import ScopeIds +from xblock.test.toy_runtime import ToyRuntime + +from xblocks_contrib import HtmlBlock + + +class TestHtmlBlock(TestCase): + """Tests for HtmlBlock""" + + def test_my_student_view(self): + """Test the basic view loads.""" + scope_ids = ScopeIds("1", "2", "3", "4") + block = HtmlBlock(ToyRuntime(), scope_ids=scope_ids) + frag = block.student_view() + as_dict = frag.to_dict() + content = as_dict["content"] + self.assertIn( + "HtmlBlock: count is now", + content, + "XBlock did not render correct student view", + ) diff --git a/tests/test_lti.py b/tests/test_lti.py new file mode 100644 index 0000000..311934f --- /dev/null +++ b/tests/test_lti.py @@ -0,0 +1,27 @@ +""" +Tests for LTIBlock +""" + + +from django.test import TestCase +from xblock.fields import ScopeIds +from xblock.test.toy_runtime import ToyRuntime + +from xblocks_contrib import LTIBlock + + +class TestLTIBlock(TestCase): + """Tests for LTIBlock""" + + def test_my_student_view(self): + """Test the basic view loads.""" + scope_ids = ScopeIds("1", "2", "3", "4") + block = LTIBlock(ToyRuntime(), scope_ids=scope_ids) + frag = block.student_view() + as_dict = frag.to_dict() + content = as_dict["content"] + self.assertIn( + "LTIBlock: count is now", + content, + "XBlock did not render correct student view", + ) diff --git a/tests/test_problem.py b/tests/test_problem.py new file mode 100644 index 0000000..f9b7d3b --- /dev/null +++ b/tests/test_problem.py @@ -0,0 +1,27 @@ +""" +Tests for ProblemBlock +""" + + +from django.test import TestCase +from xblock.fields import ScopeIds +from xblock.test.toy_runtime import ToyRuntime + +from xblocks_contrib import ProblemBlock + + +class TestProblemBlock(TestCase): + """Tests for ProblemBlock""" + + def test_my_student_view(self): + """Test the basic view loads.""" + scope_ids = ScopeIds("1", "2", "3", "4") + block = ProblemBlock(ToyRuntime(), scope_ids=scope_ids) + frag = block.student_view() + as_dict = frag.to_dict() + content = as_dict["content"] + self.assertIn( + "ProblemBlock: count is now", + content, + "XBlock did not render correct student view", + ) diff --git a/tests/test_video.py b/tests/test_video.py new file mode 100644 index 0000000..3fb38c9 --- /dev/null +++ b/tests/test_video.py @@ -0,0 +1,27 @@ +""" +Tests for VideoBlock +""" + + +from django.test import TestCase +from xblock.fields import ScopeIds +from xblock.test.toy_runtime import ToyRuntime + +from xblocks_contrib import VideoBlock + + +class TestVideoBlock(TestCase): + """Tests for VideoBlock""" + + def test_my_student_view(self): + """Test the basic view loads.""" + scope_ids = ScopeIds("1", "2", "3", "4") + block = VideoBlock(ToyRuntime(), scope_ids=scope_ids) + frag = block.student_view() + as_dict = frag.to_dict() + content = as_dict["content"] + self.assertIn( + "VideoBlock: count is now", + content, + "XBlock did not render correct student view", + ) diff --git a/tests/test_word_cloud.py b/tests/test_word_cloud.py new file mode 100644 index 0000000..d0fd7cc --- /dev/null +++ b/tests/test_word_cloud.py @@ -0,0 +1,27 @@ +""" +Tests for WordCloudBlock +""" + + +from django.test import TestCase +from xblock.fields import ScopeIds +from xblock.test.toy_runtime import ToyRuntime + +from xblocks_contrib import WordCloudBlock + + +class TestWordCloudBlock(TestCase): + """Tests for WordCloudBlock""" + + def test_my_student_view(self): + """Test the basic view loads.""" + scope_ids = ScopeIds("1", "2", "3", "4") + block = WordCloudBlock(ToyRuntime(), scope_ids=scope_ids) + frag = block.student_view() + as_dict = frag.to_dict() + content = as_dict["content"] + self.assertIn( + "WordCloudBlock: count is now", + content, + "XBlock did not render correct student view", + ) diff --git a/utils/create_xblock.sh b/utils/create_xblock.sh index 6008412..ada0e5b 100755 --- a/utils/create_xblock.sh +++ b/utils/create_xblock.sh @@ -100,6 +100,7 @@ from xblock.utils.resources import ResourceLoader resource_loader = ResourceLoader(__name__) +# This Xblock is just to test the strucutre of xblocks-contrib @XBlock.needs('i18n') class $xblock_class(XBlock): """ @@ -123,7 +124,7 @@ class $xblock_class(XBlock): # TO-DO: change this view to display your data your own way. def student_view(self, context=None): """ - Create primary view of the XBlock, shown to students when viewing courses. + Create primary view of the $xblock_class, shown to students when viewing courses. """ if context: pass # TO-DO: do something based on the context. @@ -185,54 +186,72 @@ class $xblock_class(XBlock): Generate initial i18n with dummy method. """ return translation.gettext_noop("Dummy") - EOL # Add content to templates/xblock_name.html cat > "$html_file" < -

$xblock_class: count is now - {self.count} (click me to increment). +

+ $xblock_class: {% trans "count is now" %} {{ count }} {% trans "click me to increment." %}

EOL # Add content to js file cat > "$js_file" < { \$('.count', element).text(result.count); - } + }; - var handlerUrl = runtime.handlerUrl(element, 'increment_count'); + const handlerUrl = runtime.handlerUrl(element, 'increment_count'); - \$('p', element).click(function(eventObject) { + \$('p', element).on('click', (eventObject) => { \$.ajax({ - type: "POST", + type: 'POST', url: handlerUrl, - data: JSON.stringify({"hello": "world"}), + contentType: 'application/json', + data: JSON.stringify({hello: 'world'}), success: updateCount }); }); - \$(function (\$) { + \$(() => { /* Use \`gettext\` provided by django-statici18n for static translations - - var gettext = Xblocks-contribI18n.gettext; */ - /* Here's where you'd do things on page load. */ + // eslint-disable-next-line no-undef + const dummyText = gettext('Hello World'); - // dummy_text is to have at least one string to translate in JS files. If you remove this line, - // and you don't have any other string to translate in JS files; then you must remove the (--merge-po-files) - // option from the "extract_translations" command in the Makefile - const dummy_text = gettext("Hello World"); + // Example usage of interpolation for translated strings + // eslint-disable-next-line no-undef + const message = StringUtils.interpolate( + gettext('You are enrolling in {courseName}'), + { + courseName: 'Rock & Roll 101' + } + ); + console.log(message); // This is just for demonstration purposes }); } +EOL +# Add content to css file +cat > "$css_file" < "$init_file" -echo "XBlock $xblock_name with class $xblock_class created successfully." + +# Define test file paths and content +tests_dir="tests" +test_file="$tests_dir/test_${xblock_name}.py" + +# Create tests directory if it doesn't exist +mkdir -p "$tests_dir" + +# Add content to test file +cat > "$test_file" </LC_MESSAGES/text.po +source_file = annotatable/translations/en/LC_MESSAGES/text.po +source_lang = en +type = PO diff --git a/xblocks_contrib/annotatable/__init__.py b/xblocks_contrib/annotatable/__init__.py new file mode 100644 index 0000000..19cb87a --- /dev/null +++ b/xblocks_contrib/annotatable/__init__.py @@ -0,0 +1,5 @@ +""" +Init for the AnnotatableBlock. +""" + +from .annotatable import AnnotatableBlock diff --git a/xblocks_contrib/annotatable/annotatable.py b/xblocks_contrib/annotatable/annotatable.py new file mode 100644 index 0000000..2169fc8 --- /dev/null +++ b/xblocks_contrib/annotatable/annotatable.py @@ -0,0 +1,99 @@ +"""TO-DO: Write a description of what this XBlock is.""" + +from importlib.resources import files + +from django.utils import translation +from web_fragments.fragment import Fragment +from xblock.core import XBlock +from xblock.fields import Integer, Scope +from xblock.utils.resources import ResourceLoader + +resource_loader = ResourceLoader(__name__) + + +# This Xblock is just to test the strucutre of xblocks-contrib +@XBlock.needs('i18n') +class AnnotatableBlock(XBlock): + """ + TO-DO: document what your XBlock does. + """ + + # Fields are defined on the class. You can access them in your code as + # self.. + + # TO-DO: delete count, and define your own fields. + count = Integer( + default=0, + scope=Scope.user_state, + help="A simple counter, to show something happening", + ) + + def resource_string(self, path): + """Handy helper for getting resources from our kit.""" + return files(__package__).joinpath(path).read_text(encoding="utf-8") + + # TO-DO: change this view to display your data your own way. + def student_view(self, context=None): + """ + Create primary view of the AnnotatableBlock, shown to students when viewing courses. + """ + if context: + pass # TO-DO: do something based on the context. + + frag = Fragment() + frag.add_content(resource_loader.render_django_template( + 'templates/annotatable.html', + { + 'count': self.count, + }, + i18n_service=self.runtime.service(self, 'i18n') + )) + + frag.add_css(self.resource_string("static/css/annotatable.css")) + frag.add_javascript(self.resource_string("static/js/src/annotatable.js")) + frag.initialize_js("AnnotatableBlock") + return frag + + # TO-DO: change this handler to perform your own actions. You may need more + # than one handler, or you may not need any handlers at all. + @XBlock.json_handler + def increment_count(self, data, suffix=""): + """ + Increments data. An example handler. + """ + if suffix: + pass # TO-DO: Use the suffix when storing data. + # Just to show data coming in... + assert data["hello"] == "world" + + self.count += 1 + return {"count": self.count} + + # TO-DO: change this to create the scenarios you'd like to see in the + # workbench while developing your XBlock. + @staticmethod + def workbench_scenarios(): + """Create canned scenario for display in the workbench.""" + return [ + ( + "AnnotatableBlock", + """ + """, + ), + ( + "Multiple AnnotatableBlock", + """ + + + + + """, + ), + ] + + @staticmethod + def get_dummy(): + """ + Generate initial i18n with dummy method. + """ + return translation.gettext_noop("Dummy") diff --git a/xblocks_contrib/annotatable/conf/locale/__init__.py b/xblocks_contrib/annotatable/conf/locale/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/xblocks_contrib/annotatable/conf/locale/config.yaml b/xblocks_contrib/annotatable/conf/locale/config.yaml new file mode 100644 index 0000000..4bfb0ca --- /dev/null +++ b/xblocks_contrib/annotatable/conf/locale/config.yaml @@ -0,0 +1,93 @@ +# Configuration for i18n workflow. + +locales: + - en # English - Source Language + # - am # Amharic + - ar # Arabic + # - az # Azerbaijani + # - bg_BG # Bulgarian (Bulgaria) + # - bn_BD # Bengali (Bangladesh) + # - bn_IN # Bengali (India) + # - bs # Bosnian + # - ca # Catalan + # - ca@valencia # Catalan (Valencia) + # - cs # Czech + # - cy # Welsh + # - da # Danish + # - de_DE # German (Germany) + # - el # Greek + # - en_GB # English (United Kingdom) + # # Don't pull these until we figure out why pages randomly display in these locales, + # # when the user's browser is in English and the user is not logged in. + # #- en@lolcat # LOLCAT English + # #- en@pirate # Pirate English + - es_419 # Spanish (Latin America) + # - es_AR # Spanish (Argentina) + # - es_EC # Spanish (Ecuador) + # - es_ES # Spanish (Spain) + # - es_MX # Spanish (Mexico) + # - es_PE # Spanish (Peru) + # - et_EE # Estonian (Estonia) + # - eu_ES # Basque (Spain) + # - fa # Persian + # - fa_IR # Persian (Iran) + # - fi_FI # Finnish (Finland) + # - fil # Filipino + - fr # French + # - gl # Galician + # - gu # Gujarati + - he # Hebrew + - hi # Hindi + # - hr # Croatian + # - hu # Hungarian + # - hy_AM # Armenian (Armenia) + # - id # Indonesian + # - it_IT # Italian (Italy) + # - ja_JP # Japanese (Japan) + # - kk_KZ # Kazakh (Kazakhstan) + # - km_KH # Khmer (Cambodia) + # - kn # Kannada + - ko_KR # Korean (Korea) + # - lt_LT # Lithuanian (Lithuania) + # - ml # Malayalam + # - mn # Mongolian + # - mr # Marathi + # - ms # Malay + # - nb # Norwegian Bokmål + # - ne # Nepali + # - nl_NL # Dutch (Netherlands) + # - or # Oriya + # - pl # Polish + - pt_BR # Portuguese (Brazil) + # - pt_PT # Portuguese (Portugal) + # - ro # Romanian + - ru # Russian + # - si # Sinhala + # - sk # Slovak + # - sl # Slovenian + # - sq # Albanian + # - sr # Serbian + # - sv # Swedish + # - sw # Swahili + # - ta # Tamil + # - te # Telugu + # - th # Thai + # - tr_TR # Turkish (Turkey) + # - uk # Ukranian + # - ur # Urdu + # - uz # Uzbek + # - vi # Vietnamese + - zh_CN # Chinese (China) + # - zh_HK # Chinese (Hong Kong) + # - zh_TW # Chinese (Taiwan) + + +# The locales used for fake-accented English, for testing. +dummy_locales: + - eo + - rtl # Fake testing language for Arabic + +# Directories we don't search for strings. +ignore_dirs: + - '*/css' + - 'public/js/translations' diff --git a/xblocks_contrib/annotatable/static/css/annotatable.css b/xblocks_contrib/annotatable/static/css/annotatable.css new file mode 100644 index 0000000..660c1a0 --- /dev/null +++ b/xblocks_contrib/annotatable/static/css/annotatable.css @@ -0,0 +1,9 @@ +/* CSS for AnnotatableBlock */ + +.annotatable .count { + font-weight: bold; +} + +.annotatable p { + cursor: pointer; +} diff --git a/xblocks_contrib/annotatable/static/js/src/annotatable.js b/xblocks_contrib/annotatable/static/js/src/annotatable.js new file mode 100644 index 0000000..4d28b95 --- /dev/null +++ b/xblocks_contrib/annotatable/static/js/src/annotatable.js @@ -0,0 +1,38 @@ + +/* JavaScript for AnnotatableBlock. */ +function AnnotatableBlock(runtime, element) { + const updateCount = (result) => { + $('.count', element).text(result.count); + }; + + const handlerUrl = runtime.handlerUrl(element, 'increment_count'); + + $('p', element).on('click', (eventObject) => { + $.ajax({ + type: 'POST', + url: handlerUrl, + contentType: 'application/json', + data: JSON.stringify({hello: 'world'}), + success: updateCount + }); + }); + + $(() => { + /* + Use `gettext` provided by django-statici18n for static translations + */ + + // eslint-disable-next-line no-undef + const dummyText = gettext('Hello World'); + + // Example usage of interpolation for translated strings + // eslint-disable-next-line no-undef + const message = StringUtils.interpolate( + gettext('You are enrolling in {courseName}'), + { + courseName: 'Rock & Roll 101' + } + ); + console.log(message); // This is just for demonstration purposes + }); +} diff --git a/xblocks_contrib/annotatable/templates/annotatable.html b/xblocks_contrib/annotatable/templates/annotatable.html new file mode 100644 index 0000000..0c43172 --- /dev/null +++ b/xblocks_contrib/annotatable/templates/annotatable.html @@ -0,0 +1,7 @@ +{% load i18n %} + +
+

+ AnnotatableBlock: {% trans "count is now" %} {{ count }} {% trans "click me to increment." %} +

+
diff --git a/xblocks_contrib/discussion/.tx/config b/xblocks_contrib/discussion/.tx/config new file mode 100644 index 0000000..b2a95c6 --- /dev/null +++ b/xblocks_contrib/discussion/.tx/config @@ -0,0 +1,8 @@ +[main] +host = https://www.transifex.com + +[o:open-edx:p:p:xblocks:r:discussion] +file_filter = discussion/translations//LC_MESSAGES/text.po +source_file = discussion/translations/en/LC_MESSAGES/text.po +source_lang = en +type = PO diff --git a/xblocks_contrib/discussion/__init__.py b/xblocks_contrib/discussion/__init__.py new file mode 100644 index 0000000..223f080 --- /dev/null +++ b/xblocks_contrib/discussion/__init__.py @@ -0,0 +1,5 @@ +""" +Init for the DiscussionXBlock. +""" + +from .discussion import DiscussionXBlock diff --git a/xblocks_contrib/discussion/conf/locale/__init__.py b/xblocks_contrib/discussion/conf/locale/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/xblocks_contrib/discussion/conf/locale/config.yaml b/xblocks_contrib/discussion/conf/locale/config.yaml new file mode 100644 index 0000000..4bfb0ca --- /dev/null +++ b/xblocks_contrib/discussion/conf/locale/config.yaml @@ -0,0 +1,93 @@ +# Configuration for i18n workflow. + +locales: + - en # English - Source Language + # - am # Amharic + - ar # Arabic + # - az # Azerbaijani + # - bg_BG # Bulgarian (Bulgaria) + # - bn_BD # Bengali (Bangladesh) + # - bn_IN # Bengali (India) + # - bs # Bosnian + # - ca # Catalan + # - ca@valencia # Catalan (Valencia) + # - cs # Czech + # - cy # Welsh + # - da # Danish + # - de_DE # German (Germany) + # - el # Greek + # - en_GB # English (United Kingdom) + # # Don't pull these until we figure out why pages randomly display in these locales, + # # when the user's browser is in English and the user is not logged in. + # #- en@lolcat # LOLCAT English + # #- en@pirate # Pirate English + - es_419 # Spanish (Latin America) + # - es_AR # Spanish (Argentina) + # - es_EC # Spanish (Ecuador) + # - es_ES # Spanish (Spain) + # - es_MX # Spanish (Mexico) + # - es_PE # Spanish (Peru) + # - et_EE # Estonian (Estonia) + # - eu_ES # Basque (Spain) + # - fa # Persian + # - fa_IR # Persian (Iran) + # - fi_FI # Finnish (Finland) + # - fil # Filipino + - fr # French + # - gl # Galician + # - gu # Gujarati + - he # Hebrew + - hi # Hindi + # - hr # Croatian + # - hu # Hungarian + # - hy_AM # Armenian (Armenia) + # - id # Indonesian + # - it_IT # Italian (Italy) + # - ja_JP # Japanese (Japan) + # - kk_KZ # Kazakh (Kazakhstan) + # - km_KH # Khmer (Cambodia) + # - kn # Kannada + - ko_KR # Korean (Korea) + # - lt_LT # Lithuanian (Lithuania) + # - ml # Malayalam + # - mn # Mongolian + # - mr # Marathi + # - ms # Malay + # - nb # Norwegian Bokmål + # - ne # Nepali + # - nl_NL # Dutch (Netherlands) + # - or # Oriya + # - pl # Polish + - pt_BR # Portuguese (Brazil) + # - pt_PT # Portuguese (Portugal) + # - ro # Romanian + - ru # Russian + # - si # Sinhala + # - sk # Slovak + # - sl # Slovenian + # - sq # Albanian + # - sr # Serbian + # - sv # Swedish + # - sw # Swahili + # - ta # Tamil + # - te # Telugu + # - th # Thai + # - tr_TR # Turkish (Turkey) + # - uk # Ukranian + # - ur # Urdu + # - uz # Uzbek + # - vi # Vietnamese + - zh_CN # Chinese (China) + # - zh_HK # Chinese (Hong Kong) + # - zh_TW # Chinese (Taiwan) + + +# The locales used for fake-accented English, for testing. +dummy_locales: + - eo + - rtl # Fake testing language for Arabic + +# Directories we don't search for strings. +ignore_dirs: + - '*/css' + - 'public/js/translations' diff --git a/xblocks_contrib/discussion/discussion.py b/xblocks_contrib/discussion/discussion.py new file mode 100644 index 0000000..04c6ec9 --- /dev/null +++ b/xblocks_contrib/discussion/discussion.py @@ -0,0 +1,99 @@ +"""TO-DO: Write a description of what this XBlock is.""" + +from importlib.resources import files + +from django.utils import translation +from web_fragments.fragment import Fragment +from xblock.core import XBlock +from xblock.fields import Integer, Scope +from xblock.utils.resources import ResourceLoader + +resource_loader = ResourceLoader(__name__) + + +# This Xblock is just to test the strucutre of xblocks-contrib +@XBlock.needs('i18n') +class DiscussionXBlock(XBlock): + """ + TO-DO: document what your XBlock does. + """ + + # Fields are defined on the class. You can access them in your code as + # self.. + + # TO-DO: delete count, and define your own fields. + count = Integer( + default=0, + scope=Scope.user_state, + help="A simple counter, to show something happening", + ) + + def resource_string(self, path): + """Handy helper for getting resources from our kit.""" + return files(__package__).joinpath(path).read_text(encoding="utf-8") + + # TO-DO: change this view to display your data your own way. + def student_view(self, context=None): + """ + Create primary view of the DiscussionXBlock, shown to students when viewing courses. + """ + if context: + pass # TO-DO: do something based on the context. + + frag = Fragment() + frag.add_content(resource_loader.render_django_template( + 'templates/discussion.html', + { + 'count': self.count, + }, + i18n_service=self.runtime.service(self, 'i18n') + )) + + frag.add_css(self.resource_string("static/css/discussion.css")) + frag.add_javascript(self.resource_string("static/js/src/discussion.js")) + frag.initialize_js("DiscussionXBlock") + return frag + + # TO-DO: change this handler to perform your own actions. You may need more + # than one handler, or you may not need any handlers at all. + @XBlock.json_handler + def increment_count(self, data, suffix=""): + """ + Increments data. An example handler. + """ + if suffix: + pass # TO-DO: Use the suffix when storing data. + # Just to show data coming in... + assert data["hello"] == "world" + + self.count += 1 + return {"count": self.count} + + # TO-DO: change this to create the scenarios you'd like to see in the + # workbench while developing your XBlock. + @staticmethod + def workbench_scenarios(): + """Create canned scenario for display in the workbench.""" + return [ + ( + "DiscussionXBlock", + """ + """, + ), + ( + "Multiple DiscussionXBlock", + """ + + + + + """, + ), + ] + + @staticmethod + def get_dummy(): + """ + Generate initial i18n with dummy method. + """ + return translation.gettext_noop("Dummy") diff --git a/xblocks_contrib/discussion/static/css/discussion.css b/xblocks_contrib/discussion/static/css/discussion.css new file mode 100644 index 0000000..19dca48 --- /dev/null +++ b/xblocks_contrib/discussion/static/css/discussion.css @@ -0,0 +1,9 @@ +/* CSS for DiscussionXBlock */ + +.discussion .count { + font-weight: bold; +} + +.discussion p { + cursor: pointer; +} diff --git a/xblocks_contrib/discussion/static/js/src/discussion.js b/xblocks_contrib/discussion/static/js/src/discussion.js new file mode 100644 index 0000000..eb9a308 --- /dev/null +++ b/xblocks_contrib/discussion/static/js/src/discussion.js @@ -0,0 +1,38 @@ + +/* JavaScript for DiscussionXBlock. */ +function DiscussionXBlock(runtime, element) { + const updateCount = (result) => { + $('.count', element).text(result.count); + }; + + const handlerUrl = runtime.handlerUrl(element, 'increment_count'); + + $('p', element).on('click', (eventObject) => { + $.ajax({ + type: 'POST', + url: handlerUrl, + contentType: 'application/json', + data: JSON.stringify({hello: 'world'}), + success: updateCount + }); + }); + + $(() => { + /* + Use `gettext` provided by django-statici18n for static translations + */ + + // eslint-disable-next-line no-undef + const dummyText = gettext('Hello World'); + + // Example usage of interpolation for translated strings + // eslint-disable-next-line no-undef + const message = StringUtils.interpolate( + gettext('You are enrolling in {courseName}'), + { + courseName: 'Rock & Roll 101' + } + ); + console.log(message); // This is just for demonstration purposes + }); +} diff --git a/xblocks_contrib/discussion/templates/discussion.html b/xblocks_contrib/discussion/templates/discussion.html new file mode 100644 index 0000000..c54902b --- /dev/null +++ b/xblocks_contrib/discussion/templates/discussion.html @@ -0,0 +1,7 @@ +{% load i18n %} + +
+

+ DiscussionXBlock: {% trans "count is now" %} {{ count }} {% trans "click me to increment." %} +

+
diff --git a/xblocks_contrib/html/.tx/config b/xblocks_contrib/html/.tx/config new file mode 100644 index 0000000..d157595 --- /dev/null +++ b/xblocks_contrib/html/.tx/config @@ -0,0 +1,8 @@ +[main] +host = https://www.transifex.com + +[o:open-edx:p:p:xblocks:r:html] +file_filter = html/translations//LC_MESSAGES/text.po +source_file = html/translations/en/LC_MESSAGES/text.po +source_lang = en +type = PO diff --git a/xblocks_contrib/html/__init__.py b/xblocks_contrib/html/__init__.py new file mode 100644 index 0000000..5b8118f --- /dev/null +++ b/xblocks_contrib/html/__init__.py @@ -0,0 +1,5 @@ +""" +Init for the HtmlBlock. +""" + +from .html import HtmlBlock diff --git a/xblocks_contrib/html/conf/locale/__init__.py b/xblocks_contrib/html/conf/locale/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/xblocks_contrib/html/conf/locale/config.yaml b/xblocks_contrib/html/conf/locale/config.yaml new file mode 100644 index 0000000..4bfb0ca --- /dev/null +++ b/xblocks_contrib/html/conf/locale/config.yaml @@ -0,0 +1,93 @@ +# Configuration for i18n workflow. + +locales: + - en # English - Source Language + # - am # Amharic + - ar # Arabic + # - az # Azerbaijani + # - bg_BG # Bulgarian (Bulgaria) + # - bn_BD # Bengali (Bangladesh) + # - bn_IN # Bengali (India) + # - bs # Bosnian + # - ca # Catalan + # - ca@valencia # Catalan (Valencia) + # - cs # Czech + # - cy # Welsh + # - da # Danish + # - de_DE # German (Germany) + # - el # Greek + # - en_GB # English (United Kingdom) + # # Don't pull these until we figure out why pages randomly display in these locales, + # # when the user's browser is in English and the user is not logged in. + # #- en@lolcat # LOLCAT English + # #- en@pirate # Pirate English + - es_419 # Spanish (Latin America) + # - es_AR # Spanish (Argentina) + # - es_EC # Spanish (Ecuador) + # - es_ES # Spanish (Spain) + # - es_MX # Spanish (Mexico) + # - es_PE # Spanish (Peru) + # - et_EE # Estonian (Estonia) + # - eu_ES # Basque (Spain) + # - fa # Persian + # - fa_IR # Persian (Iran) + # - fi_FI # Finnish (Finland) + # - fil # Filipino + - fr # French + # - gl # Galician + # - gu # Gujarati + - he # Hebrew + - hi # Hindi + # - hr # Croatian + # - hu # Hungarian + # - hy_AM # Armenian (Armenia) + # - id # Indonesian + # - it_IT # Italian (Italy) + # - ja_JP # Japanese (Japan) + # - kk_KZ # Kazakh (Kazakhstan) + # - km_KH # Khmer (Cambodia) + # - kn # Kannada + - ko_KR # Korean (Korea) + # - lt_LT # Lithuanian (Lithuania) + # - ml # Malayalam + # - mn # Mongolian + # - mr # Marathi + # - ms # Malay + # - nb # Norwegian Bokmål + # - ne # Nepali + # - nl_NL # Dutch (Netherlands) + # - or # Oriya + # - pl # Polish + - pt_BR # Portuguese (Brazil) + # - pt_PT # Portuguese (Portugal) + # - ro # Romanian + - ru # Russian + # - si # Sinhala + # - sk # Slovak + # - sl # Slovenian + # - sq # Albanian + # - sr # Serbian + # - sv # Swedish + # - sw # Swahili + # - ta # Tamil + # - te # Telugu + # - th # Thai + # - tr_TR # Turkish (Turkey) + # - uk # Ukranian + # - ur # Urdu + # - uz # Uzbek + # - vi # Vietnamese + - zh_CN # Chinese (China) + # - zh_HK # Chinese (Hong Kong) + # - zh_TW # Chinese (Taiwan) + + +# The locales used for fake-accented English, for testing. +dummy_locales: + - eo + - rtl # Fake testing language for Arabic + +# Directories we don't search for strings. +ignore_dirs: + - '*/css' + - 'public/js/translations' diff --git a/xblocks_contrib/html/html.py b/xblocks_contrib/html/html.py new file mode 100644 index 0000000..cd25677 --- /dev/null +++ b/xblocks_contrib/html/html.py @@ -0,0 +1,99 @@ +"""TO-DO: Write a description of what this XBlock is.""" + +from importlib.resources import files + +from django.utils import translation +from web_fragments.fragment import Fragment +from xblock.core import XBlock +from xblock.fields import Integer, Scope +from xblock.utils.resources import ResourceLoader + +resource_loader = ResourceLoader(__name__) + + +# This Xblock is just to test the strucutre of xblocks-contrib +@XBlock.needs('i18n') +class HtmlBlock(XBlock): + """ + TO-DO: document what your XBlock does. + """ + + # Fields are defined on the class. You can access them in your code as + # self.. + + # TO-DO: delete count, and define your own fields. + count = Integer( + default=0, + scope=Scope.user_state, + help="A simple counter, to show something happening", + ) + + def resource_string(self, path): + """Handy helper for getting resources from our kit.""" + return files(__package__).joinpath(path).read_text(encoding="utf-8") + + # TO-DO: change this view to display your data your own way. + def student_view(self, context=None): + """ + Create primary view of the HtmlBlock, shown to students when viewing courses. + """ + if context: + pass # TO-DO: do something based on the context. + + frag = Fragment() + frag.add_content(resource_loader.render_django_template( + 'templates/html.html', + { + 'count': self.count, + }, + i18n_service=self.runtime.service(self, 'i18n') + )) + + frag.add_css(self.resource_string("static/css/html.css")) + frag.add_javascript(self.resource_string("static/js/src/html.js")) + frag.initialize_js("HtmlBlock") + return frag + + # TO-DO: change this handler to perform your own actions. You may need more + # than one handler, or you may not need any handlers at all. + @XBlock.json_handler + def increment_count(self, data, suffix=""): + """ + Increments data. An example handler. + """ + if suffix: + pass # TO-DO: Use the suffix when storing data. + # Just to show data coming in... + assert data["hello"] == "world" + + self.count += 1 + return {"count": self.count} + + # TO-DO: change this to create the scenarios you'd like to see in the + # workbench while developing your XBlock. + @staticmethod + def workbench_scenarios(): + """Create canned scenario for display in the workbench.""" + return [ + ( + "HtmlBlock", + """ + """, + ), + ( + "Multiple HtmlBlock", + """ + + + + + """, + ), + ] + + @staticmethod + def get_dummy(): + """ + Generate initial i18n with dummy method. + """ + return translation.gettext_noop("Dummy") diff --git a/xblocks_contrib/html/static/css/html.css b/xblocks_contrib/html/static/css/html.css new file mode 100644 index 0000000..c6e5e75 --- /dev/null +++ b/xblocks_contrib/html/static/css/html.css @@ -0,0 +1,9 @@ +/* CSS for HtmlBlock */ + +.html .count { + font-weight: bold; +} + +.html p { + cursor: pointer; +} diff --git a/xblocks_contrib/html/static/js/src/html.js b/xblocks_contrib/html/static/js/src/html.js new file mode 100644 index 0000000..6042c95 --- /dev/null +++ b/xblocks_contrib/html/static/js/src/html.js @@ -0,0 +1,38 @@ + +/* JavaScript for HtmlBlock. */ +function HtmlBlock(runtime, element) { + const updateCount = (result) => { + $('.count', element).text(result.count); + }; + + const handlerUrl = runtime.handlerUrl(element, 'increment_count'); + + $('p', element).on('click', (eventObject) => { + $.ajax({ + type: 'POST', + url: handlerUrl, + contentType: 'application/json', + data: JSON.stringify({hello: 'world'}), + success: updateCount + }); + }); + + $(() => { + /* + Use `gettext` provided by django-statici18n for static translations + */ + + // eslint-disable-next-line no-undef + const dummyText = gettext('Hello World'); + + // Example usage of interpolation for translated strings + // eslint-disable-next-line no-undef + const message = StringUtils.interpolate( + gettext('You are enrolling in {courseName}'), + { + courseName: 'Rock & Roll 101' + } + ); + console.log(message); // This is just for demonstration purposes + }); +} diff --git a/xblocks_contrib/html/templates/html.html b/xblocks_contrib/html/templates/html.html new file mode 100644 index 0000000..6271035 --- /dev/null +++ b/xblocks_contrib/html/templates/html.html @@ -0,0 +1,7 @@ +{% load i18n %} + +
+

+ HtmlBlock: {% trans "count is now" %} {{ count }} {% trans "click me to increment." %} +

+
diff --git a/xblocks_contrib/lti/.tx/config b/xblocks_contrib/lti/.tx/config new file mode 100644 index 0000000..65e3358 --- /dev/null +++ b/xblocks_contrib/lti/.tx/config @@ -0,0 +1,8 @@ +[main] +host = https://www.transifex.com + +[o:open-edx:p:p:xblocks:r:lti] +file_filter = lti/translations//LC_MESSAGES/text.po +source_file = lti/translations/en/LC_MESSAGES/text.po +source_lang = en +type = PO diff --git a/xblocks_contrib/lti/__init__.py b/xblocks_contrib/lti/__init__.py new file mode 100644 index 0000000..094c184 --- /dev/null +++ b/xblocks_contrib/lti/__init__.py @@ -0,0 +1,5 @@ +""" +Init for the LTIBlock. +""" + +from .lti import LTIBlock diff --git a/xblocks_contrib/lti/conf/locale/__init__.py b/xblocks_contrib/lti/conf/locale/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/xblocks_contrib/lti/conf/locale/config.yaml b/xblocks_contrib/lti/conf/locale/config.yaml new file mode 100644 index 0000000..4bfb0ca --- /dev/null +++ b/xblocks_contrib/lti/conf/locale/config.yaml @@ -0,0 +1,93 @@ +# Configuration for i18n workflow. + +locales: + - en # English - Source Language + # - am # Amharic + - ar # Arabic + # - az # Azerbaijani + # - bg_BG # Bulgarian (Bulgaria) + # - bn_BD # Bengali (Bangladesh) + # - bn_IN # Bengali (India) + # - bs # Bosnian + # - ca # Catalan + # - ca@valencia # Catalan (Valencia) + # - cs # Czech + # - cy # Welsh + # - da # Danish + # - de_DE # German (Germany) + # - el # Greek + # - en_GB # English (United Kingdom) + # # Don't pull these until we figure out why pages randomly display in these locales, + # # when the user's browser is in English and the user is not logged in. + # #- en@lolcat # LOLCAT English + # #- en@pirate # Pirate English + - es_419 # Spanish (Latin America) + # - es_AR # Spanish (Argentina) + # - es_EC # Spanish (Ecuador) + # - es_ES # Spanish (Spain) + # - es_MX # Spanish (Mexico) + # - es_PE # Spanish (Peru) + # - et_EE # Estonian (Estonia) + # - eu_ES # Basque (Spain) + # - fa # Persian + # - fa_IR # Persian (Iran) + # - fi_FI # Finnish (Finland) + # - fil # Filipino + - fr # French + # - gl # Galician + # - gu # Gujarati + - he # Hebrew + - hi # Hindi + # - hr # Croatian + # - hu # Hungarian + # - hy_AM # Armenian (Armenia) + # - id # Indonesian + # - it_IT # Italian (Italy) + # - ja_JP # Japanese (Japan) + # - kk_KZ # Kazakh (Kazakhstan) + # - km_KH # Khmer (Cambodia) + # - kn # Kannada + - ko_KR # Korean (Korea) + # - lt_LT # Lithuanian (Lithuania) + # - ml # Malayalam + # - mn # Mongolian + # - mr # Marathi + # - ms # Malay + # - nb # Norwegian Bokmål + # - ne # Nepali + # - nl_NL # Dutch (Netherlands) + # - or # Oriya + # - pl # Polish + - pt_BR # Portuguese (Brazil) + # - pt_PT # Portuguese (Portugal) + # - ro # Romanian + - ru # Russian + # - si # Sinhala + # - sk # Slovak + # - sl # Slovenian + # - sq # Albanian + # - sr # Serbian + # - sv # Swedish + # - sw # Swahili + # - ta # Tamil + # - te # Telugu + # - th # Thai + # - tr_TR # Turkish (Turkey) + # - uk # Ukranian + # - ur # Urdu + # - uz # Uzbek + # - vi # Vietnamese + - zh_CN # Chinese (China) + # - zh_HK # Chinese (Hong Kong) + # - zh_TW # Chinese (Taiwan) + + +# The locales used for fake-accented English, for testing. +dummy_locales: + - eo + - rtl # Fake testing language for Arabic + +# Directories we don't search for strings. +ignore_dirs: + - '*/css' + - 'public/js/translations' diff --git a/xblocks_contrib/lti/lti.py b/xblocks_contrib/lti/lti.py new file mode 100644 index 0000000..e7ba959 --- /dev/null +++ b/xblocks_contrib/lti/lti.py @@ -0,0 +1,99 @@ +"""TO-DO: Write a description of what this XBlock is.""" + +from importlib.resources import files + +from django.utils import translation +from web_fragments.fragment import Fragment +from xblock.core import XBlock +from xblock.fields import Integer, Scope +from xblock.utils.resources import ResourceLoader + +resource_loader = ResourceLoader(__name__) + + +# This Xblock is just to test the strucutre of xblocks-contrib +@XBlock.needs('i18n') +class LTIBlock(XBlock): + """ + TO-DO: document what your XBlock does. + """ + + # Fields are defined on the class. You can access them in your code as + # self.. + + # TO-DO: delete count, and define your own fields. + count = Integer( + default=0, + scope=Scope.user_state, + help="A simple counter, to show something happening", + ) + + def resource_string(self, path): + """Handy helper for getting resources from our kit.""" + return files(__package__).joinpath(path).read_text(encoding="utf-8") + + # TO-DO: change this view to display your data your own way. + def student_view(self, context=None): + """ + Create primary view of the LTIBlock, shown to students when viewing courses. + """ + if context: + pass # TO-DO: do something based on the context. + + frag = Fragment() + frag.add_content(resource_loader.render_django_template( + 'templates/lti.html', + { + 'count': self.count, + }, + i18n_service=self.runtime.service(self, 'i18n') + )) + + frag.add_css(self.resource_string("static/css/lti.css")) + frag.add_javascript(self.resource_string("static/js/src/lti.js")) + frag.initialize_js("LTIBlock") + return frag + + # TO-DO: change this handler to perform your own actions. You may need more + # than one handler, or you may not need any handlers at all. + @XBlock.json_handler + def increment_count(self, data, suffix=""): + """ + Increments data. An example handler. + """ + if suffix: + pass # TO-DO: Use the suffix when storing data. + # Just to show data coming in... + assert data["hello"] == "world" + + self.count += 1 + return {"count": self.count} + + # TO-DO: change this to create the scenarios you'd like to see in the + # workbench while developing your XBlock. + @staticmethod + def workbench_scenarios(): + """Create canned scenario for display in the workbench.""" + return [ + ( + "LTIBlock", + """ + """, + ), + ( + "Multiple LTIBlock", + """ + + + + + """, + ), + ] + + @staticmethod + def get_dummy(): + """ + Generate initial i18n with dummy method. + """ + return translation.gettext_noop("Dummy") diff --git a/xblocks_contrib/lti/static/css/lti.css b/xblocks_contrib/lti/static/css/lti.css new file mode 100644 index 0000000..28e3b63 --- /dev/null +++ b/xblocks_contrib/lti/static/css/lti.css @@ -0,0 +1,9 @@ +/* CSS for LTIBlock */ + +.lti .count { + font-weight: bold; +} + +.lti p { + cursor: pointer; +} diff --git a/xblocks_contrib/lti/static/js/src/lti.js b/xblocks_contrib/lti/static/js/src/lti.js new file mode 100644 index 0000000..74e5e76 --- /dev/null +++ b/xblocks_contrib/lti/static/js/src/lti.js @@ -0,0 +1,38 @@ + +/* JavaScript for LTIBlock. */ +function LTIBlock(runtime, element) { + const updateCount = (result) => { + $('.count', element).text(result.count); + }; + + const handlerUrl = runtime.handlerUrl(element, 'increment_count'); + + $('p', element).on('click', (eventObject) => { + $.ajax({ + type: 'POST', + url: handlerUrl, + contentType: 'application/json', + data: JSON.stringify({hello: 'world'}), + success: updateCount + }); + }); + + $(() => { + /* + Use `gettext` provided by django-statici18n for static translations + */ + + // eslint-disable-next-line no-undef + const dummyText = gettext('Hello World'); + + // Example usage of interpolation for translated strings + // eslint-disable-next-line no-undef + const message = StringUtils.interpolate( + gettext('You are enrolling in {courseName}'), + { + courseName: 'Rock & Roll 101' + } + ); + console.log(message); // This is just for demonstration purposes + }); +} diff --git a/xblocks_contrib/lti/templates/lti.html b/xblocks_contrib/lti/templates/lti.html new file mode 100644 index 0000000..8f9288f --- /dev/null +++ b/xblocks_contrib/lti/templates/lti.html @@ -0,0 +1,7 @@ +{% load i18n %} + +
+

+ LTIBlock: {% trans "count is now" %} {{ count }} {% trans "click me to increment." %} +

+
diff --git a/xblocks_contrib/poll/__init__.py b/xblocks_contrib/poll/__init__.py index 006f95d..6eddb6a 100644 --- a/xblocks_contrib/poll/__init__.py +++ b/xblocks_contrib/poll/__init__.py @@ -1,5 +1,5 @@ """ -Init for the PollBlock package. +Init for the PollBlock. """ from .poll import PollBlock diff --git a/xblocks_contrib/poll/poll.py b/xblocks_contrib/poll/poll.py index 57c42cf..cbba29f 100644 --- a/xblocks_contrib/poll/poll.py +++ b/xblocks_contrib/poll/poll.py @@ -35,14 +35,14 @@ def resource_string(self, path): # TO-DO: change this view to display your data your own way. def student_view(self, context=None): """ - Create primary view of the PollBlock, shown to students when viewing courses. + Create primary view of the XBlock, shown to students when viewing courses. """ if context: pass # TO-DO: do something based on the context. frag = Fragment() frag.add_content(resource_loader.render_django_template( - 'static/html/poll.html', + 'templates/poll.html', { 'count': self.count, }, @@ -77,15 +77,15 @@ def workbench_scenarios(): return [ ( "PollBlock", - """ + """ """, ), ( "Multiple PollBlock", """ - - - + + + """, ), diff --git a/xblocks_contrib/poll/static/README.txt b/xblocks_contrib/poll/static/README.txt deleted file mode 100644 index 0472ef6..0000000 --- a/xblocks_contrib/poll/static/README.txt +++ /dev/null @@ -1,19 +0,0 @@ -This static directory is for files that should be included in your kit as plain -static files. - -You can ask the runtime for a URL that will retrieve these files with: - - url = self.runtime.local_resource_url(self, "static/js/lib.js") - -The default implementation is very strict though, and will not serve files from -the static directory. It will serve files from a directory named "public". -Create a directory alongside this one named "public", and put files there. -Then you can get a url with code like this: - - url = self.runtime.local_resource_url(self, "public/js/lib.js") - -The sample code includes a function you can use to read the content of files -in the static directory, like this: - - frag.add_javascript(self.resource_string("static/js/my_block.js")) - diff --git a/xblocks_contrib/poll/static/css/poll.css b/xblocks_contrib/poll/static/css/poll.css index 033a4b6..b337caf 100644 --- a/xblocks_contrib/poll/static/css/poll.css +++ b/xblocks_contrib/poll/static/css/poll.css @@ -1,9 +1,9 @@ /* CSS for PollBlock */ -.poll_xblock .count { +.poll .count { font-weight: bold; } -.poll_xblock p { +.poll p { cursor: pointer; } diff --git a/xblocks_contrib/poll/static/html/poll.html b/xblocks_contrib/poll/static/html/poll.html deleted file mode 100644 index 442e98d..0000000 --- a/xblocks_contrib/poll/static/html/poll.html +++ /dev/null @@ -1,5 +0,0 @@ -{% load i18n %} - -
-

PollBlock: {% trans "count is now" %} {{ count }} {% trans "click me to increment." %}

-
diff --git a/xblocks_contrib/poll/static/js/src/poll.js b/xblocks_contrib/poll/static/js/src/poll.js index cd44d8a..7389c87 100644 --- a/xblocks_contrib/poll/static/js/src/poll.js +++ b/xblocks_contrib/poll/static/js/src/poll.js @@ -1,33 +1,38 @@ -/* Javascript for PollBlock. */ -function PollBlock(runtime, element) { - function updateCount(result) { +/* JavaScript for PollBlock. */ +function PollBlock(runtime, element) { + const updateCount = (result) => { $('.count', element).text(result.count); - } + }; - var handlerUrl = runtime.handlerUrl(element, 'increment_count'); + const handlerUrl = runtime.handlerUrl(element, 'increment_count'); - $('p', element).click(function(eventObject) { + $('p', element).on('click', (eventObject) => { $.ajax({ - type: "POST", + type: 'POST', url: handlerUrl, - data: JSON.stringify({"hello": "world"}), + contentType: 'application/json', + data: JSON.stringify({hello: 'world'}), success: updateCount }); }); - $(function ($) { + $(() => { /* Use `gettext` provided by django-statici18n for static translations - - var gettext = PollBlocki18n.gettext; */ - /* Here's where you'd do things on page load. */ + // eslint-disable-next-line no-undef + const dummyText = gettext('Hello World'); - // dummy_text is to have at least one string to translate in JS files. If you remove this line, - // and you don't have any other string to translate in JS files; then you must remove the (--merge-po-files) - // option from the "extract_translations" command in the Makefile - const dummy_text = gettext("Hello World"); + // Example usage of interpolation for translated strings + // eslint-disable-next-line no-undef + const message = StringUtils.interpolate( + gettext('You are enrolling in {courseName}'), + { + courseName: 'Rock & Roll 101' + } + ); + console.log(message); // This is just for demonstration purposes }); } diff --git a/xblocks_contrib/poll/templates/poll.html b/xblocks_contrib/poll/templates/poll.html new file mode 100644 index 0000000..3bd5fec --- /dev/null +++ b/xblocks_contrib/poll/templates/poll.html @@ -0,0 +1,7 @@ +{% load i18n %} + +
+

+ PollBlock: {% trans "count is now" %} {{ count }} {% trans "click me to increment." %} +

+
diff --git a/xblocks_contrib/problem/.tx/config b/xblocks_contrib/problem/.tx/config new file mode 100644 index 0000000..7e3be76 --- /dev/null +++ b/xblocks_contrib/problem/.tx/config @@ -0,0 +1,8 @@ +[main] +host = https://www.transifex.com + +[o:open-edx:p:p:xblocks:r:problem] +file_filter = problem/translations//LC_MESSAGES/text.po +source_file = problem/translations/en/LC_MESSAGES/text.po +source_lang = en +type = PO diff --git a/xblocks_contrib/problem/__init__.py b/xblocks_contrib/problem/__init__.py new file mode 100644 index 0000000..ca5bda7 --- /dev/null +++ b/xblocks_contrib/problem/__init__.py @@ -0,0 +1,5 @@ +""" +Init for the ProblemBlock. +""" + +from .problem import ProblemBlock diff --git a/xblocks_contrib/problem/conf/locale/__init__.py b/xblocks_contrib/problem/conf/locale/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/xblocks_contrib/problem/conf/locale/config.yaml b/xblocks_contrib/problem/conf/locale/config.yaml new file mode 100644 index 0000000..4bfb0ca --- /dev/null +++ b/xblocks_contrib/problem/conf/locale/config.yaml @@ -0,0 +1,93 @@ +# Configuration for i18n workflow. + +locales: + - en # English - Source Language + # - am # Amharic + - ar # Arabic + # - az # Azerbaijani + # - bg_BG # Bulgarian (Bulgaria) + # - bn_BD # Bengali (Bangladesh) + # - bn_IN # Bengali (India) + # - bs # Bosnian + # - ca # Catalan + # - ca@valencia # Catalan (Valencia) + # - cs # Czech + # - cy # Welsh + # - da # Danish + # - de_DE # German (Germany) + # - el # Greek + # - en_GB # English (United Kingdom) + # # Don't pull these until we figure out why pages randomly display in these locales, + # # when the user's browser is in English and the user is not logged in. + # #- en@lolcat # LOLCAT English + # #- en@pirate # Pirate English + - es_419 # Spanish (Latin America) + # - es_AR # Spanish (Argentina) + # - es_EC # Spanish (Ecuador) + # - es_ES # Spanish (Spain) + # - es_MX # Spanish (Mexico) + # - es_PE # Spanish (Peru) + # - et_EE # Estonian (Estonia) + # - eu_ES # Basque (Spain) + # - fa # Persian + # - fa_IR # Persian (Iran) + # - fi_FI # Finnish (Finland) + # - fil # Filipino + - fr # French + # - gl # Galician + # - gu # Gujarati + - he # Hebrew + - hi # Hindi + # - hr # Croatian + # - hu # Hungarian + # - hy_AM # Armenian (Armenia) + # - id # Indonesian + # - it_IT # Italian (Italy) + # - ja_JP # Japanese (Japan) + # - kk_KZ # Kazakh (Kazakhstan) + # - km_KH # Khmer (Cambodia) + # - kn # Kannada + - ko_KR # Korean (Korea) + # - lt_LT # Lithuanian (Lithuania) + # - ml # Malayalam + # - mn # Mongolian + # - mr # Marathi + # - ms # Malay + # - nb # Norwegian Bokmål + # - ne # Nepali + # - nl_NL # Dutch (Netherlands) + # - or # Oriya + # - pl # Polish + - pt_BR # Portuguese (Brazil) + # - pt_PT # Portuguese (Portugal) + # - ro # Romanian + - ru # Russian + # - si # Sinhala + # - sk # Slovak + # - sl # Slovenian + # - sq # Albanian + # - sr # Serbian + # - sv # Swedish + # - sw # Swahili + # - ta # Tamil + # - te # Telugu + # - th # Thai + # - tr_TR # Turkish (Turkey) + # - uk # Ukranian + # - ur # Urdu + # - uz # Uzbek + # - vi # Vietnamese + - zh_CN # Chinese (China) + # - zh_HK # Chinese (Hong Kong) + # - zh_TW # Chinese (Taiwan) + + +# The locales used for fake-accented English, for testing. +dummy_locales: + - eo + - rtl # Fake testing language for Arabic + +# Directories we don't search for strings. +ignore_dirs: + - '*/css' + - 'public/js/translations' diff --git a/xblocks_contrib/problem/problem.py b/xblocks_contrib/problem/problem.py new file mode 100644 index 0000000..690fa9d --- /dev/null +++ b/xblocks_contrib/problem/problem.py @@ -0,0 +1,99 @@ +"""TO-DO: Write a description of what this XBlock is.""" + +from importlib.resources import files + +from django.utils import translation +from web_fragments.fragment import Fragment +from xblock.core import XBlock +from xblock.fields import Integer, Scope +from xblock.utils.resources import ResourceLoader + +resource_loader = ResourceLoader(__name__) + + +# This Xblock is just to test the strucutre of xblocks-contrib +@XBlock.needs('i18n') +class ProblemBlock(XBlock): + """ + TO-DO: document what your XBlock does. + """ + + # Fields are defined on the class. You can access them in your code as + # self.. + + # TO-DO: delete count, and define your own fields. + count = Integer( + default=0, + scope=Scope.user_state, + help="A simple counter, to show something happening", + ) + + def resource_string(self, path): + """Handy helper for getting resources from our kit.""" + return files(__package__).joinpath(path).read_text(encoding="utf-8") + + # TO-DO: change this view to display your data your own way. + def student_view(self, context=None): + """ + Create primary view of the ProblemBlock, shown to students when viewing courses. + """ + if context: + pass # TO-DO: do something based on the context. + + frag = Fragment() + frag.add_content(resource_loader.render_django_template( + 'templates/problem.html', + { + 'count': self.count, + }, + i18n_service=self.runtime.service(self, 'i18n') + )) + + frag.add_css(self.resource_string("static/css/problem.css")) + frag.add_javascript(self.resource_string("static/js/src/problem.js")) + frag.initialize_js("ProblemBlock") + return frag + + # TO-DO: change this handler to perform your own actions. You may need more + # than one handler, or you may not need any handlers at all. + @XBlock.json_handler + def increment_count(self, data, suffix=""): + """ + Increments data. An example handler. + """ + if suffix: + pass # TO-DO: Use the suffix when storing data. + # Just to show data coming in... + assert data["hello"] == "world" + + self.count += 1 + return {"count": self.count} + + # TO-DO: change this to create the scenarios you'd like to see in the + # workbench while developing your XBlock. + @staticmethod + def workbench_scenarios(): + """Create canned scenario for display in the workbench.""" + return [ + ( + "ProblemBlock", + """ + """, + ), + ( + "Multiple ProblemBlock", + """ + + + + + """, + ), + ] + + @staticmethod + def get_dummy(): + """ + Generate initial i18n with dummy method. + """ + return translation.gettext_noop("Dummy") diff --git a/xblocks_contrib/problem/static/css/problem.css b/xblocks_contrib/problem/static/css/problem.css new file mode 100644 index 0000000..c1a2ab8 --- /dev/null +++ b/xblocks_contrib/problem/static/css/problem.css @@ -0,0 +1,9 @@ +/* CSS for ProblemBlock */ + +.problem .count { + font-weight: bold; +} + +.problem p { + cursor: pointer; +} diff --git a/xblocks_contrib/problem/static/js/src/problem.js b/xblocks_contrib/problem/static/js/src/problem.js new file mode 100644 index 0000000..afd748d --- /dev/null +++ b/xblocks_contrib/problem/static/js/src/problem.js @@ -0,0 +1,38 @@ + +/* JavaScript for ProblemBlock. */ +function ProblemBlock(runtime, element) { + const updateCount = (result) => { + $('.count', element).text(result.count); + }; + + const handlerUrl = runtime.handlerUrl(element, 'increment_count'); + + $('p', element).on('click', (eventObject) => { + $.ajax({ + type: 'POST', + url: handlerUrl, + contentType: 'application/json', + data: JSON.stringify({hello: 'world'}), + success: updateCount + }); + }); + + $(() => { + /* + Use `gettext` provided by django-statici18n for static translations + */ + + // eslint-disable-next-line no-undef + const dummyText = gettext('Hello World'); + + // Example usage of interpolation for translated strings + // eslint-disable-next-line no-undef + const message = StringUtils.interpolate( + gettext('You are enrolling in {courseName}'), + { + courseName: 'Rock & Roll 101' + } + ); + console.log(message); // This is just for demonstration purposes + }); +} diff --git a/xblocks_contrib/problem/templates/problem.html b/xblocks_contrib/problem/templates/problem.html new file mode 100644 index 0000000..812c5b5 --- /dev/null +++ b/xblocks_contrib/problem/templates/problem.html @@ -0,0 +1,7 @@ +{% load i18n %} + +
+

+ ProblemBlock: {% trans "count is now" %} {{ count }} {% trans "click me to increment." %} +

+
diff --git a/xblocks_contrib/video/.tx/config b/xblocks_contrib/video/.tx/config new file mode 100644 index 0000000..14b9a06 --- /dev/null +++ b/xblocks_contrib/video/.tx/config @@ -0,0 +1,8 @@ +[main] +host = https://www.transifex.com + +[o:open-edx:p:p:xblocks:r:video] +file_filter = video/translations//LC_MESSAGES/text.po +source_file = video/translations/en/LC_MESSAGES/text.po +source_lang = en +type = PO diff --git a/xblocks_contrib/video/__init__.py b/xblocks_contrib/video/__init__.py new file mode 100644 index 0000000..680674b --- /dev/null +++ b/xblocks_contrib/video/__init__.py @@ -0,0 +1,5 @@ +""" +Init for the VideoBlock. +""" + +from .video import VideoBlock diff --git a/xblocks_contrib/video/conf/locale/__init__.py b/xblocks_contrib/video/conf/locale/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/xblocks_contrib/video/conf/locale/config.yaml b/xblocks_contrib/video/conf/locale/config.yaml new file mode 100644 index 0000000..4bfb0ca --- /dev/null +++ b/xblocks_contrib/video/conf/locale/config.yaml @@ -0,0 +1,93 @@ +# Configuration for i18n workflow. + +locales: + - en # English - Source Language + # - am # Amharic + - ar # Arabic + # - az # Azerbaijani + # - bg_BG # Bulgarian (Bulgaria) + # - bn_BD # Bengali (Bangladesh) + # - bn_IN # Bengali (India) + # - bs # Bosnian + # - ca # Catalan + # - ca@valencia # Catalan (Valencia) + # - cs # Czech + # - cy # Welsh + # - da # Danish + # - de_DE # German (Germany) + # - el # Greek + # - en_GB # English (United Kingdom) + # # Don't pull these until we figure out why pages randomly display in these locales, + # # when the user's browser is in English and the user is not logged in. + # #- en@lolcat # LOLCAT English + # #- en@pirate # Pirate English + - es_419 # Spanish (Latin America) + # - es_AR # Spanish (Argentina) + # - es_EC # Spanish (Ecuador) + # - es_ES # Spanish (Spain) + # - es_MX # Spanish (Mexico) + # - es_PE # Spanish (Peru) + # - et_EE # Estonian (Estonia) + # - eu_ES # Basque (Spain) + # - fa # Persian + # - fa_IR # Persian (Iran) + # - fi_FI # Finnish (Finland) + # - fil # Filipino + - fr # French + # - gl # Galician + # - gu # Gujarati + - he # Hebrew + - hi # Hindi + # - hr # Croatian + # - hu # Hungarian + # - hy_AM # Armenian (Armenia) + # - id # Indonesian + # - it_IT # Italian (Italy) + # - ja_JP # Japanese (Japan) + # - kk_KZ # Kazakh (Kazakhstan) + # - km_KH # Khmer (Cambodia) + # - kn # Kannada + - ko_KR # Korean (Korea) + # - lt_LT # Lithuanian (Lithuania) + # - ml # Malayalam + # - mn # Mongolian + # - mr # Marathi + # - ms # Malay + # - nb # Norwegian Bokmål + # - ne # Nepali + # - nl_NL # Dutch (Netherlands) + # - or # Oriya + # - pl # Polish + - pt_BR # Portuguese (Brazil) + # - pt_PT # Portuguese (Portugal) + # - ro # Romanian + - ru # Russian + # - si # Sinhala + # - sk # Slovak + # - sl # Slovenian + # - sq # Albanian + # - sr # Serbian + # - sv # Swedish + # - sw # Swahili + # - ta # Tamil + # - te # Telugu + # - th # Thai + # - tr_TR # Turkish (Turkey) + # - uk # Ukranian + # - ur # Urdu + # - uz # Uzbek + # - vi # Vietnamese + - zh_CN # Chinese (China) + # - zh_HK # Chinese (Hong Kong) + # - zh_TW # Chinese (Taiwan) + + +# The locales used for fake-accented English, for testing. +dummy_locales: + - eo + - rtl # Fake testing language for Arabic + +# Directories we don't search for strings. +ignore_dirs: + - '*/css' + - 'public/js/translations' diff --git a/xblocks_contrib/video/static/css/video.css b/xblocks_contrib/video/static/css/video.css new file mode 100644 index 0000000..563fa0d --- /dev/null +++ b/xblocks_contrib/video/static/css/video.css @@ -0,0 +1,9 @@ +/* CSS for VideoBlock */ + +.video .count { + font-weight: bold; +} + +.video p { + cursor: pointer; +} diff --git a/xblocks_contrib/video/static/js/src/video.js b/xblocks_contrib/video/static/js/src/video.js new file mode 100644 index 0000000..fedf319 --- /dev/null +++ b/xblocks_contrib/video/static/js/src/video.js @@ -0,0 +1,38 @@ + +/* JavaScript for VideoBlock. */ +function VideoBlock(runtime, element) { + const updateCount = (result) => { + $('.count', element).text(result.count); + }; + + const handlerUrl = runtime.handlerUrl(element, 'increment_count'); + + $('p', element).on('click', (eventObject) => { + $.ajax({ + type: 'POST', + url: handlerUrl, + contentType: 'application/json', + data: JSON.stringify({hello: 'world'}), + success: updateCount + }); + }); + + $(() => { + /* + Use `gettext` provided by django-statici18n for static translations + */ + + // eslint-disable-next-line no-undef + const dummyText = gettext('Hello World'); + + // Example usage of interpolation for translated strings + // eslint-disable-next-line no-undef + const message = StringUtils.interpolate( + gettext('You are enrolling in {courseName}'), + { + courseName: 'Rock & Roll 101' + } + ); + console.log(message); // This is just for demonstration purposes + }); +} diff --git a/xblocks_contrib/video/templates/video.html b/xblocks_contrib/video/templates/video.html new file mode 100644 index 0000000..ef6a71a --- /dev/null +++ b/xblocks_contrib/video/templates/video.html @@ -0,0 +1,7 @@ +{% load i18n %} + +
+

+ VideoBlock: {% trans "count is now" %} {{ count }} {% trans "click me to increment." %} +

+
diff --git a/xblocks_contrib/video/video.py b/xblocks_contrib/video/video.py new file mode 100644 index 0000000..7c5cc98 --- /dev/null +++ b/xblocks_contrib/video/video.py @@ -0,0 +1,100 @@ +"""TO-DO: Write a description of what this XBlock is.""" + +from importlib.resources import files + +from django.utils import translation +from web_fragments.fragment import Fragment +from xblock.core import XBlock +from xblock.fields import Integer, Scope +from xblock.utils.resources import ResourceLoader + +resource_loader = ResourceLoader(__name__) + +# This Xblock is just to test the strucutre of xblocks-contrib + + +@XBlock.needs('i18n') +class VideoBlock(XBlock): + """ + TO-DO: document what your XBlock does. + """ + + # Fields are defined on the class. You can access them in your code as + # self.. + + # TO-DO: delete count, and define your own fields. + count = Integer( + default=0, + scope=Scope.user_state, + help="A simple counter, to show something happening", + ) + + def resource_string(self, path): + """Handy helper for getting resources from our kit.""" + return files(__package__).joinpath(path).read_text(encoding="utf-8") + + # TO-DO: change this view to display your data your own way. + def student_view(self, context=None): + """ + Create primary view of the VideoBlock, shown to students when viewing courses. + """ + if context: + pass # TO-DO: do something based on the context. + + frag = Fragment() + frag.add_content(resource_loader.render_django_template( + 'templates/video.html', + { + 'count': self.count, + }, + i18n_service=self.runtime.service(self, 'i18n') + )) + + frag.add_css(self.resource_string("static/css/video.css")) + frag.add_javascript(self.resource_string("static/js/src/video.js")) + frag.initialize_js("VideoBlock") + return frag + + # TO-DO: change this handler to perform your own actions. You may need more + # than one handler, or you may not need any handlers at all. + @XBlock.json_handler + def increment_count(self, data, suffix=""): + """ + Increments data. An example handler. + """ + if suffix: + pass # TO-DO: Use the suffix when storing data. + # Just to show data coming in... + assert data["hello"] == "world" + + self.count += 1 + return {"count": self.count} + + # TO-DO: change this to create the scenarios you'd like to see in the + # workbench while developing your XBlock. + @staticmethod + def workbench_scenarios(): + """Create canned scenario for display in the workbench.""" + return [ + ( + "VideoBlock", + """ + """, + ), + ( + "Multiple VideoBlock", + """ + + + + + """, + ), + ] + + @staticmethod + def get_dummy(): + """ + Generate initial i18n with dummy method. + """ + return translation.gettext_noop("Dummy") diff --git a/xblocks_contrib/word_cloud/.tx/config b/xblocks_contrib/word_cloud/.tx/config new file mode 100644 index 0000000..3d7b52d --- /dev/null +++ b/xblocks_contrib/word_cloud/.tx/config @@ -0,0 +1,8 @@ +[main] +host = https://www.transifex.com + +[o:open-edx:p:p:xblocks:r:word_cloud] +file_filter = word_cloud/translations//LC_MESSAGES/text.po +source_file = word_cloud/translations/en/LC_MESSAGES/text.po +source_lang = en +type = PO diff --git a/xblocks_contrib/word_cloud/__init__.py b/xblocks_contrib/word_cloud/__init__.py new file mode 100644 index 0000000..7c7ac09 --- /dev/null +++ b/xblocks_contrib/word_cloud/__init__.py @@ -0,0 +1,5 @@ +""" +Init for the WordCloudBlock. +""" + +from .word_cloud import WordCloudBlock diff --git a/xblocks_contrib/word_cloud/conf/locale/__init__.py b/xblocks_contrib/word_cloud/conf/locale/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/xblocks_contrib/word_cloud/conf/locale/config.yaml b/xblocks_contrib/word_cloud/conf/locale/config.yaml new file mode 100644 index 0000000..4bfb0ca --- /dev/null +++ b/xblocks_contrib/word_cloud/conf/locale/config.yaml @@ -0,0 +1,93 @@ +# Configuration for i18n workflow. + +locales: + - en # English - Source Language + # - am # Amharic + - ar # Arabic + # - az # Azerbaijani + # - bg_BG # Bulgarian (Bulgaria) + # - bn_BD # Bengali (Bangladesh) + # - bn_IN # Bengali (India) + # - bs # Bosnian + # - ca # Catalan + # - ca@valencia # Catalan (Valencia) + # - cs # Czech + # - cy # Welsh + # - da # Danish + # - de_DE # German (Germany) + # - el # Greek + # - en_GB # English (United Kingdom) + # # Don't pull these until we figure out why pages randomly display in these locales, + # # when the user's browser is in English and the user is not logged in. + # #- en@lolcat # LOLCAT English + # #- en@pirate # Pirate English + - es_419 # Spanish (Latin America) + # - es_AR # Spanish (Argentina) + # - es_EC # Spanish (Ecuador) + # - es_ES # Spanish (Spain) + # - es_MX # Spanish (Mexico) + # - es_PE # Spanish (Peru) + # - et_EE # Estonian (Estonia) + # - eu_ES # Basque (Spain) + # - fa # Persian + # - fa_IR # Persian (Iran) + # - fi_FI # Finnish (Finland) + # - fil # Filipino + - fr # French + # - gl # Galician + # - gu # Gujarati + - he # Hebrew + - hi # Hindi + # - hr # Croatian + # - hu # Hungarian + # - hy_AM # Armenian (Armenia) + # - id # Indonesian + # - it_IT # Italian (Italy) + # - ja_JP # Japanese (Japan) + # - kk_KZ # Kazakh (Kazakhstan) + # - km_KH # Khmer (Cambodia) + # - kn # Kannada + - ko_KR # Korean (Korea) + # - lt_LT # Lithuanian (Lithuania) + # - ml # Malayalam + # - mn # Mongolian + # - mr # Marathi + # - ms # Malay + # - nb # Norwegian Bokmål + # - ne # Nepali + # - nl_NL # Dutch (Netherlands) + # - or # Oriya + # - pl # Polish + - pt_BR # Portuguese (Brazil) + # - pt_PT # Portuguese (Portugal) + # - ro # Romanian + - ru # Russian + # - si # Sinhala + # - sk # Slovak + # - sl # Slovenian + # - sq # Albanian + # - sr # Serbian + # - sv # Swedish + # - sw # Swahili + # - ta # Tamil + # - te # Telugu + # - th # Thai + # - tr_TR # Turkish (Turkey) + # - uk # Ukranian + # - ur # Urdu + # - uz # Uzbek + # - vi # Vietnamese + - zh_CN # Chinese (China) + # - zh_HK # Chinese (Hong Kong) + # - zh_TW # Chinese (Taiwan) + + +# The locales used for fake-accented English, for testing. +dummy_locales: + - eo + - rtl # Fake testing language for Arabic + +# Directories we don't search for strings. +ignore_dirs: + - '*/css' + - 'public/js/translations' diff --git a/xblocks_contrib/word_cloud/static/css/word_cloud.css b/xblocks_contrib/word_cloud/static/css/word_cloud.css new file mode 100644 index 0000000..e207f40 --- /dev/null +++ b/xblocks_contrib/word_cloud/static/css/word_cloud.css @@ -0,0 +1,9 @@ +/* CSS for WordCloudBlock */ + +.word_cloud .count { + font-weight: bold; +} + +.word_cloud p { + cursor: pointer; +} diff --git a/xblocks_contrib/word_cloud/static/js/src/word_cloud.js b/xblocks_contrib/word_cloud/static/js/src/word_cloud.js new file mode 100644 index 0000000..728cf87 --- /dev/null +++ b/xblocks_contrib/word_cloud/static/js/src/word_cloud.js @@ -0,0 +1,38 @@ + +/* JavaScript for WordCloudBlock. */ +function WordCloudBlock(runtime, element) { + const updateCount = (result) => { + $('.count', element).text(result.count); + }; + + const handlerUrl = runtime.handlerUrl(element, 'increment_count'); + + $('p', element).on('click', (eventObject) => { + $.ajax({ + type: 'POST', + url: handlerUrl, + contentType: 'application/json', + data: JSON.stringify({hello: 'world'}), + success: updateCount + }); + }); + + $(() => { + /* + Use `gettext` provided by django-statici18n for static translations + */ + + // eslint-disable-next-line no-undef + const dummyText = gettext('Hello World'); + + // Example usage of interpolation for translated strings + // eslint-disable-next-line no-undef + const message = StringUtils.interpolate( + gettext('You are enrolling in {courseName}'), + { + courseName: 'Rock & Roll 101' + } + ); + console.log(message); // This is just for demonstration purposes + }); +} diff --git a/xblocks_contrib/word_cloud/templates/word_cloud.html b/xblocks_contrib/word_cloud/templates/word_cloud.html new file mode 100644 index 0000000..4df2227 --- /dev/null +++ b/xblocks_contrib/word_cloud/templates/word_cloud.html @@ -0,0 +1,7 @@ +{% load i18n %} + +
+

+ WordCloudBlock: {% trans "count is now" %} {{ count }} {% trans "click me to increment." %} +

+
diff --git a/xblocks_contrib/word_cloud/word_cloud.py b/xblocks_contrib/word_cloud/word_cloud.py new file mode 100644 index 0000000..28425bd --- /dev/null +++ b/xblocks_contrib/word_cloud/word_cloud.py @@ -0,0 +1,99 @@ +"""TO-DO: Write a description of what this XBlock is.""" + +from importlib.resources import files + +from django.utils import translation +from web_fragments.fragment import Fragment +from xblock.core import XBlock +from xblock.fields import Integer, Scope +from xblock.utils.resources import ResourceLoader + +resource_loader = ResourceLoader(__name__) + + +# This Xblock is just to test the strucutre of xblocks-contrib +@XBlock.needs('i18n') +class WordCloudBlock(XBlock): + """ + TO-DO: document what your XBlock does. + """ + + # Fields are defined on the class. You can access them in your code as + # self.. + + # TO-DO: delete count, and define your own fields. + count = Integer( + default=0, + scope=Scope.user_state, + help="A simple counter, to show something happening", + ) + + def resource_string(self, path): + """Handy helper for getting resources from our kit.""" + return files(__package__).joinpath(path).read_text(encoding="utf-8") + + # TO-DO: change this view to display your data your own way. + def student_view(self, context=None): + """ + Create primary view of the WordCloudBlock, shown to students when viewing courses. + """ + if context: + pass # TO-DO: do something based on the context. + + frag = Fragment() + frag.add_content(resource_loader.render_django_template( + 'templates/word_cloud.html', + { + 'count': self.count, + }, + i18n_service=self.runtime.service(self, 'i18n') + )) + + frag.add_css(self.resource_string("static/css/word_cloud.css")) + frag.add_javascript(self.resource_string("static/js/src/word_cloud.js")) + frag.initialize_js("WordCloudBlock") + return frag + + # TO-DO: change this handler to perform your own actions. You may need more + # than one handler, or you may not need any handlers at all. + @XBlock.json_handler + def increment_count(self, data, suffix=""): + """ + Increments data. An example handler. + """ + if suffix: + pass # TO-DO: Use the suffix when storing data. + # Just to show data coming in... + assert data["hello"] == "world" + + self.count += 1 + return {"count": self.count} + + # TO-DO: change this to create the scenarios you'd like to see in the + # workbench while developing your XBlock. + @staticmethod + def workbench_scenarios(): + """Create canned scenario for display in the workbench.""" + return [ + ( + "WordCloudBlock", + """ + """, + ), + ( + "Multiple WordCloudBlock", + """ + + + + + """, + ), + ] + + @staticmethod + def get_dummy(): + """ + Generate initial i18n with dummy method. + """ + return translation.gettext_noop("Dummy") From f71c4f4c0bae2735515c9cf29f80ff4648de663c Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Mon, 30 Sep 2024 10:54:57 +0500 Subject: [PATCH 17/22] fix: review changes --- .github/workflows/ci.yml | 27 ++-- .github/workflows/pypi-publish.yml | 35 ++--- .readthedocs.yaml | 2 +- Makefile | 1 - README.rst | 30 ++-- docs/decisions/0001-purpose-of-this-repo.rst | 8 +- pylintrc | 6 +- pylintrc_tweaks | 4 - requirements/base.txt | 17 ++- requirements/ci.in | 5 - requirements/ci.txt | 34 ----- requirements/dev.in | 2 +- requirements/dev.txt | 153 ++++++++++++++----- requirements/doc.txt | 87 ++++++++--- requirements/pip-tools.txt | 4 +- requirements/pip.txt | 2 +- requirements/quality.txt | 76 ++++++--- requirements/test.in | 1 + requirements/test.txt | 62 ++++++-- setup.py | 18 +-- xblocks_contrib/annotatable/annotatable.py | 8 +- xblocks_contrib/discussion/discussion.py | 8 +- xblocks_contrib/html/html.py | 8 +- xblocks_contrib/lti/lti.py | 8 +- xblocks_contrib/poll/poll.py | 8 +- xblocks_contrib/problem/problem.py | 8 +- xblocks_contrib/video/video.py | 8 +- xblocks_contrib/word_cloud/word_cloud.py | 8 +- 28 files changed, 397 insertions(+), 241 deletions(-) delete mode 100644 requirements/ci.in delete mode 100644 requirements/ci.txt diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4e5431c..14fc7c2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,39 +5,40 @@ on: branches: [main] pull_request: branches: - - '**' - + - '**' jobs: run_tests: - name: tests - runs-on: ${{ matrix.os }} + name: Run Tests and Coverage + runs-on: ubuntu-latest strategy: - fail-fast: false + fail-fast: true matrix: - os: [ubuntu-24.04] python-version: ['3.11', '3.12'] toxenv: [quality, docs, django42, django51] steps: - - uses: actions/checkout@v4 - - name: setup python + - name: Check out code + uses: actions/checkout@v4 + + - name: Set up Python uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} + cache: 'pip' - - name: Install pip + - name: Install dependencies run: pip install -r requirements/pip.txt - - name: Install Dependencies - run: pip install -r requirements/ci.txt + - name: Install tox + run: pip install tox - - name: Run Tests + - name: Run Tox env: TOXENV: ${{ matrix.toxenv }} run: tox - - name: Run coverage + - name: Upload coverage to Codecov if: matrix.python-version == '3.12' && matrix.toxenv == 'django42' uses: codecov/codecov-action@v4 with: diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml index f808079..4a216c3 100644 --- a/.github/workflows/pypi-publish.yml +++ b/.github/workflows/pypi-publish.yml @@ -5,26 +5,27 @@ on: types: [published] jobs: - push: - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v4 - - name: setup python - uses: actions/setup-python@v5 - with: - python-version: 3.12 + - name: Checkout code + uses: actions/checkout@v4 + + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: 3.12 + cache: 'pip' - - name: Install pip - run: pip install -r requirements/pip.txt + - name: Install dependencies + run: pip install -r requirements/pip.txt - - name: Build package - run: python setup.py sdist bdist_wheel + - 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 }} + - name: Publish to PyPi + uses: pypa/gh-action-pypi-publish@master + with: + user: __token__ + password: ${{ secrets.PYPI_UPLOAD_TOKEN }} diff --git a/.readthedocs.yaml b/.readthedocs.yaml index cf70d37..d0e1e95 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -12,7 +12,7 @@ sphinx: # Set the version of python needed to build these docs. build: - os: "ubuntu-24.04" + os: "ubuntu-lts-latest" tools: python: "3.12" diff --git a/Makefile b/Makefile index 116111a..46c2722 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,6 @@ upgrade: ## update the requirements/*.txt files with the latest packages satisfy $(PIP_COMPILE) -o requirements/test.txt requirements/test.in $(PIP_COMPILE) -o requirements/doc.txt requirements/doc.in $(PIP_COMPILE) -o requirements/quality.txt requirements/quality.in - $(PIP_COMPILE) -o requirements/ci.txt requirements/ci.in $(PIP_COMPILE) -o requirements/dev.txt requirements/dev.in # Let tox control the Django version for tests sed '/^[dD]jango==/d' requirements/test.txt > requirements/test.tmp diff --git a/README.rst b/README.rst index fd3c12b..b254044 100644 --- a/README.rst +++ b/README.rst @@ -12,16 +12,26 @@ XBlocks are modular components that enable rich interactive learning experiences Historically, the XBlock code was tightly coupled with the edx-platform, making it challenging to manage and extend. By extracting XBlocks into this dedicated repository, we can reduce the complexity of the edx-platform, making it more maintainable and scalable. -Xblocks being moved here are:: -* poll_question -* word_cloud -* annotatable -* lti -* html -* discussion -* problem -* video -* videoalpha +XBlocks Being Moved Here +************************ + +These are the XBlocks being moved here, and each of their statuses: + +* ``poll_question`` -- Placeholder +* ``word_cloud`` -- Placeholder +* ``annotatable`` -- Placeholder +* ``lti`` -- Placeholder +* ``html`` -- Placeholder +* ``discussion`` -- Placeholder +* ``problem`` -- Placeholder +* ``video`` -- Placeholder + +The possible XBlock statuses are: + +* Placeholder: It's just a cookiecutter thumbs-up block. +* In Development: We're building and testing this block. +* Ready to Use: You can try this on your site using the Waffle flag. +* Done The built-in block has been removed. The setup.py entrypoint has been removed from edx-platform and added to xblock-contrib. Developing a new XBlock diff --git a/docs/decisions/0001-purpose-of-this-repo.rst b/docs/decisions/0001-purpose-of-this-repo.rst index 049a685..9443914 100644 --- a/docs/decisions/0001-purpose-of-this-repo.rst +++ b/docs/decisions/0001-purpose-of-this-repo.rst @@ -19,10 +19,10 @@ The XBlocks will be extracted from the edx-platform and placed in this repositor Consequences ************ - - Easier refactoring, testing, and development of XBlocks. - - Simplified edx-platform leading to potential performance improvements and reduced complexity. - - - Potential challenges in synchronizing changes across multiple repositories. +- Easier refactoring, testing, and development of XBlocks. +- Simplified edx-platform leading to potential performance improvements and reduced complexity. +- Potential challenges in synchronizing changes across multiple repositories. +- xblock Sass and JS can be removed from the legacy edx-platform static assets build. References ********** diff --git a/pylintrc b/pylintrc index 65adcbc..24c3c8c 100644 --- a/pylintrc +++ b/pylintrc @@ -64,7 +64,7 @@ # SERIOUSLY. # # ------------------------------ -# Generated by edx-lint version: 5.3.6 +# Generated by edx-lint version: 5.4.0 # ------------------------------ [MASTER] ignore = migrations @@ -287,8 +287,6 @@ disable = illegal-waffle-usage, logging-fstring-interpolation, - consider-using-with, - bad-option-value, [REPORTS] output-format = text @@ -385,4 +383,4 @@ int-import-graph = [EXCEPTIONS] overgeneral-exceptions = builtins.Exception -# 336171d25c66bf0a83e6e9157e7bf581b8b4f59c +# 0d46e725371be094508a87f7cdff3e3901417806 diff --git a/pylintrc_tweaks b/pylintrc_tweaks index 6b02bbf..aaa64dc 100644 --- a/pylintrc_tweaks +++ b/pylintrc_tweaks @@ -3,7 +3,3 @@ ignore = migrations load-plugins = edx_lint.pylint,pylint_celery -[MESSAGES CONTROL] -disable+ = - consider-using-with, - bad-option-value, diff --git a/requirements/base.txt b/requirements/base.txt index 9c8957c..cf79b42 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -8,13 +8,13 @@ appdirs==1.4.4 # via fs asgiref==3.8.1 # via django -boto3==1.35.8 +boto3==1.35.29 # via fs-s3fs -botocore==1.35.8 +botocore==1.35.29 # via # boto3 # s3transfer -django==4.2.15 +django==4.2.16 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # django-appconf @@ -25,7 +25,7 @@ django-appconf==1.0.6 # via django-statici18n django-statici18n==2.5.0 # via -r requirements/base.in -edx-i18n-tools==1.6.2 +edx-i18n-tools==1.6.3 # via -r requirements/base.in fs==2.4.16 # via @@ -38,10 +38,13 @@ jmespath==1.0.1 # via # boto3 # botocore -lxml==5.3.0 +lxml[html-clean,html_clean]==5.3.0 # via # edx-i18n-tools + # lxml-html-clean # xblock +lxml-html-clean==0.2.2 + # via lxml mako==1.3.5 # via xblock markupsafe==2.1.5 @@ -58,7 +61,7 @@ python-dateutil==2.9.0.post0 # via # botocore # xblock -pytz==2024.1 +pytz==2024.2 # via xblock pyyaml==6.0.2 # via @@ -75,7 +78,7 @@ six==1.16.0 # python-dateutil sqlparse==0.5.1 # via django -urllib3==2.2.2 +urllib3==2.2.3 # via botocore web-fragments==2.2.0 # via xblock diff --git a/requirements/ci.in b/requirements/ci.in deleted file mode 100644 index 3586cbe..0000000 --- a/requirements/ci.in +++ /dev/null @@ -1,5 +0,0 @@ -# Requirements for running tests in CI - --c constraints.txt - -tox # Virtualenv management for tests diff --git a/requirements/ci.txt b/requirements/ci.txt deleted file mode 100644 index d15675b..0000000 --- a/requirements/ci.txt +++ /dev/null @@ -1,34 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.12 -# by the following command: -# -# make upgrade -# -cachetools==5.5.0 - # via tox -chardet==5.2.0 - # via tox -colorama==0.4.6 - # via tox -distlib==0.3.8 - # via virtualenv -filelock==3.15.4 - # via - # tox - # virtualenv -packaging==24.1 - # via - # pyproject-api - # tox -platformdirs==4.2.2 - # via - # tox - # virtualenv -pluggy==1.5.0 - # via tox -pyproject-api==1.7.1 - # via tox -tox==4.18.0 - # via -r requirements/ci.in -virtualenv==20.26.3 - # via tox diff --git a/requirements/dev.in b/requirements/dev.in index eb8c92c..e5f575f 100644 --- a/requirements/dev.in +++ b/requirements/dev.in @@ -3,7 +3,7 @@ -r pip-tools.txt # pip-tools and its dependencies, for managing requirements files -r quality.txt # Core and quality check dependencies --r ci.txt # dependencies for setting up testing in CI +-r test.txt # dependencies for setting up testing diff-cover # Changeset diff test coverage edx-i18n-tools # For i18n_tool dummy diff --git a/requirements/dev.txt b/requirements/dev.txt index 865bff6..b06d0d0 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -7,16 +7,19 @@ appdirs==1.4.4 # via # -r requirements/quality.txt + # -r requirements/test.txt # fs arrow==1.3.0 # via # -r requirements/quality.txt + # -r requirements/test.txt # cookiecutter asgiref==3.8.1 # via # -r requirements/quality.txt + # -r requirements/test.txt # django -astroid==3.2.4 +astroid==3.3.4 # via # -r requirements/quality.txt # pylint @@ -24,43 +27,50 @@ astroid==3.2.4 binaryornot==0.4.4 # via # -r requirements/quality.txt + # -r requirements/test.txt # cookiecutter -boto3==1.35.8 +boto3==1.35.29 # via # -r requirements/quality.txt + # -r requirements/test.txt # fs-s3fs -botocore==1.35.8 +botocore==1.35.29 # via # -r requirements/quality.txt + # -r requirements/test.txt # boto3 # s3transfer -build==1.2.1 +build==1.2.2 # via # -r requirements/pip-tools.txt # pip-tools cachetools==5.5.0 # via - # -r requirements/ci.txt + # -r requirements/quality.txt + # -r requirements/test.txt # tox -certifi==2024.7.4 +certifi==2024.8.30 # via # -r requirements/quality.txt + # -r requirements/test.txt # requests chardet==5.2.0 # via - # -r requirements/ci.txt # -r requirements/quality.txt + # -r requirements/test.txt # binaryornot # diff-cover # tox charset-normalizer==3.3.2 # via # -r requirements/quality.txt + # -r requirements/test.txt # requests click==8.1.7 # via # -r requirements/pip-tools.txt # -r requirements/quality.txt + # -r requirements/test.txt # click-log # code-annotations # cookiecutter @@ -73,33 +83,39 @@ click-log==0.4.0 code-annotations==1.8.0 # via # -r requirements/quality.txt + # -r requirements/test.txt # edx-lint colorama==0.4.6 # via - # -r requirements/ci.txt + # -r requirements/quality.txt + # -r requirements/test.txt # tox cookiecutter==2.6.0 # via # -r requirements/quality.txt + # -r requirements/test.txt # xblock-sdk coverage[toml]==7.6.1 # via # -r requirements/quality.txt + # -r requirements/test.txt # pytest-cov -diff-cover==9.1.1 +diff-cover==9.2.0 # via -r requirements/dev.in -dill==0.3.8 +dill==0.3.9 # via # -r requirements/quality.txt # pylint distlib==0.3.8 # via - # -r requirements/ci.txt + # -r requirements/quality.txt + # -r requirements/test.txt # virtualenv -django==4.2.15 +django==4.2.16 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/quality.txt + # -r requirements/test.txt # django-appconf # django-statici18n # edx-i18n-tools @@ -108,38 +124,47 @@ django==4.2.15 django-appconf==1.0.6 # via # -r requirements/quality.txt + # -r requirements/test.txt # django-statici18n django-statici18n==2.5.0 - # via -r requirements/quality.txt -edx-i18n-tools==1.6.2 + # via + # -r requirements/quality.txt + # -r requirements/test.txt +edx-i18n-tools==1.6.3 # via # -r requirements/dev.in # -r requirements/quality.txt + # -r requirements/test.txt edx-lint==5.4.0 # via -r requirements/quality.txt -filelock==3.15.4 +filelock==3.16.1 # via - # -r requirements/ci.txt + # -r requirements/quality.txt + # -r requirements/test.txt # tox # virtualenv fs==2.4.16 # via # -r requirements/quality.txt + # -r requirements/test.txt # fs-s3fs # openedx-django-pyfs # xblock fs-s3fs==1.1.1 # via # -r requirements/quality.txt + # -r requirements/test.txt # openedx-django-pyfs # xblock-sdk -idna==3.8 +idna==3.10 # via # -r requirements/quality.txt + # -r requirements/test.txt # requests iniconfig==2.0.0 # via # -r requirements/quality.txt + # -r requirements/test.txt # pytest isort==5.13.2 # via @@ -148,31 +173,43 @@ isort==5.13.2 jinja2==3.1.4 # via # -r requirements/quality.txt + # -r requirements/test.txt # code-annotations # cookiecutter # diff-cover jmespath==1.0.1 # via # -r requirements/quality.txt + # -r requirements/test.txt # boto3 # botocore -lxml==5.3.0 +lxml[html-clean]==5.3.0 # via # -r requirements/quality.txt + # -r requirements/test.txt # edx-i18n-tools + # lxml-html-clean # xblock # xblock-sdk +lxml-html-clean==0.2.2 + # via + # -r requirements/quality.txt + # -r requirements/test.txt + # lxml mako==1.3.5 # via # -r requirements/quality.txt + # -r requirements/test.txt # xblock markdown-it-py==3.0.0 # via # -r requirements/quality.txt + # -r requirements/test.txt # rich markupsafe==2.1.5 # via # -r requirements/quality.txt + # -r requirements/test.txt # jinja2 # mako # xblock @@ -183,14 +220,17 @@ mccabe==0.7.0 mdurl==0.1.2 # via # -r requirements/quality.txt + # -r requirements/test.txt # markdown-it-py openedx-django-pyfs==3.7.0 - # via -r requirements/quality.txt + # via + # -r requirements/quality.txt + # -r requirements/test.txt packaging==24.1 # via - # -r requirements/ci.txt # -r requirements/pip-tools.txt # -r requirements/quality.txt + # -r requirements/test.txt # build # pyproject-api # pytest @@ -198,30 +238,33 @@ packaging==24.1 path==16.16.0 # via # -r requirements/quality.txt + # -r requirements/test.txt # edx-i18n-tools pbr==6.1.0 # via # -r requirements/quality.txt + # -r requirements/test.txt # stevedore pip-tools==7.4.1 # via -r requirements/pip-tools.txt -platformdirs==4.2.2 +platformdirs==4.3.6 # via - # -r requirements/ci.txt # -r requirements/quality.txt + # -r requirements/test.txt # pylint # tox # virtualenv pluggy==1.5.0 # via - # -r requirements/ci.txt # -r requirements/quality.txt + # -r requirements/test.txt # diff-cover # pytest # tox polib==1.2.0 # via # -r requirements/quality.txt + # -r requirements/test.txt # edx-i18n-tools pycodestyle==2.12.1 # via -r requirements/quality.txt @@ -230,9 +273,10 @@ pydocstyle==6.3.0 pygments==2.18.0 # via # -r requirements/quality.txt + # -r requirements/test.txt # diff-cover # rich -pylint==3.2.6 +pylint==3.3.1 # via # -r requirements/quality.txt # edx-lint @@ -255,43 +299,54 @@ pylint-plugin-utils==0.8.2 pypng==0.20220715.0 # via # -r requirements/quality.txt + # -r requirements/test.txt # xblock-sdk -pyproject-api==1.7.1 +pyproject-api==1.8.0 # via - # -r requirements/ci.txt + # -r requirements/quality.txt + # -r requirements/test.txt # tox -pyproject-hooks==1.1.0 +pyproject-hooks==1.2.0 # via # -r requirements/pip-tools.txt # build # pip-tools -pytest==8.3.2 +pytest==8.3.3 # via # -r requirements/quality.txt + # -r requirements/test.txt # pytest-cov # pytest-django pytest-cov==5.0.0 - # via -r requirements/quality.txt -pytest-django==4.8.0 - # via -r requirements/quality.txt + # via + # -r requirements/quality.txt + # -r requirements/test.txt +pytest-django==4.9.0 + # via + # -r requirements/quality.txt + # -r requirements/test.txt python-dateutil==2.9.0.post0 # via # -r requirements/quality.txt + # -r requirements/test.txt # arrow # botocore # xblock python-slugify==8.0.4 # via # -r requirements/quality.txt + # -r requirements/test.txt # code-annotations # cookiecutter -pytz==2024.1 +pytz==2024.2 # via # -r requirements/quality.txt + # -r requirements/test.txt # xblock pyyaml==6.0.2 # via # -r requirements/quality.txt + # -r requirements/test.txt # code-annotations # cookiecutter # edx-i18n-tools @@ -299,24 +354,29 @@ pyyaml==6.0.2 requests==2.32.3 # via # -r requirements/quality.txt + # -r requirements/test.txt # cookiecutter # xblock-sdk -rich==13.8.0 +rich==13.8.1 # via # -r requirements/quality.txt + # -r requirements/test.txt # cookiecutter s3transfer==0.10.2 # via # -r requirements/quality.txt + # -r requirements/test.txt # boto3 simplejson==3.19.3 # via # -r requirements/quality.txt + # -r requirements/test.txt # xblock # xblock-sdk six==1.16.0 # via # -r requirements/quality.txt + # -r requirements/test.txt # edx-lint # fs # fs-s3fs @@ -328,42 +388,52 @@ snowballstemmer==2.2.0 sqlparse==0.5.1 # via # -r requirements/quality.txt + # -r requirements/test.txt # django stevedore==5.3.0 # via # -r requirements/quality.txt + # -r requirements/test.txt # code-annotations text-unidecode==1.3 # via # -r requirements/quality.txt + # -r requirements/test.txt # python-slugify tomlkit==0.13.2 # via # -r requirements/quality.txt # pylint -tox==4.18.0 - # via -r requirements/ci.txt -types-python-dateutil==2.9.0.20240821 +tox==4.20.0 # via # -r requirements/quality.txt + # -r requirements/test.txt +types-python-dateutil==2.9.0.20240906 + # via + # -r requirements/quality.txt + # -r requirements/test.txt # arrow -urllib3==2.2.2 +urllib3==2.2.3 # via # -r requirements/quality.txt + # -r requirements/test.txt # botocore # requests -virtualenv==20.26.3 +virtualenv==20.26.6 # via - # -r requirements/ci.txt + # -r requirements/quality.txt + # -r requirements/test.txt # tox web-fragments==2.2.0 # via # -r requirements/quality.txt + # -r requirements/test.txt # xblock # xblock-sdk webob==1.8.8 # via # -r requirements/quality.txt + # -r requirements/test.txt # xblock # xblock-sdk wheel==0.44.0 @@ -373,9 +443,12 @@ wheel==0.44.0 xblock==5.1.0 # via # -r requirements/quality.txt + # -r requirements/test.txt # xblock-sdk xblock-sdk==0.12.0 - # via -r requirements/quality.txt + # via + # -r requirements/quality.txt + # -r requirements/test.txt # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/doc.txt b/requirements/doc.txt index bd6b1d7..9205182 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -30,18 +30,22 @@ binaryornot==0.4.4 # via # -r requirements/test.txt # cookiecutter -boto3==1.35.8 +boto3==1.35.29 # via # -r requirements/test.txt # fs-s3fs -botocore==1.35.8 +botocore==1.35.29 # via # -r requirements/test.txt # boto3 # s3transfer -build==1.2.1 +build==1.2.2 # via -r requirements/doc.in -certifi==2024.7.4 +cachetools==5.5.0 + # via + # -r requirements/test.txt + # tox +certifi==2024.8.30 # via # -r requirements/test.txt # requests @@ -49,6 +53,7 @@ chardet==5.2.0 # via # -r requirements/test.txt # binaryornot + # tox charset-normalizer==3.3.2 # via # -r requirements/test.txt @@ -60,6 +65,10 @@ click==8.1.7 # cookiecutter code-annotations==1.8.0 # via -r requirements/test.txt +colorama==0.4.6 + # via + # -r requirements/test.txt + # tox cookiecutter==2.6.0 # via # -r requirements/test.txt @@ -68,7 +77,11 @@ coverage[toml]==7.6.1 # via # -r requirements/test.txt # pytest-cov -django==4.2.15 +distlib==0.3.8 + # via + # -r requirements/test.txt + # virtualenv +django==4.2.16 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt @@ -83,17 +96,22 @@ django-appconf==1.0.6 # django-statici18n django-statici18n==2.5.0 # via -r requirements/test.txt -doc8==1.1.1 +doc8==1.1.2 # via -r requirements/doc.in -docutils==0.20.1 +docutils==0.21.2 # via # doc8 # pydata-sphinx-theme # readme-renderer # restructuredtext-lint # sphinx -edx-i18n-tools==1.6.2 +edx-i18n-tools==1.6.3 # via -r requirements/test.txt +filelock==3.16.1 + # via + # -r requirements/test.txt + # tox + # virtualenv fs==2.4.16 # via # -r requirements/test.txt @@ -105,13 +123,13 @@ fs-s3fs==1.1.1 # -r requirements/test.txt # openedx-django-pyfs # xblock-sdk -idna==3.8 +idna==3.10 # via # -r requirements/test.txt # requests imagesize==1.4.1 # via sphinx -importlib-metadata==8.4.0 +importlib-metadata==8.5.0 # via twine iniconfig==2.0.0 # via @@ -121,7 +139,7 @@ jaraco-classes==3.4.0 # via keyring jaraco-context==6.0.1 # via keyring -jaraco-functools==4.0.2 +jaraco-functools==4.1.0 # via keyring jinja2==3.1.4 # via @@ -134,14 +152,19 @@ jmespath==1.0.1 # -r requirements/test.txt # boto3 # botocore -keyring==25.3.0 +keyring==25.4.1 # via twine -lxml==5.3.0 +lxml[html-clean]==5.3.0 # via # -r requirements/test.txt # edx-i18n-tools + # lxml-html-clean # xblock # xblock-sdk +lxml-html-clean==0.2.2 + # via + # -r requirements/test.txt + # lxml mako==1.3.5 # via # -r requirements/test.txt @@ -160,7 +183,7 @@ mdurl==0.1.2 # via # -r requirements/test.txt # markdown-it-py -more-itertools==10.4.0 +more-itertools==10.5.0 # via # jaraco-classes # jaraco-functools @@ -173,8 +196,10 @@ packaging==24.1 # -r requirements/test.txt # build # pydata-sphinx-theme + # pyproject-api # pytest # sphinx + # tox path==16.16.0 # via # -r requirements/test.txt @@ -185,10 +210,16 @@ pbr==6.1.0 # stevedore pkginfo==1.10.0 # via twine +platformdirs==4.3.6 + # via + # -r requirements/test.txt + # tox + # virtualenv pluggy==1.5.0 # via # -r requirements/test.txt # pytest + # tox polib==1.2.0 # via # -r requirements/test.txt @@ -208,16 +239,20 @@ pypng==0.20220715.0 # via # -r requirements/test.txt # xblock-sdk -pyproject-hooks==1.1.0 +pyproject-api==1.8.0 + # via + # -r requirements/test.txt + # tox +pyproject-hooks==1.2.0 # via build -pytest==8.3.2 +pytest==8.3.3 # via # -r requirements/test.txt # pytest-cov # pytest-django pytest-cov==5.0.0 # via -r requirements/test.txt -pytest-django==4.8.0 +pytest-django==4.9.0 # via -r requirements/test.txt python-dateutil==2.9.0.post0 # via @@ -230,7 +265,7 @@ python-slugify==8.0.4 # -r requirements/test.txt # code-annotations # cookiecutter -pytz==2024.1 +pytz==2024.2 # via # -r requirements/test.txt # xblock @@ -241,7 +276,7 @@ pyyaml==6.0.2 # cookiecutter # edx-i18n-tools # xblock -readme-renderer==43.0 +readme-renderer==44.0 # via twine requests==2.32.3 # via @@ -257,7 +292,7 @@ restructuredtext-lint==1.4.0 # via doc8 rfc3986==2.0.0 # via twine -rich==13.8.0 +rich==13.8.1 # via # -r requirements/test.txt # cookiecutter @@ -313,20 +348,26 @@ text-unidecode==1.3 # via # -r requirements/test.txt # python-slugify +tox==4.20.0 + # via -r requirements/test.txt twine==5.1.1 # via -r requirements/doc.in -types-python-dateutil==2.9.0.20240821 +types-python-dateutil==2.9.0.20240906 # via # -r requirements/test.txt # arrow typing-extensions==4.12.2 # via pydata-sphinx-theme -urllib3==2.2.2 +urllib3==2.2.3 # via # -r requirements/test.txt # botocore # requests # twine +virtualenv==20.26.6 + # via + # -r requirements/test.txt + # tox web-fragments==2.2.0 # via # -r requirements/test.txt @@ -343,7 +384,7 @@ xblock==5.1.0 # xblock-sdk xblock-sdk==0.12.0 # via -r requirements/test.txt -zipp==3.20.1 +zipp==3.20.2 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 67b6039..8c9fbc8 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -4,7 +4,7 @@ # # make upgrade # -build==1.2.1 +build==1.2.2 # via pip-tools click==8.1.7 # via pip-tools @@ -12,7 +12,7 @@ packaging==24.1 # via build pip-tools==7.4.1 # via -r requirements/pip-tools.in -pyproject-hooks==1.1.0 +pyproject-hooks==1.2.0 # via # build # pip-tools diff --git a/requirements/pip.txt b/requirements/pip.txt index 8631391..488d41f 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -10,5 +10,5 @@ wheel==0.44.0 # The following packages are considered to be unsafe in a requirements file: pip==24.2 # via -r requirements/pip.in -setuptools==74.0.0 +setuptools==75.1.0 # via -r requirements/pip.in diff --git a/requirements/quality.txt b/requirements/quality.txt index 18b237c..13247cd 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -16,7 +16,7 @@ asgiref==3.8.1 # via # -r requirements/test.txt # django -astroid==3.2.4 +astroid==3.3.4 # via # pylint # pylint-celery @@ -24,16 +24,20 @@ binaryornot==0.4.4 # via # -r requirements/test.txt # cookiecutter -boto3==1.35.8 +boto3==1.35.29 # via # -r requirements/test.txt # fs-s3fs -botocore==1.35.8 +botocore==1.35.29 # via # -r requirements/test.txt # boto3 # s3transfer -certifi==2024.7.4 +cachetools==5.5.0 + # via + # -r requirements/test.txt + # tox +certifi==2024.8.30 # via # -r requirements/test.txt # requests @@ -41,6 +45,7 @@ chardet==5.2.0 # via # -r requirements/test.txt # binaryornot + # tox charset-normalizer==3.3.2 # via # -r requirements/test.txt @@ -58,6 +63,10 @@ code-annotations==1.8.0 # via # -r requirements/test.txt # edx-lint +colorama==0.4.6 + # via + # -r requirements/test.txt + # tox cookiecutter==2.6.0 # via # -r requirements/test.txt @@ -66,9 +75,13 @@ coverage[toml]==7.6.1 # via # -r requirements/test.txt # pytest-cov -dill==0.3.8 +dill==0.3.9 # via pylint -django==4.2.15 +distlib==0.3.8 + # via + # -r requirements/test.txt + # virtualenv +django==4.2.16 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt @@ -83,10 +96,15 @@ django-appconf==1.0.6 # django-statici18n django-statici18n==2.5.0 # via -r requirements/test.txt -edx-i18n-tools==1.6.2 +edx-i18n-tools==1.6.3 # via -r requirements/test.txt edx-lint==5.4.0 # via -r requirements/quality.in +filelock==3.16.1 + # via + # -r requirements/test.txt + # tox + # virtualenv fs==2.4.16 # via # -r requirements/test.txt @@ -98,7 +116,7 @@ fs-s3fs==1.1.1 # -r requirements/test.txt # openedx-django-pyfs # xblock-sdk -idna==3.8 +idna==3.10 # via # -r requirements/test.txt # requests @@ -120,12 +138,17 @@ jmespath==1.0.1 # -r requirements/test.txt # boto3 # botocore -lxml==5.3.0 +lxml[html-clean]==5.3.0 # via # -r requirements/test.txt # edx-i18n-tools + # lxml-html-clean # xblock # xblock-sdk +lxml-html-clean==0.2.2 + # via + # -r requirements/test.txt + # lxml mako==1.3.5 # via # -r requirements/test.txt @@ -151,7 +174,9 @@ openedx-django-pyfs==3.7.0 packaging==24.1 # via # -r requirements/test.txt + # pyproject-api # pytest + # tox path==16.16.0 # via # -r requirements/test.txt @@ -160,12 +185,17 @@ pbr==6.1.0 # via # -r requirements/test.txt # stevedore -platformdirs==4.2.2 - # via pylint +platformdirs==4.3.6 + # via + # -r requirements/test.txt + # pylint + # tox + # virtualenv pluggy==1.5.0 # via # -r requirements/test.txt # pytest + # tox polib==1.2.0 # via # -r requirements/test.txt @@ -178,7 +208,7 @@ pygments==2.18.0 # via # -r requirements/test.txt # rich -pylint==3.2.6 +pylint==3.3.1 # via # edx-lint # pylint-celery @@ -196,14 +226,18 @@ pypng==0.20220715.0 # via # -r requirements/test.txt # xblock-sdk -pytest==8.3.2 +pyproject-api==1.8.0 + # via + # -r requirements/test.txt + # tox +pytest==8.3.3 # via # -r requirements/test.txt # pytest-cov # pytest-django pytest-cov==5.0.0 # via -r requirements/test.txt -pytest-django==4.8.0 +pytest-django==4.9.0 # via -r requirements/test.txt python-dateutil==2.9.0.post0 # via @@ -216,7 +250,7 @@ python-slugify==8.0.4 # -r requirements/test.txt # code-annotations # cookiecutter -pytz==2024.1 +pytz==2024.2 # via # -r requirements/test.txt # xblock @@ -232,7 +266,7 @@ requests==2.32.3 # -r requirements/test.txt # cookiecutter # xblock-sdk -rich==13.8.0 +rich==13.8.1 # via # -r requirements/test.txt # cookiecutter @@ -268,15 +302,21 @@ text-unidecode==1.3 # python-slugify tomlkit==0.13.2 # via pylint -types-python-dateutil==2.9.0.20240821 +tox==4.20.0 + # via -r requirements/test.txt +types-python-dateutil==2.9.0.20240906 # via # -r requirements/test.txt # arrow -urllib3==2.2.2 +urllib3==2.2.3 # via # -r requirements/test.txt # botocore # requests +virtualenv==20.26.6 + # via + # -r requirements/test.txt + # tox web-fragments==2.2.0 # via # -r requirements/test.txt diff --git a/requirements/test.in b/requirements/test.in index 3a923b4..7601a2e 100644 --- a/requirements/test.in +++ b/requirements/test.in @@ -7,3 +7,4 @@ pytest-cov # pytest extension for code coverage statistics pytest-django # pytest extension for better Django support code-annotations # provides commands used by the pii_check make target. xblock-sdk # provides workbench settings for testing +tox # Virtualenv management for tests diff --git a/requirements/test.txt b/requirements/test.txt index 5cda2d6..98668a6 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -16,19 +16,23 @@ asgiref==3.8.1 # django binaryornot==0.4.4 # via cookiecutter -boto3==1.35.8 +boto3==1.35.29 # via # -r requirements/base.txt # fs-s3fs -botocore==1.35.8 +botocore==1.35.29 # via # -r requirements/base.txt # boto3 # s3transfer -certifi==2024.7.4 +cachetools==5.5.0 + # via tox +certifi==2024.8.30 # via requests chardet==5.2.0 - # via binaryornot + # via + # binaryornot + # tox charset-normalizer==3.3.2 # via requests click==8.1.7 @@ -37,10 +41,14 @@ click==8.1.7 # cookiecutter code-annotations==1.8.0 # via -r requirements/test.in +colorama==0.4.6 + # via tox cookiecutter==2.6.0 # via xblock-sdk coverage[toml]==7.6.1 # via pytest-cov +distlib==0.3.8 + # via virtualenv # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.txt @@ -55,8 +63,12 @@ django-appconf==1.0.6 # django-statici18n django-statici18n==2.5.0 # via -r requirements/base.txt -edx-i18n-tools==1.6.2 +edx-i18n-tools==1.6.3 # via -r requirements/base.txt +filelock==3.16.1 + # via + # tox + # virtualenv fs==2.4.16 # via # -r requirements/base.txt @@ -68,7 +80,7 @@ fs-s3fs==1.1.1 # -r requirements/base.txt # openedx-django-pyfs # xblock-sdk -idna==3.8 +idna==3.10 # via requests iniconfig==2.0.0 # via pytest @@ -81,12 +93,17 @@ jmespath==1.0.1 # -r requirements/base.txt # boto3 # botocore -lxml==5.3.0 +lxml[html-clean]==5.3.0 # via # -r requirements/base.txt # edx-i18n-tools + # lxml-html-clean # xblock # xblock-sdk +lxml-html-clean==0.2.2 + # via + # -r requirements/base.txt + # lxml mako==1.3.5 # via # -r requirements/base.txt @@ -104,15 +121,24 @@ mdurl==0.1.2 openedx-django-pyfs==3.7.0 # via -r requirements/base.txt packaging==24.1 - # via pytest + # via + # pyproject-api + # pytest + # tox path==16.16.0 # via # -r requirements/base.txt # edx-i18n-tools pbr==6.1.0 # via stevedore +platformdirs==4.3.6 + # via + # tox + # virtualenv pluggy==1.5.0 - # via pytest + # via + # pytest + # tox polib==1.2.0 # via # -r requirements/base.txt @@ -121,13 +147,15 @@ pygments==2.18.0 # via rich pypng==0.20220715.0 # via xblock-sdk -pytest==8.3.2 +pyproject-api==1.8.0 + # via tox +pytest==8.3.3 # via # pytest-cov # pytest-django pytest-cov==5.0.0 # via -r requirements/test.in -pytest-django==4.8.0 +pytest-django==4.9.0 # via -r requirements/test.in python-dateutil==2.9.0.post0 # via @@ -139,7 +167,7 @@ python-slugify==8.0.4 # via # code-annotations # cookiecutter -pytz==2024.1 +pytz==2024.2 # via # -r requirements/base.txt # xblock @@ -154,7 +182,7 @@ requests==2.32.3 # via # cookiecutter # xblock-sdk -rich==13.8.0 +rich==13.8.1 # via cookiecutter s3transfer==0.10.2 # via @@ -179,13 +207,17 @@ stevedore==5.3.0 # via code-annotations text-unidecode==1.3 # via python-slugify -types-python-dateutil==2.9.0.20240821 +tox==4.20.0 + # via -r requirements/test.in +types-python-dateutil==2.9.0.20240906 # via arrow -urllib3==2.2.2 +urllib3==2.2.3 # via # -r requirements/base.txt # botocore # requests +virtualenv==20.26.6 + # via tox web-fragments==2.2.0 # via # -r requirements/base.txt diff --git a/setup.py b/setup.py index 34f8b6c..1e68d3d 100644 --- a/setup.py +++ b/setup.py @@ -193,15 +193,15 @@ def package_data(pkg, roots, sub_roots): ], entry_points={ "xblock.v1": [ - # _xblock suffix is added for testing only. - "annotatable_xblock = xblocks_contrib:AnnotatableBlock", - "discussion_xblock = xblocks_contrib:DiscussionXBlock", - "html_xblock = xblocks_contrib:HtmlBlock", - "lti_xblock = xblocks_contrib:LTIBlock", - "poll_question_xblock = xblocks_contrib:PollBlock", - "problem_xblock = xblocks_contrib:ProblemBlock", - "video_xblock = xblocks_contrib:VideoBlock", - "word_cloud_xblock = xblocks_contrib:WordCloudBlock", + # _extracted suffix is added for testing only. + "_annotatable_extracted = xblocks_contrib:AnnotatableBlock", + "_discussion_extracted = xblocks_contrib:DiscussionXBlock", + "_html_extracted = xblocks_contrib:HtmlBlock", + "_lti_extracted = xblocks_contrib:LTIBlock", + "_poll_question_extracted = xblocks_contrib:PollBlock", + "_problem_extracted = xblocks_contrib:ProblemBlock", + "_video_extracted = xblocks_contrib:VideoBlock", + "_word_cloud_extracted = xblocks_contrib:WordCloudBlock", ] }, package_data=package_data( diff --git a/xblocks_contrib/annotatable/annotatable.py b/xblocks_contrib/annotatable/annotatable.py index 2169fc8..aa6bab5 100644 --- a/xblocks_contrib/annotatable/annotatable.py +++ b/xblocks_contrib/annotatable/annotatable.py @@ -77,15 +77,15 @@ def workbench_scenarios(): return [ ( "AnnotatableBlock", - """ + """<_annotatable_extracted/> """, ), ( "Multiple AnnotatableBlock", """ - - - + <_annotatable_extracted/> + <_annotatable_extracted/> + <_annotatable_extracted/> """, ), diff --git a/xblocks_contrib/discussion/discussion.py b/xblocks_contrib/discussion/discussion.py index 04c6ec9..e1d4262 100644 --- a/xblocks_contrib/discussion/discussion.py +++ b/xblocks_contrib/discussion/discussion.py @@ -77,15 +77,15 @@ def workbench_scenarios(): return [ ( "DiscussionXBlock", - """ + """<_discussion_extracted/> """, ), ( "Multiple DiscussionXBlock", """ - - - + <_discussion_extracted/> + <_discussion_extracted/> + <_discussion_extracted/> """, ), diff --git a/xblocks_contrib/html/html.py b/xblocks_contrib/html/html.py index cd25677..2e0d795 100644 --- a/xblocks_contrib/html/html.py +++ b/xblocks_contrib/html/html.py @@ -77,15 +77,15 @@ def workbench_scenarios(): return [ ( "HtmlBlock", - """ + """<_html_extracted/> """, ), ( "Multiple HtmlBlock", """ - - - + <_html_extracted/> + <_html_extracted/> + <_html_extracted/> """, ), diff --git a/xblocks_contrib/lti/lti.py b/xblocks_contrib/lti/lti.py index e7ba959..5f6917e 100644 --- a/xblocks_contrib/lti/lti.py +++ b/xblocks_contrib/lti/lti.py @@ -77,15 +77,15 @@ def workbench_scenarios(): return [ ( "LTIBlock", - """ + """<_lti_extracted/> """, ), ( "Multiple LTIBlock", """ - - - + <_lti_extracted/> + <_lti_extracted/> + <_lti_extracted/> """, ), diff --git a/xblocks_contrib/poll/poll.py b/xblocks_contrib/poll/poll.py index cbba29f..d011729 100644 --- a/xblocks_contrib/poll/poll.py +++ b/xblocks_contrib/poll/poll.py @@ -77,15 +77,15 @@ def workbench_scenarios(): return [ ( "PollBlock", - """ + """<_poll_question_extracted/> """, ), ( "Multiple PollBlock", """ - - - + <_poll_question_extracted/> + <_poll_question_extracted/> + <_poll_question_extracted/> """, ), diff --git a/xblocks_contrib/problem/problem.py b/xblocks_contrib/problem/problem.py index 690fa9d..89672c0 100644 --- a/xblocks_contrib/problem/problem.py +++ b/xblocks_contrib/problem/problem.py @@ -77,15 +77,15 @@ def workbench_scenarios(): return [ ( "ProblemBlock", - """ + """<_problem_extracted/> """, ), ( "Multiple ProblemBlock", """ - - - + <_problem_extracted/> + <_problem_extracted/> + <_problem_extracted/> """, ), diff --git a/xblocks_contrib/video/video.py b/xblocks_contrib/video/video.py index 7c5cc98..ca27f8b 100644 --- a/xblocks_contrib/video/video.py +++ b/xblocks_contrib/video/video.py @@ -78,15 +78,15 @@ def workbench_scenarios(): return [ ( "VideoBlock", - """ + """<_video_extracted/> """, ), ( "Multiple VideoBlock", """ - - - + <_video_extracted/> + <_video_extracted/> + <_video_extracted/> """, ), diff --git a/xblocks_contrib/word_cloud/word_cloud.py b/xblocks_contrib/word_cloud/word_cloud.py index 28425bd..697e762 100644 --- a/xblocks_contrib/word_cloud/word_cloud.py +++ b/xblocks_contrib/word_cloud/word_cloud.py @@ -77,15 +77,15 @@ def workbench_scenarios(): return [ ( "WordCloudBlock", - """ + """<_word_cloud_extracted/> """, ), ( "Multiple WordCloudBlock", """ - - - + <_word_cloud_extracted/> + <_word_cloud_extracted/> + <_word_cloud_extracted/> """, ), From bc8c2df862dfbe890d4c52c58961c7ac8127dc17 Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Mon, 30 Sep 2024 10:56:36 +0500 Subject: [PATCH 18/22] fix: cache ci issues --- .github/workflows/ci.yml | 1 - .github/workflows/pypi-publish.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 14fc7c2..ad103ea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,6 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - cache: 'pip' - name: Install dependencies run: pip install -r requirements/pip.txt diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml index 4a216c3..a83f7ff 100644 --- a/.github/workflows/pypi-publish.yml +++ b/.github/workflows/pypi-publish.yml @@ -16,7 +16,6 @@ jobs: uses: actions/setup-python@v5 with: python-version: 3.12 - cache: 'pip' - name: Install dependencies run: pip install -r requirements/pip.txt From 928ef82c678e68af1b364f8da66c472ca6eef626 Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Mon, 7 Oct 2024 11:40:40 +0500 Subject: [PATCH 19/22] fix: review changes --- Dockerfile | 26 +- requirements/base.txt | 4 +- requirements/dev.txt | 14 +- requirements/doc.txt | 12 +- requirements/pip-tools.txt | 2 +- requirements/quality.txt | 12 +- requirements/test.txt | 10 +- setup.py | 15 +- utils/create_xblock.sh | 239 +++--------------- xblocks_contrib/annotatable/annotatable.py | 22 +- .../annotatable/tests}/test_annotatable.py | 1 - xblocks_contrib/discussion/discussion.py | 22 +- .../discussion/tests}/test_discussion.py | 1 - xblocks_contrib/html/html.py | 22 +- .../html/tests}/test_html.py | 1 - xblocks_contrib/lti/lti.py | 22 +- .../lti/tests}/test_lti.py | 1 - xblocks_contrib/poll/poll.py | 22 +- .../poll/tests}/test_poll.py | 0 xblocks_contrib/problem/problem.py | 22 +- .../problem/tests}/test_problem.py | 1 - .../video/tests}/test_video.py | 1 - xblocks_contrib/video/video.py | 22 +- .../word_cloud/tests}/test_word_cloud.py | 1 - xblocks_contrib/word_cloud/word_cloud.py | 22 +- 25 files changed, 204 insertions(+), 313 deletions(-) rename {tests => xblocks_contrib/annotatable/tests}/test_annotatable.py (99%) rename {tests => xblocks_contrib/discussion/tests}/test_discussion.py (99%) rename {tests => xblocks_contrib/html/tests}/test_html.py (99%) rename {tests => xblocks_contrib/lti/tests}/test_lti.py (99%) rename {tests => xblocks_contrib/poll/tests}/test_poll.py (100%) rename {tests => xblocks_contrib/problem/tests}/test_problem.py (99%) rename {tests => xblocks_contrib/video/tests}/test_video.py (99%) rename {tests => xblocks_contrib/word_cloud/tests}/test_word_cloud.py (99%) diff --git a/Dockerfile b/Dockerfile index f0e89e2..dfd87dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,14 +4,20 @@ # - `make dev.build`: Builds the Docker image for the XBlock SDK environment. # - `make dev.run`: Cleans, builds, and runs the container, mapping the local project directory. -FROM openedx/xblock-sdk -RUN mkdir -p /usr/local/src/xblocks-contrib +FROM openedx/xblock-sdk:latest + +WORKDIR /usr/local/src/xblocks-contrib VOLUME ["/usr/local/src/xblocks-contrib"] -RUN apt-get update && apt-get install -y gettext -RUN echo "pip install -r /usr/local/src/xblocks-contrib/requirements/dev.txt" >> /usr/local/src/xblock-sdk/install_and_run_xblock.sh -RUN echo "pip install -e /usr/local/src/xblocks-contrib" >> /usr/local/src/xblock-sdk/install_and_run_xblock.sh -RUN echo "cd /usr/local/src/xblocks-contrib && make compile_translations && cd /usr/local/src/xblock-sdk" >> /usr/local/src/xblock-sdk/install_and_run_xblock.sh -RUN echo "exec python /usr/local/src/xblock-sdk/manage.py \"\$@\"" >> /usr/local/src/xblock-sdk/install_and_run_xblock.sh -RUN chmod +x /usr/local/src/xblock-sdk/install_and_run_xblock.sh -ENTRYPOINT ["/bin/bash", "/usr/local/src/xblock-sdk/install_and_run_xblock.sh"] -CMD ["runserver", "0.0.0.0:8000"] + +RUN apt-get update && apt-get install -y \ + gettext \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +COPY . /usr/local/src/xblocks-contrib/ + +RUN pip install -r requirements/dev.txt && pip install -e . +RUN make compile_translations + +ENTRYPOINT ["bash", "-c", "python /usr/local/src/xblock-sdk/manage.py migrate && exec python /usr/local/src/xblock-sdk/manage.py runserver 0.0.0.0:8000"] +EXPOSE 8000 diff --git a/requirements/base.txt b/requirements/base.txt index cf79b42..7e5855d 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -8,9 +8,9 @@ appdirs==1.4.4 # via fs asgiref==3.8.1 # via django -boto3==1.35.29 +boto3==1.35.34 # via fs-s3fs -botocore==1.35.29 +botocore==1.35.34 # via # boto3 # s3transfer diff --git a/requirements/dev.txt b/requirements/dev.txt index b06d0d0..8b4226e 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -19,7 +19,7 @@ asgiref==3.8.1 # -r requirements/quality.txt # -r requirements/test.txt # django -astroid==3.3.4 +astroid==3.3.5 # via # -r requirements/quality.txt # pylint @@ -29,18 +29,18 @@ binaryornot==0.4.4 # -r requirements/quality.txt # -r requirements/test.txt # cookiecutter -boto3==1.35.29 +boto3==1.35.34 # via # -r requirements/quality.txt # -r requirements/test.txt # fs-s3fs -botocore==1.35.29 +botocore==1.35.34 # via # -r requirements/quality.txt # -r requirements/test.txt # boto3 # s3transfer -build==1.2.2 +build==1.2.2.post1 # via # -r requirements/pip-tools.txt # pip-tools @@ -357,7 +357,7 @@ requests==2.32.3 # -r requirements/test.txt # cookiecutter # xblock-sdk -rich==13.8.1 +rich==13.9.2 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -404,11 +404,11 @@ tomlkit==0.13.2 # via # -r requirements/quality.txt # pylint -tox==4.20.0 +tox==4.21.2 # via # -r requirements/quality.txt # -r requirements/test.txt -types-python-dateutil==2.9.0.20240906 +types-python-dateutil==2.9.0.20241003 # via # -r requirements/quality.txt # -r requirements/test.txt diff --git a/requirements/doc.txt b/requirements/doc.txt index 9205182..95da717 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -30,16 +30,16 @@ binaryornot==0.4.4 # via # -r requirements/test.txt # cookiecutter -boto3==1.35.29 +boto3==1.35.34 # via # -r requirements/test.txt # fs-s3fs -botocore==1.35.29 +botocore==1.35.34 # via # -r requirements/test.txt # boto3 # s3transfer -build==1.2.2 +build==1.2.2.post1 # via -r requirements/doc.in cachetools==5.5.0 # via @@ -292,7 +292,7 @@ restructuredtext-lint==1.4.0 # via doc8 rfc3986==2.0.0 # via twine -rich==13.8.1 +rich==13.9.2 # via # -r requirements/test.txt # cookiecutter @@ -348,11 +348,11 @@ text-unidecode==1.3 # via # -r requirements/test.txt # python-slugify -tox==4.20.0 +tox==4.21.2 # via -r requirements/test.txt twine==5.1.1 # via -r requirements/doc.in -types-python-dateutil==2.9.0.20240906 +types-python-dateutil==2.9.0.20241003 # via # -r requirements/test.txt # arrow diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 8c9fbc8..cf4131e 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -4,7 +4,7 @@ # # make upgrade # -build==1.2.2 +build==1.2.2.post1 # via pip-tools click==8.1.7 # via pip-tools diff --git a/requirements/quality.txt b/requirements/quality.txt index 13247cd..d2fa4c9 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -16,7 +16,7 @@ asgiref==3.8.1 # via # -r requirements/test.txt # django -astroid==3.3.4 +astroid==3.3.5 # via # pylint # pylint-celery @@ -24,11 +24,11 @@ binaryornot==0.4.4 # via # -r requirements/test.txt # cookiecutter -boto3==1.35.29 +boto3==1.35.34 # via # -r requirements/test.txt # fs-s3fs -botocore==1.35.29 +botocore==1.35.34 # via # -r requirements/test.txt # boto3 @@ -266,7 +266,7 @@ requests==2.32.3 # -r requirements/test.txt # cookiecutter # xblock-sdk -rich==13.8.1 +rich==13.9.2 # via # -r requirements/test.txt # cookiecutter @@ -302,9 +302,9 @@ text-unidecode==1.3 # python-slugify tomlkit==0.13.2 # via pylint -tox==4.20.0 +tox==4.21.2 # via -r requirements/test.txt -types-python-dateutil==2.9.0.20240906 +types-python-dateutil==2.9.0.20241003 # via # -r requirements/test.txt # arrow diff --git a/requirements/test.txt b/requirements/test.txt index 98668a6..a516778 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -16,11 +16,11 @@ asgiref==3.8.1 # django binaryornot==0.4.4 # via cookiecutter -boto3==1.35.29 +boto3==1.35.34 # via # -r requirements/base.txt # fs-s3fs -botocore==1.35.29 +botocore==1.35.34 # via # -r requirements/base.txt # boto3 @@ -182,7 +182,7 @@ requests==2.32.3 # via # cookiecutter # xblock-sdk -rich==13.8.1 +rich==13.9.2 # via cookiecutter s3transfer==0.10.2 # via @@ -207,9 +207,9 @@ stevedore==5.3.0 # via code-annotations text-unidecode==1.3 # via python-slugify -tox==4.20.0 +tox==4.21.2 # via -r requirements/test.in -types-python-dateutil==2.9.0.20240906 +types-python-dateutil==2.9.0.20241003 # via arrow urllib3==2.2.3 # via diff --git a/setup.py b/setup.py index 1e68d3d..937847a 100644 --- a/setup.py +++ b/setup.py @@ -131,15 +131,17 @@ def is_requirement(line): ) -def package_data(pkg, roots, sub_roots): +def package_data(pkg, sub_roots): """ - Declare package_data based on `roots`. + Declare package_data based on all root directories inside `pkg`. - All of the files under each of the `roots` will be declared as package - data for package `pkg`. + All of the files under each of the sub_roots for every root directory + inside `pkg` will be declared as package data for package `pkg`. """ data = [] + roots = [d for d in os.listdir(pkg) if os.path.isdir(os.path.join(pkg, d))] + for root in roots: for sub_root in sub_roots: for dirname, _, files in os.walk(os.path.join(pkg, root, sub_root)): @@ -193,7 +195,6 @@ def package_data(pkg, roots, sub_roots): ], entry_points={ "xblock.v1": [ - # _extracted suffix is added for testing only. "_annotatable_extracted = xblocks_contrib:AnnotatableBlock", "_discussion_extracted = xblocks_contrib:DiscussionXBlock", "_html_extracted = xblocks_contrib:HtmlBlock", @@ -204,7 +205,5 @@ def package_data(pkg, roots, sub_roots): "_word_cloud_extracted = xblocks_contrib:WordCloudBlock", ] }, - package_data=package_data( - "xblocks_contrib", ["annotatable", "poll"], ["static", "public", "templates"] - ), + package_data=package_data("xblocks_contrib", ["static", "public", "templates"]), ) diff --git a/utils/create_xblock.sh b/utils/create_xblock.sh index ada0e5b..066505f 100755 --- a/utils/create_xblock.sh +++ b/utils/create_xblock.sh @@ -15,15 +15,11 @@ insert_in_alphabetical_order() { indent = substr($0, RSTART, RLENGTH) } while (getline > 0) { - if ($0 ~ /^\s*\]/) { - if (added == 0) { - print indent new_entry "," - added = 1 - } - print - next + if ($0 ~ /^\s*\]/ && !added) { + print indent new_entry "," + added = 1 } - if (added == 0 && $0 > indent new_entry) { + if (!added && $0 > indent new_entry) { print indent new_entry "," added = 1 } @@ -43,9 +39,8 @@ insert_import_before_version() { awk -v new_import="$import_entry" ' BEGIN { added = 0 } { - if (added == 0 && /^__version__/) { - print new_import - print "" + if (!added && /^__version__/) { + print new_import "\n" added = 1 } print @@ -53,7 +48,7 @@ insert_import_before_version() { ' "$init_file" > temp_init.py && mv temp_init.py "$init_file" } -# Prompt user for input +# Prompt user for XBlock name and class read -p "Enter XBlock name e.g thumbs: " xblock_name read -p "Enter XBlock class e.g ThumbsXBlock: " xblock_class @@ -61,36 +56,26 @@ read -p "Enter XBlock class e.g ThumbsXBlock: " xblock_class base_dir="xblocks_contrib/$xblock_name" init_file="$base_dir/__init__.py" xblock_file="$base_dir/$xblock_name.py" -tx_dir="$base_dir/.tx" static_dir="$base_dir/static" -css_file="$static_dir/css/$xblock_name.css" -js_file="$static_dir/js/src/$xblock_name.js" templates_dir="$base_dir/templates" -html_file="$templates_dir/$xblock_name.html" +conf_locale_dir="$base_dir/conf/locale" +tests_dir="$base_dir/tests" setup_file="setup.py" main_init_file="xblocks_contrib/__init__.py" -conf_locale_dir="$base_dir/conf/locale" utils_config_file="utils/config.yaml" # Create directories -mkdir -p "$base_dir" "$tx_dir" "$static_dir/css" "$static_dir/js" "$static_dir/js/src" "$templates_dir" "$conf_locale_dir" +mkdir -p "$base_dir" "$static_dir/css" "$static_dir/js/src" "$templates_dir" "$conf_locale_dir" "$tests_dir" # Create empty files -touch "$init_file" "$xblock_file" "$css_file" "$js_file" "$html_file" "$conf_locale_dir/__init__.py" +touch "$init_file" "$xblock_file" "$static_dir/css/$xblock_name.css" "$static_dir/js/src/$xblock_name.js" "$templates_dir/$xblock_name.html" "$conf_locale_dir/__init__.py" -# Copy config.yaml from utils folder to conf/locale -if [ -f "$utils_config_file" ]; then - cp "$utils_config_file" "$conf_locale_dir/" -else - echo "Warning: $utils_config_file does not exist." -fi +# Copy config.yaml to conf/locale if it exists +[ -f "$utils_config_file" ] && cp "$utils_config_file" "$conf_locale_dir/" || echo "Warning: $utils_config_file does not exist." -# Add content to xblock.py +# Populate XBlock file with content cat > "$xblock_file" <. + count = Integer(default=0, scope=Scope.user_state, help="A simple counter") - # TO-DO: delete count, and define your own fields. - count = Integer( - default=0, - scope=Scope.user_state, - help="A simple counter, to show something happening", - ) + is_extracted = True def resource_string(self, path): - """Handy helper for getting resources from our kit.""" return files(__package__).joinpath(path).read_text(encoding="utf-8") - # TO-DO: change this view to display your data your own way. def student_view(self, context=None): - """ - Create primary view of the $xblock_class, shown to students when viewing courses. - """ - if context: - pass # TO-DO: do something based on the context. - frag = Fragment() frag.add_content(resource_loader.render_django_template( - 'templates/$xblock_name.html', - { - 'count': self.count, - }, - i18n_service=self.runtime.service(self, 'i18n') + "templates/$xblock_name.html", {"count": self.count}, + i18n_service=self.runtime.service(self, "i18n") )) - frag.add_css(self.resource_string("static/css/$xblock_name.css")) frag.add_javascript(self.resource_string("static/js/src/$xblock_name.js")) frag.initialize_js("$xblock_class") return frag - # TO-DO: change this handler to perform your own actions. You may need more - # than one handler, or you may not need any handlers at all. @XBlock.json_handler def increment_count(self, data, suffix=""): - """ - Increments data. An example handler. - """ - if suffix: - pass # TO-DO: Use the suffix when storing data. - # Just to show data coming in... - assert data["hello"] == "world" - self.count += 1 return {"count": self.count} - # TO-DO: change this to create the scenarios you'd like to see in the - # workbench while developing your XBlock. @staticmethod def workbench_scenarios(): - """Create canned scenario for display in the workbench.""" return [ - ( - "$xblock_class", - """<$xblock_name/> - """, - ), - ( - "Multiple $xblock_class", - """ - <$xblock_name/> - <$xblock_name/> - <$xblock_name/> - - """, - ), + ("$xblock_class", "<$xblock_name/>"), + ("Multiple $xblock_class", "<$xblock_name/><$xblock_name/><$xblock_name/>") ] - - @staticmethod - def get_dummy(): - """ - Generate initial i18n with dummy method. - """ - return translation.gettext_noop("Dummy") EOL -# Add content to templates/xblock_name.html -cat > "$html_file" < "$templates_dir/$xblock_name.html" < -

- $xblock_class: {% trans "count is now" %} {{ count }} {% trans "click me to increment." %} -

+

$xblock_class: {% trans "count is now" %} {{ count }} {% trans "click me to increment." %}

EOL -# Add content to js file -cat > "$js_file" < "$static_dir/js/src/$xblock_name.js" < { - \$('.count', element).text(result.count); - }; - + const updateCount = (result) => { \$('.count', element).text(result.count); }; const handlerUrl = runtime.handlerUrl(element, 'increment_count'); - - \$('p', element).on('click', (eventObject) => { - \$.ajax({ - type: 'POST', - url: handlerUrl, - contentType: 'application/json', - data: JSON.stringify({hello: 'world'}), - success: updateCount - }); - }); - - \$(() => { - /* - Use \`gettext\` provided by django-statici18n for static translations - */ - - // eslint-disable-next-line no-undef - const dummyText = gettext('Hello World'); - - // Example usage of interpolation for translated strings - // eslint-disable-next-line no-undef - const message = StringUtils.interpolate( - gettext('You are enrolling in {courseName}'), - { - courseName: 'Rock & Roll 101' - } - ); - console.log(message); // This is just for demonstration purposes + \$('p', element).on('click', () => { + \$.ajax({ type: 'POST', url: handlerUrl, contentType: 'application/json', data: JSON.stringify({hello: 'world'}), success: updateCount }); }); } EOL -# Add content to css file -cat > "$css_file" < "$tx_dir/config" </LC_MESSAGES/text.po -source_file = $xblock_name/translations/en/LC_MESSAGES/text.po -source_lang = en -type = PO +# Populate CSS file +cat > "$static_dir/css/$xblock_name.css" < "$init_file" - - -# Define test file paths and content -tests_dir="tests" -test_file="$tests_dir/test_${xblock_name}.py" - -# Create tests directory if it doesn't exist -mkdir -p "$tests_dir" - -# Add content to test file -cat > "$test_file" < "$tests_dir/test_${xblock_name}.py" < "$init_file" -echo "XBlock $xblock_name with class $xblock_class created successfully, with test file generated." +echo "XBlock $xblock_name created successfully with test file." diff --git a/xblocks_contrib/annotatable/annotatable.py b/xblocks_contrib/annotatable/annotatable.py index aa6bab5..1cbfcd0 100644 --- a/xblocks_contrib/annotatable/annotatable.py +++ b/xblocks_contrib/annotatable/annotatable.py @@ -12,7 +12,7 @@ # This Xblock is just to test the strucutre of xblocks-contrib -@XBlock.needs('i18n') +@XBlock.needs("i18n") class AnnotatableBlock(XBlock): """ TO-DO: document what your XBlock does. @@ -28,6 +28,10 @@ class AnnotatableBlock(XBlock): help="A simple counter, to show something happening", ) + is_extracted = ( + True # Indicates that this XBlock has been extracted from edx-platform. + ) + def resource_string(self, path): """Handy helper for getting resources from our kit.""" return files(__package__).joinpath(path).read_text(encoding="utf-8") @@ -41,13 +45,15 @@ def student_view(self, context=None): pass # TO-DO: do something based on the context. frag = Fragment() - frag.add_content(resource_loader.render_django_template( - 'templates/annotatable.html', - { - 'count': self.count, - }, - i18n_service=self.runtime.service(self, 'i18n') - )) + frag.add_content( + resource_loader.render_django_template( + "templates/annotatable.html", + { + "count": self.count, + }, + i18n_service=self.runtime.service(self, "i18n"), + ) + ) frag.add_css(self.resource_string("static/css/annotatable.css")) frag.add_javascript(self.resource_string("static/js/src/annotatable.js")) diff --git a/tests/test_annotatable.py b/xblocks_contrib/annotatable/tests/test_annotatable.py similarity index 99% rename from tests/test_annotatable.py rename to xblocks_contrib/annotatable/tests/test_annotatable.py index db20e07..6c48b61 100644 --- a/tests/test_annotatable.py +++ b/xblocks_contrib/annotatable/tests/test_annotatable.py @@ -2,7 +2,6 @@ Tests for AnnotatableBlock """ - from django.test import TestCase from xblock.fields import ScopeIds from xblock.test.toy_runtime import ToyRuntime diff --git a/xblocks_contrib/discussion/discussion.py b/xblocks_contrib/discussion/discussion.py index e1d4262..f721136 100644 --- a/xblocks_contrib/discussion/discussion.py +++ b/xblocks_contrib/discussion/discussion.py @@ -12,7 +12,7 @@ # This Xblock is just to test the strucutre of xblocks-contrib -@XBlock.needs('i18n') +@XBlock.needs("i18n") class DiscussionXBlock(XBlock): """ TO-DO: document what your XBlock does. @@ -28,6 +28,10 @@ class DiscussionXBlock(XBlock): help="A simple counter, to show something happening", ) + is_extracted = ( + True # Indicates that this XBlock has been extracted from edx-platform. + ) + def resource_string(self, path): """Handy helper for getting resources from our kit.""" return files(__package__).joinpath(path).read_text(encoding="utf-8") @@ -41,13 +45,15 @@ def student_view(self, context=None): pass # TO-DO: do something based on the context. frag = Fragment() - frag.add_content(resource_loader.render_django_template( - 'templates/discussion.html', - { - 'count': self.count, - }, - i18n_service=self.runtime.service(self, 'i18n') - )) + frag.add_content( + resource_loader.render_django_template( + "templates/discussion.html", + { + "count": self.count, + }, + i18n_service=self.runtime.service(self, "i18n"), + ) + ) frag.add_css(self.resource_string("static/css/discussion.css")) frag.add_javascript(self.resource_string("static/js/src/discussion.js")) diff --git a/tests/test_discussion.py b/xblocks_contrib/discussion/tests/test_discussion.py similarity index 99% rename from tests/test_discussion.py rename to xblocks_contrib/discussion/tests/test_discussion.py index 3478867..be91476 100644 --- a/tests/test_discussion.py +++ b/xblocks_contrib/discussion/tests/test_discussion.py @@ -2,7 +2,6 @@ Tests for DiscussionXBlock """ - from django.test import TestCase from xblock.fields import ScopeIds from xblock.test.toy_runtime import ToyRuntime diff --git a/xblocks_contrib/html/html.py b/xblocks_contrib/html/html.py index 2e0d795..a86625a 100644 --- a/xblocks_contrib/html/html.py +++ b/xblocks_contrib/html/html.py @@ -12,7 +12,7 @@ # This Xblock is just to test the strucutre of xblocks-contrib -@XBlock.needs('i18n') +@XBlock.needs("i18n") class HtmlBlock(XBlock): """ TO-DO: document what your XBlock does. @@ -28,6 +28,10 @@ class HtmlBlock(XBlock): help="A simple counter, to show something happening", ) + is_extracted = ( + True # Indicates that this XBlock has been extracted from edx-platform. + ) + def resource_string(self, path): """Handy helper for getting resources from our kit.""" return files(__package__).joinpath(path).read_text(encoding="utf-8") @@ -41,13 +45,15 @@ def student_view(self, context=None): pass # TO-DO: do something based on the context. frag = Fragment() - frag.add_content(resource_loader.render_django_template( - 'templates/html.html', - { - 'count': self.count, - }, - i18n_service=self.runtime.service(self, 'i18n') - )) + frag.add_content( + resource_loader.render_django_template( + "templates/html.html", + { + "count": self.count, + }, + i18n_service=self.runtime.service(self, "i18n"), + ) + ) frag.add_css(self.resource_string("static/css/html.css")) frag.add_javascript(self.resource_string("static/js/src/html.js")) diff --git a/tests/test_html.py b/xblocks_contrib/html/tests/test_html.py similarity index 99% rename from tests/test_html.py rename to xblocks_contrib/html/tests/test_html.py index 1195944..48643d4 100644 --- a/tests/test_html.py +++ b/xblocks_contrib/html/tests/test_html.py @@ -2,7 +2,6 @@ Tests for HtmlBlock """ - from django.test import TestCase from xblock.fields import ScopeIds from xblock.test.toy_runtime import ToyRuntime diff --git a/xblocks_contrib/lti/lti.py b/xblocks_contrib/lti/lti.py index 5f6917e..9859482 100644 --- a/xblocks_contrib/lti/lti.py +++ b/xblocks_contrib/lti/lti.py @@ -12,7 +12,7 @@ # This Xblock is just to test the strucutre of xblocks-contrib -@XBlock.needs('i18n') +@XBlock.needs("i18n") class LTIBlock(XBlock): """ TO-DO: document what your XBlock does. @@ -28,6 +28,10 @@ class LTIBlock(XBlock): help="A simple counter, to show something happening", ) + is_extracted = ( + True # Indicates that this XBlock has been extracted from edx-platform. + ) + def resource_string(self, path): """Handy helper for getting resources from our kit.""" return files(__package__).joinpath(path).read_text(encoding="utf-8") @@ -41,13 +45,15 @@ def student_view(self, context=None): pass # TO-DO: do something based on the context. frag = Fragment() - frag.add_content(resource_loader.render_django_template( - 'templates/lti.html', - { - 'count': self.count, - }, - i18n_service=self.runtime.service(self, 'i18n') - )) + frag.add_content( + resource_loader.render_django_template( + "templates/lti.html", + { + "count": self.count, + }, + i18n_service=self.runtime.service(self, "i18n"), + ) + ) frag.add_css(self.resource_string("static/css/lti.css")) frag.add_javascript(self.resource_string("static/js/src/lti.js")) diff --git a/tests/test_lti.py b/xblocks_contrib/lti/tests/test_lti.py similarity index 99% rename from tests/test_lti.py rename to xblocks_contrib/lti/tests/test_lti.py index 311934f..f4a4a53 100644 --- a/tests/test_lti.py +++ b/xblocks_contrib/lti/tests/test_lti.py @@ -2,7 +2,6 @@ Tests for LTIBlock """ - from django.test import TestCase from xblock.fields import ScopeIds from xblock.test.toy_runtime import ToyRuntime diff --git a/xblocks_contrib/poll/poll.py b/xblocks_contrib/poll/poll.py index d011729..473dbe7 100644 --- a/xblocks_contrib/poll/poll.py +++ b/xblocks_contrib/poll/poll.py @@ -12,7 +12,7 @@ # This Xblock is just to test the strucutre of xblocks-contrib -@XBlock.needs('i18n') +@XBlock.needs("i18n") class PollBlock(XBlock): """ TO-DO: document what your XBlock does. @@ -28,6 +28,10 @@ class PollBlock(XBlock): help="A simple counter, to show something happening", ) + is_extracted = ( + True # Indicates that this XBlock has been extracted from edx-platform. + ) + def resource_string(self, path): """Handy helper for getting resources from our kit.""" return files(__package__).joinpath(path).read_text(encoding="utf-8") @@ -41,13 +45,15 @@ def student_view(self, context=None): pass # TO-DO: do something based on the context. frag = Fragment() - frag.add_content(resource_loader.render_django_template( - 'templates/poll.html', - { - 'count': self.count, - }, - i18n_service=self.runtime.service(self, 'i18n') - )) + frag.add_content( + resource_loader.render_django_template( + "templates/poll.html", + { + "count": self.count, + }, + i18n_service=self.runtime.service(self, "i18n"), + ) + ) frag.add_css(self.resource_string("static/css/poll.css")) frag.add_javascript(self.resource_string("static/js/src/poll.js")) diff --git a/tests/test_poll.py b/xblocks_contrib/poll/tests/test_poll.py similarity index 100% rename from tests/test_poll.py rename to xblocks_contrib/poll/tests/test_poll.py diff --git a/xblocks_contrib/problem/problem.py b/xblocks_contrib/problem/problem.py index 89672c0..16e1773 100644 --- a/xblocks_contrib/problem/problem.py +++ b/xblocks_contrib/problem/problem.py @@ -12,7 +12,7 @@ # This Xblock is just to test the strucutre of xblocks-contrib -@XBlock.needs('i18n') +@XBlock.needs("i18n") class ProblemBlock(XBlock): """ TO-DO: document what your XBlock does. @@ -28,6 +28,10 @@ class ProblemBlock(XBlock): help="A simple counter, to show something happening", ) + is_extracted = ( + True # Indicates that this XBlock has been extracted from edx-platform. + ) + def resource_string(self, path): """Handy helper for getting resources from our kit.""" return files(__package__).joinpath(path).read_text(encoding="utf-8") @@ -41,13 +45,15 @@ def student_view(self, context=None): pass # TO-DO: do something based on the context. frag = Fragment() - frag.add_content(resource_loader.render_django_template( - 'templates/problem.html', - { - 'count': self.count, - }, - i18n_service=self.runtime.service(self, 'i18n') - )) + frag.add_content( + resource_loader.render_django_template( + "templates/problem.html", + { + "count": self.count, + }, + i18n_service=self.runtime.service(self, "i18n"), + ) + ) frag.add_css(self.resource_string("static/css/problem.css")) frag.add_javascript(self.resource_string("static/js/src/problem.js")) diff --git a/tests/test_problem.py b/xblocks_contrib/problem/tests/test_problem.py similarity index 99% rename from tests/test_problem.py rename to xblocks_contrib/problem/tests/test_problem.py index f9b7d3b..b33f2a3 100644 --- a/tests/test_problem.py +++ b/xblocks_contrib/problem/tests/test_problem.py @@ -2,7 +2,6 @@ Tests for ProblemBlock """ - from django.test import TestCase from xblock.fields import ScopeIds from xblock.test.toy_runtime import ToyRuntime diff --git a/tests/test_video.py b/xblocks_contrib/video/tests/test_video.py similarity index 99% rename from tests/test_video.py rename to xblocks_contrib/video/tests/test_video.py index 3fb38c9..784b92f 100644 --- a/tests/test_video.py +++ b/xblocks_contrib/video/tests/test_video.py @@ -2,7 +2,6 @@ Tests for VideoBlock """ - from django.test import TestCase from xblock.fields import ScopeIds from xblock.test.toy_runtime import ToyRuntime diff --git a/xblocks_contrib/video/video.py b/xblocks_contrib/video/video.py index ca27f8b..62eb50e 100644 --- a/xblocks_contrib/video/video.py +++ b/xblocks_contrib/video/video.py @@ -13,7 +13,7 @@ # This Xblock is just to test the strucutre of xblocks-contrib -@XBlock.needs('i18n') +@XBlock.needs("i18n") class VideoBlock(XBlock): """ TO-DO: document what your XBlock does. @@ -29,6 +29,10 @@ class VideoBlock(XBlock): help="A simple counter, to show something happening", ) + is_extracted = ( + True # Indicates that this XBlock has been extracted from edx-platform. + ) + def resource_string(self, path): """Handy helper for getting resources from our kit.""" return files(__package__).joinpath(path).read_text(encoding="utf-8") @@ -42,13 +46,15 @@ def student_view(self, context=None): pass # TO-DO: do something based on the context. frag = Fragment() - frag.add_content(resource_loader.render_django_template( - 'templates/video.html', - { - 'count': self.count, - }, - i18n_service=self.runtime.service(self, 'i18n') - )) + frag.add_content( + resource_loader.render_django_template( + "templates/video.html", + { + "count": self.count, + }, + i18n_service=self.runtime.service(self, "i18n"), + ) + ) frag.add_css(self.resource_string("static/css/video.css")) frag.add_javascript(self.resource_string("static/js/src/video.js")) diff --git a/tests/test_word_cloud.py b/xblocks_contrib/word_cloud/tests/test_word_cloud.py similarity index 99% rename from tests/test_word_cloud.py rename to xblocks_contrib/word_cloud/tests/test_word_cloud.py index d0fd7cc..3cd45b7 100644 --- a/tests/test_word_cloud.py +++ b/xblocks_contrib/word_cloud/tests/test_word_cloud.py @@ -2,7 +2,6 @@ Tests for WordCloudBlock """ - from django.test import TestCase from xblock.fields import ScopeIds from xblock.test.toy_runtime import ToyRuntime diff --git a/xblocks_contrib/word_cloud/word_cloud.py b/xblocks_contrib/word_cloud/word_cloud.py index 697e762..18d7ad5 100644 --- a/xblocks_contrib/word_cloud/word_cloud.py +++ b/xblocks_contrib/word_cloud/word_cloud.py @@ -12,7 +12,7 @@ # This Xblock is just to test the strucutre of xblocks-contrib -@XBlock.needs('i18n') +@XBlock.needs("i18n") class WordCloudBlock(XBlock): """ TO-DO: document what your XBlock does. @@ -28,6 +28,10 @@ class WordCloudBlock(XBlock): help="A simple counter, to show something happening", ) + is_extracted = ( + True # Indicates that this XBlock has been extracted from edx-platform. + ) + def resource_string(self, path): """Handy helper for getting resources from our kit.""" return files(__package__).joinpath(path).read_text(encoding="utf-8") @@ -41,13 +45,15 @@ def student_view(self, context=None): pass # TO-DO: do something based on the context. frag = Fragment() - frag.add_content(resource_loader.render_django_template( - 'templates/word_cloud.html', - { - 'count': self.count, - }, - i18n_service=self.runtime.service(self, 'i18n') - )) + frag.add_content( + resource_loader.render_django_template( + "templates/word_cloud.html", + { + "count": self.count, + }, + i18n_service=self.runtime.service(self, "i18n"), + ) + ) frag.add_css(self.resource_string("static/css/word_cloud.css")) frag.add_javascript(self.resource_string("static/js/src/word_cloud.js")) From de6a0dcc6b20babd2d3269e77455ecd99b18a856 Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Mon, 7 Oct 2024 12:25:03 +0500 Subject: [PATCH 20/22] fix: review changes --- setup.py | 1 + utils/create_xblock.sh | 178 ++++++++++++++++++++++++++++++++++++----- 2 files changed, 157 insertions(+), 22 deletions(-) diff --git a/setup.py b/setup.py index 937847a..dfae3d0 100644 --- a/setup.py +++ b/setup.py @@ -195,6 +195,7 @@ def package_data(pkg, sub_roots): ], entry_points={ "xblock.v1": [ + # _extracted suffix is added for testing only. "_annotatable_extracted = xblocks_contrib:AnnotatableBlock", "_discussion_extracted = xblocks_contrib:DiscussionXBlock", "_html_extracted = xblocks_contrib:HtmlBlock", diff --git a/utils/create_xblock.sh b/utils/create_xblock.sh index 066505f..1fc4cd8 100755 --- a/utils/create_xblock.sh +++ b/utils/create_xblock.sh @@ -10,15 +10,21 @@ insert_in_alphabetical_order() { /entry_points/ { print; next } /"xblock.v1"/ { print; - getline + getline; + # Determine the indentation level if (match($0, /^[ \t]+/)) { indent = substr($0, RSTART, RLENGTH) } + # Iterate over the lines inside the xblock.v1 list while (getline > 0) { + # Stop when reaching the end of the list if ($0 ~ /^\s*\]/ && !added) { print indent new_entry "," added = 1 + print $0 # Print the closing bracket + next } + # Insert the new entry if it fits alphabetically if (!added && $0 > indent new_entry) { print indent new_entry "," added = 1 @@ -75,7 +81,10 @@ touch "$init_file" "$xblock_file" "$static_dir/css/$xblock_name.css" "$static_di # Populate XBlock file with content cat > "$xblock_file" <. - is_extracted = True + # TO-DO: delete count, and define your own fields. + count = Integer( + default=0, + scope=Scope.user_state, + help="A simple counter, to show something happening", + ) + + is_extracted = ( + True # Indicates that this XBlock has been extracted from edx-platform. + ) def resource_string(self, path): + """Handy helper for getting resources from our kit.""" return files(__package__).joinpath(path).read_text(encoding="utf-8") + # TO-DO: change this view to display your data your own way. def student_view(self, context=None): + """ + Create primary view of the $xblock_class, shown to students when viewing courses. + """ + if context: + pass # TO-DO: do something based on the context. + frag = Fragment() - frag.add_content(resource_loader.render_django_template( - "templates/$xblock_name.html", {"count": self.count}, - i18n_service=self.runtime.service(self, "i18n") - )) + frag.add_content( + resource_loader.render_django_template( + "templates/$xblock_name.html", + { + "count": self.count, + }, + i18n_service=self.runtime.service(self, "i18n"), + ) + ) + frag.add_css(self.resource_string("static/css/$xblock_name.css")) frag.add_javascript(self.resource_string("static/js/src/$xblock_name.js")) frag.initialize_js("$xblock_class") return frag + # TO-DO: change this handler to perform your own actions. You may need more + # than one handler, or you may not need any handlers at all. @XBlock.json_handler def increment_count(self, data, suffix=""): + """ + Increments data. An example handler. + """ + if suffix: + pass # TO-DO: Use the suffix when storing data. + # Just to show data coming in... + assert data["hello"] == "world" + self.count += 1 return {"count": self.count} + # TO-DO: change this to create the scenarios you'd like to see in the + # workbench while developing your XBlock. @staticmethod def workbench_scenarios(): + """Create canned scenario for display in the workbench.""" return [ - ("$xblock_class", "<$xblock_name/>"), - ("Multiple $xblock_class", "<$xblock_name/><$xblock_name/><$xblock_name/>") + ( + "$xblock_class", + """<$xblock_name/> + """, + ), + ( + "Multiple $xblock_class", + """ + <$xblock_name/> + <$xblock_name/> + <$xblock_name/> + + """, + ), ] + + @staticmethod + def get_dummy(): + """ + Generate initial i18n with dummy method. + """ + return translation.gettext_noop("Dummy") EOL # Populate template HTML cat > "$templates_dir/$xblock_name.html" < -

$xblock_class: {% trans "count is now" %} {{ count }} {% trans "click me to increment." %}

+

+ $xblock_class: {% trans "count is now" %} {{ count }} {% trans "click me to increment." %} +

EOL # Populate JavaScript file cat > "$static_dir/js/src/$xblock_name.js" < { \$('.count', element).text(result.count); }; +/* JavaScript for $xblock_class. */ +function $xblock_class(runtime, element) { + const updateCount = (result) => { + \$('.count', element).text(result.count); + }; + const handlerUrl = runtime.handlerUrl(element, 'increment_count'); - \$('p', element).on('click', () => { - \$.ajax({ type: 'POST', url: handlerUrl, contentType: 'application/json', data: JSON.stringify({hello: 'world'}), success: updateCount }); + + \$('p', element).on('click', (eventObject) => { + \$.ajax({ + type: 'POST', + url: handlerUrl, + contentType: 'application/json', + data: JSON.stringify({hello: 'world'}), + success: updateCount + }); + }); + + \$(() => { + /* + Use \`gettext\` provided by django-statici18n for static translations + */ + + // eslint-disable-next-line no-undef + const dummyText = gettext('Hello World'); + + // Example usage of interpolation for translated strings + // eslint-disable-next-line no-undef + const message = StringUtils.interpolate( + gettext('You are enrolling in {courseName}'), + { + courseName: 'Rock & Roll 101' + } + ); + console.log(message); // This is just for demonstration purposes }); } EOL # Populate CSS file cat > "$static_dir/css/$xblock_name.css" < "$tests_dir/test_${xblock_name}.py" < "$init_file" < "$init_file" echo "XBlock $xblock_name created successfully with test file." From 76500539560d07ca4b6ba9f1b68d74652daab1ca Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Mon, 7 Oct 2024 18:07:21 +0500 Subject: [PATCH 21/22] fix: refactor is_extracted --- utils/create_xblock.sh | 5 ++--- xblocks_contrib/annotatable/annotatable.py | 5 ++--- xblocks_contrib/discussion/discussion.py | 5 ++--- xblocks_contrib/html/html.py | 5 ++--- xblocks_contrib/lti/lti.py | 5 ++--- xblocks_contrib/poll/poll.py | 5 ++--- xblocks_contrib/problem/problem.py | 5 ++--- xblocks_contrib/video/video.py | 5 ++--- xblocks_contrib/word_cloud/word_cloud.py | 5 ++--- 9 files changed, 18 insertions(+), 27 deletions(-) diff --git a/utils/create_xblock.sh b/utils/create_xblock.sh index 1fc4cd8..26e7071 100755 --- a/utils/create_xblock.sh +++ b/utils/create_xblock.sh @@ -111,9 +111,8 @@ class $xblock_class(XBlock): help="A simple counter, to show something happening", ) - is_extracted = ( - True # Indicates that this XBlock has been extracted from edx-platform. - ) + # Indicates that this XBlock has been extracted from edx-platform. + is_extracted = True def resource_string(self, path): """Handy helper for getting resources from our kit.""" diff --git a/xblocks_contrib/annotatable/annotatable.py b/xblocks_contrib/annotatable/annotatable.py index 1cbfcd0..e851e54 100644 --- a/xblocks_contrib/annotatable/annotatable.py +++ b/xblocks_contrib/annotatable/annotatable.py @@ -28,9 +28,8 @@ class AnnotatableBlock(XBlock): help="A simple counter, to show something happening", ) - is_extracted = ( - True # Indicates that this XBlock has been extracted from edx-platform. - ) + # Indicates that this XBlock has been extracted from edx-platform. + is_extracted = True def resource_string(self, path): """Handy helper for getting resources from our kit.""" diff --git a/xblocks_contrib/discussion/discussion.py b/xblocks_contrib/discussion/discussion.py index f721136..ed945c6 100644 --- a/xblocks_contrib/discussion/discussion.py +++ b/xblocks_contrib/discussion/discussion.py @@ -28,9 +28,8 @@ class DiscussionXBlock(XBlock): help="A simple counter, to show something happening", ) - is_extracted = ( - True # Indicates that this XBlock has been extracted from edx-platform. - ) + # Indicates that this XBlock has been extracted from edx-platform. + is_extracted = True def resource_string(self, path): """Handy helper for getting resources from our kit.""" diff --git a/xblocks_contrib/html/html.py b/xblocks_contrib/html/html.py index a86625a..7aac1de 100644 --- a/xblocks_contrib/html/html.py +++ b/xblocks_contrib/html/html.py @@ -28,9 +28,8 @@ class HtmlBlock(XBlock): help="A simple counter, to show something happening", ) - is_extracted = ( - True # Indicates that this XBlock has been extracted from edx-platform. - ) + # Indicates that this XBlock has been extracted from edx-platform. + is_extracted = True def resource_string(self, path): """Handy helper for getting resources from our kit.""" diff --git a/xblocks_contrib/lti/lti.py b/xblocks_contrib/lti/lti.py index 9859482..5dbaf15 100644 --- a/xblocks_contrib/lti/lti.py +++ b/xblocks_contrib/lti/lti.py @@ -28,9 +28,8 @@ class LTIBlock(XBlock): help="A simple counter, to show something happening", ) - is_extracted = ( - True # Indicates that this XBlock has been extracted from edx-platform. - ) + # Indicates that this XBlock has been extracted from edx-platform. + is_extracted = True def resource_string(self, path): """Handy helper for getting resources from our kit.""" diff --git a/xblocks_contrib/poll/poll.py b/xblocks_contrib/poll/poll.py index 473dbe7..37cbfc4 100644 --- a/xblocks_contrib/poll/poll.py +++ b/xblocks_contrib/poll/poll.py @@ -28,9 +28,8 @@ class PollBlock(XBlock): help="A simple counter, to show something happening", ) - is_extracted = ( - True # Indicates that this XBlock has been extracted from edx-platform. - ) + # Indicates that this XBlock has been extracted from edx-platform. + is_extracted = True def resource_string(self, path): """Handy helper for getting resources from our kit.""" diff --git a/xblocks_contrib/problem/problem.py b/xblocks_contrib/problem/problem.py index 16e1773..912fc32 100644 --- a/xblocks_contrib/problem/problem.py +++ b/xblocks_contrib/problem/problem.py @@ -28,9 +28,8 @@ class ProblemBlock(XBlock): help="A simple counter, to show something happening", ) - is_extracted = ( - True # Indicates that this XBlock has been extracted from edx-platform. - ) + # Indicates that this XBlock has been extracted from edx-platform. + is_extracted = True def resource_string(self, path): """Handy helper for getting resources from our kit.""" diff --git a/xblocks_contrib/video/video.py b/xblocks_contrib/video/video.py index 62eb50e..b11baeb 100644 --- a/xblocks_contrib/video/video.py +++ b/xblocks_contrib/video/video.py @@ -29,9 +29,8 @@ class VideoBlock(XBlock): help="A simple counter, to show something happening", ) - is_extracted = ( - True # Indicates that this XBlock has been extracted from edx-platform. - ) + # Indicates that this XBlock has been extracted from edx-platform. + is_extracted = True def resource_string(self, path): """Handy helper for getting resources from our kit.""" diff --git a/xblocks_contrib/word_cloud/word_cloud.py b/xblocks_contrib/word_cloud/word_cloud.py index 18d7ad5..331022e 100644 --- a/xblocks_contrib/word_cloud/word_cloud.py +++ b/xblocks_contrib/word_cloud/word_cloud.py @@ -28,9 +28,8 @@ class WordCloudBlock(XBlock): help="A simple counter, to show something happening", ) - is_extracted = ( - True # Indicates that this XBlock has been extracted from edx-platform. - ) + # Indicates that this XBlock has been extracted from edx-platform. + is_extracted = True def resource_string(self, path): """Handy helper for getting resources from our kit.""" From 844db57dbc53e6d54002c261d0b53647d6328050 Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Mon, 7 Oct 2024 18:53:26 +0500 Subject: [PATCH 22/22] fix: readme --- Dockerfile | 2 +- README.rst | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index dfd87dc..da70829 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ RUN apt-get update && apt-get install -y \ COPY . /usr/local/src/xblocks-contrib/ -RUN pip install -r requirements/dev.txt && pip install -e . +RUN pip install -r requirements/dev.txt && pip install --force-reinstall -e . RUN make compile_translations ENTRYPOINT ["bash", "-c", "python /usr/local/src/xblock-sdk/manage.py migrate && exec python /usr/local/src/xblock-sdk/manage.py runserver 0.0.0.0:8000"] diff --git a/README.rst b/README.rst index b254044..dd5c479 100644 --- a/README.rst +++ b/README.rst @@ -112,6 +112,10 @@ The ``text.po`` file is created from the ``django-partial.po`` file created by ``django-admin makemessages`` (`makemessages documentation `_), this is why you will not see a ``django-partial.po`` file. +You will need to have `edx-i18n-tools` that you can get by: + + $ make requirements + 3. Create language specific translations ----------------------------------------