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..ad103ea --- /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: Run Tests and Coverage + runs-on: ubuntu-latest + strategy: + fail-fast: true + matrix: + python-version: ['3.11', '3.12'] + toxenv: [quality, docs, django42, django51] + + steps: + - name: Check out code + uses: actions/checkout@v4 + + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: ${{ matrix.python-version }} + + - name: Install dependencies + run: pip install -r requirements/pip.txt + + - name: Install tox + run: pip install tox + + - name: Run Tox + env: + TOXENV: ${{ matrix.toxenv }} + run: tox + + - name: Upload coverage to Codecov + if: matrix.python-version == '3.12' && 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/pypi-publish.yml b/.github/workflows/pypi-publish.yml new file mode 100644 index 0000000..a83f7ff --- /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-latest + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: 3.12 + + - name: Install dependencies + 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..0d04148 --- /dev/null +++ b/.gitignore @@ -0,0 +1,70 @@ +*.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 + +# Translations +*.mo +*.pot +*.po diff --git a/.readthedocs.yaml b/.readthedocs.yaml new file mode 100644 index 0000000..d0e1e95 --- /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-lts-latest" + tools: + python: "3.12" + +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..da70829 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,23 @@ +# 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:latest + +WORKDIR /usr/local/src/xblocks-contrib +VOLUME ["/usr/local/src/xblocks-contrib"] + +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 --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"] +EXPOSE 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..46c2722 --- /dev/null +++ b/Makefile @@ -0,0 +1,100 @@ +.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/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 + +# XBlock directories +XBLOCKS=$(shell find $(shell pwd)/$(PACKAGE_NAME) -maxdepth 2 -type d -name 'conf' -exec dirname {} \;) + +## Localization targets + +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 + django-admin compilemessages --locale en + +detect_changed_source_translations: + @for xblock in $(XBLOCKS); do \ + echo "Detecting changed translations for $$xblock..."; \ + cd $$xblock && i18n_tool changed; \ + done + +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 + +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..dd5c479 --- /dev/null +++ b/README.rst @@ -0,0 +1,193 @@ +=============== +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 +************************ + +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 +======================= + +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. + +If faced with permission or access error run:: + + $ chmod +x utils/create_xblock.sh + +and run it. + +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. + +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: + +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. + +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 `__ +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 +------------------------------------------------ + +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 + +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. + +You will need to have `edx-i18n-tools` that you can get by: + + $ make requirements + +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/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..c8929ce --- /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.12", 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..9443914 --- /dev/null +++ b/docs/decisions/0001-purpose-of-this-repo.rst @@ -0,0 +1,30 @@ +0001 Purpose of This Repo +######################### + +Status +****** + +**Draft** + +Context +******* + +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 +******** + +The XBlocks will be extracted from the edx-platform and placed in this repository. + +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. +- xblock Sass and JS can be removed from the legacy edx-platform static assets build. + +References +********** + +.. _edx-platform xblocks extraction: https://openedx.atlassian.net/wiki/x/A4Dn-/ 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/pylintrc b/pylintrc new file mode 100644 index 0000000..24c3c8c --- /dev/null +++ b/pylintrc @@ -0,0 +1,386 @@ +# *************************** +# ** 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.4.0 +# ------------------------------ +[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, + +[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 + +# 0d46e725371be094508a87f7cdff3e3901417806 diff --git a/pylintrc_tweaks b/pylintrc_tweaks new file mode 100644 index 0000000..aaa64dc --- /dev/null +++ b/pylintrc_tweaks @@ -0,0 +1,5 @@ +# pylintrc tweaks for use with edx_lint. +[MASTER] +ignore = migrations +load-plugins = edx_lint.pylint,pylint_celery + diff --git a/requirements/base.in b/requirements/base.in new file mode 100644 index 0000000..4ce83cb --- /dev/null +++ b/requirements/base.in @@ -0,0 +1,7 @@ +# Core requirements for using this application +-c constraints.txt + +django-statici18n +edx-i18n-tools +XBlock +openedx-django-pyfs diff --git a/requirements/base.txt b/requirements/base.txt new file mode 100644 index 0000000..7e5855d --- /dev/null +++ b/requirements/base.txt @@ -0,0 +1,91 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# make upgrade +# +appdirs==1.4.4 + # via fs +asgiref==3.8.1 + # via django +boto3==1.35.34 + # via fs-s3fs +botocore==1.35.34 + # via + # boto3 + # s3transfer +django==4.2.16 + # 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.3 + # 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 +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 + # via + # mako + # xblock +openedx-django-pyfs==3.7.0 + # via -r requirements/base.in +path==16.16.0 + # via edx-i18n-tools +polib==1.2.0 + # via edx-i18n-tools +python-dateutil==2.9.0.post0 + # via + # botocore + # xblock +pytz==2024.2 + # via xblock +pyyaml==6.0.2 + # via + # edx-i18n-tools + # xblock +s3transfer==0.10.2 + # via boto3 +simplejson==3.19.3 + # via xblock +six==1.16.0 + # via + # fs + # fs-s3fs + # python-dateutil +sqlparse==0.5.1 + # via django +urllib3==2.2.3 + # via botocore +web-fragments==2.2.0 + # via xblock +webob==1.8.8 + # via xblock +xblock==5.1.0 + # via -r requirements/base.in + +# The following packages are considered to be unsafe in a requirements file: +# setuptools 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..e5f575f --- /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 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 new file mode 100644 index 0000000..8b4226e --- /dev/null +++ b/requirements/dev.txt @@ -0,0 +1,455 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# make upgrade +# +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.3.5 + # via + # -r requirements/quality.txt + # pylint + # pylint-celery +binaryornot==0.4.4 + # via + # -r requirements/quality.txt + # -r requirements/test.txt + # cookiecutter +boto3==1.35.34 + # via + # -r requirements/quality.txt + # -r requirements/test.txt + # fs-s3fs +botocore==1.35.34 + # via + # -r requirements/quality.txt + # -r requirements/test.txt + # boto3 + # s3transfer +build==1.2.2.post1 + # via + # -r requirements/pip-tools.txt + # pip-tools +cachetools==5.5.0 + # via + # -r requirements/quality.txt + # -r requirements/test.txt + # tox +certifi==2024.8.30 + # via + # -r requirements/quality.txt + # -r requirements/test.txt + # requests +chardet==5.2.0 + # via + # -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 + # 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 + # -r requirements/test.txt + # edx-lint +colorama==0.4.6 + # via + # -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.2.0 + # via -r requirements/dev.in +dill==0.3.9 + # via + # -r requirements/quality.txt + # pylint +distlib==0.3.8 + # via + # -r requirements/quality.txt + # -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/quality.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/quality.txt + # -r requirements/test.txt + # django-statici18n +django-statici18n==2.5.0 + # 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.16.1 + # via + # -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.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 + # -r requirements/quality.txt + # pylint +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[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 +mccabe==0.7.0 + # via + # -r requirements/quality.txt + # pylint +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 + # -r requirements/test.txt +packaging==24.1 + # via + # -r requirements/pip-tools.txt + # -r requirements/quality.txt + # -r requirements/test.txt + # build + # pyproject-api + # pytest + # tox +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.3.6 + # via + # -r requirements/quality.txt + # -r requirements/test.txt + # pylint + # tox + # virtualenv +pluggy==1.5.0 + # via + # -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 +pydocstyle==6.3.0 + # via -r requirements/quality.txt +pygments==2.18.0 + # via + # -r requirements/quality.txt + # -r requirements/test.txt + # diff-cover + # rich +pylint==3.3.1 + # 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 + # -r requirements/test.txt + # xblock-sdk +pyproject-api==1.8.0 + # via + # -r requirements/quality.txt + # -r requirements/test.txt + # tox +pyproject-hooks==1.2.0 + # via + # -r requirements/pip-tools.txt + # build + # pip-tools +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 + # -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.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 + # xblock +requests==2.32.3 + # via + # -r requirements/quality.txt + # -r requirements/test.txt + # cookiecutter + # xblock-sdk +rich==13.9.2 + # 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 + # python-dateutil +snowballstemmer==2.2.0 + # via + # -r requirements/quality.txt + # pydocstyle +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.21.2 + # via + # -r requirements/quality.txt + # -r requirements/test.txt +types-python-dateutil==2.9.0.20241003 + # via + # -r requirements/quality.txt + # -r requirements/test.txt + # arrow +urllib3==2.2.3 + # via + # -r requirements/quality.txt + # -r requirements/test.txt + # botocore + # requests +virtualenv==20.26.6 + # via + # -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 + # via + # -r requirements/pip-tools.txt + # pip-tools +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 + # -r requirements/test.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..95da717 --- /dev/null +++ b/requirements/doc.txt @@ -0,0 +1,391 @@ +# +# 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==1.0.0 + # 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.16.0 + # via + # pydata-sphinx-theme + # sphinx +beautifulsoup4==4.12.3 + # via pydata-sphinx-theme +binaryornot==0.4.4 + # via + # -r requirements/test.txt + # cookiecutter +boto3==1.35.34 + # via + # -r requirements/test.txt + # fs-s3fs +botocore==1.35.34 + # via + # -r requirements/test.txt + # boto3 + # s3transfer +build==1.2.2.post1 + # via -r requirements/doc.in +cachetools==5.5.0 + # via + # -r requirements/test.txt + # tox +certifi==2024.8.30 + # via + # -r requirements/test.txt + # requests +chardet==5.2.0 + # via + # -r requirements/test.txt + # binaryornot + # tox +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 +colorama==0.4.6 + # via + # -r requirements/test.txt + # tox +cookiecutter==2.6.0 + # via + # -r requirements/test.txt + # xblock-sdk +coverage[toml]==7.6.1 + # via + # -r requirements/test.txt + # pytest-cov +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 + # 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.2 + # via -r requirements/doc.in +docutils==0.21.2 + # via + # doc8 + # pydata-sphinx-theme + # readme-renderer + # restructuredtext-lint + # sphinx +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 + # fs-s3fs + # openedx-django-pyfs + # xblock +fs-s3fs==1.1.1 + # via + # -r requirements/test.txt + # openedx-django-pyfs + # xblock-sdk +idna==3.10 + # via + # -r requirements/test.txt + # requests +imagesize==1.4.1 + # via sphinx +importlib-metadata==8.5.0 + # via twine +iniconfig==2.0.0 + # via + # -r requirements/test.txt + # pytest +jaraco-classes==3.4.0 + # via keyring +jaraco-context==6.0.1 + # via keyring +jaraco-functools==4.1.0 + # 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.4.1 + # via twine +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 + # xblock +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.5.0 + # via + # jaraco-classes + # jaraco-functools +nh3==0.2.18 + # via readme-renderer +openedx-django-pyfs==3.7.0 + # via -r requirements/test.txt +packaging==24.1 + # via + # -r requirements/test.txt + # build + # pydata-sphinx-theme + # pyproject-api + # pytest + # sphinx + # tox +path==16.16.0 + # via + # -r requirements/test.txt + # edx-i18n-tools +pbr==6.1.0 + # via + # -r requirements/test.txt + # 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 + # 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-api==1.8.0 + # via + # -r requirements/test.txt + # tox +pyproject-hooks==1.2.0 + # via build +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.9.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.2 + # via + # -r requirements/test.txt + # xblock +pyyaml==6.0.2 + # via + # -r requirements/test.txt + # code-annotations + # cookiecutter + # edx-i18n-tools + # xblock +readme-renderer==44.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.9.2 + # via + # -r requirements/test.txt + # cookiecutter + # twine +s3transfer==0.10.2 + # via + # -r requirements/test.txt + # boto3 +simplejson==3.19.3 + # via + # -r requirements/test.txt + # xblock + # xblock-sdk +six==1.16.0 + # via + # -r requirements/test.txt + # fs + # fs-s3fs + # python-dateutil +snowballstemmer==2.2.0 + # via sphinx +soupsieve==2.6 + # via beautifulsoup4 +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==2.0.0 + # via sphinx +sphinxcontrib-devhelp==2.0.0 + # via sphinx +sphinxcontrib-htmlhelp==2.1.0 + # via sphinx +sphinxcontrib-jsmath==1.0.1 + # via sphinx +sphinxcontrib-qthelp==2.0.0 + # via sphinx +sphinxcontrib-serializinghtml==2.0.0 + # via sphinx +sqlparse==0.5.1 + # via + # -r requirements/test.txt + # django +stevedore==5.3.0 + # via + # -r requirements/test.txt + # code-annotations + # doc8 +text-unidecode==1.3 + # via + # -r requirements/test.txt + # python-slugify +tox==4.21.2 + # via -r requirements/test.txt +twine==5.1.1 + # via -r requirements/doc.in +types-python-dateutil==2.9.0.20241003 + # via + # -r requirements/test.txt + # arrow +typing-extensions==4.12.2 + # via pydata-sphinx-theme +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 + # xblock + # xblock-sdk +webob==1.8.8 + # via + # -r requirements/test.txt + # xblock + # xblock-sdk +xblock==5.1.0 + # via + # -r requirements/test.txt + # xblock-sdk +xblock-sdk==0.12.0 + # via -r requirements/test.txt +zipp==3.20.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..cf4131e --- /dev/null +++ b/requirements/pip-tools.txt @@ -0,0 +1,24 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# make upgrade +# +build==1.2.2.post1 + # 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.2.0 + # via + # build + # pip-tools +wheel==0.44.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..488d41f --- /dev/null +++ b/requirements/pip.txt @@ -0,0 +1,14 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# make upgrade +# +wheel==0.44.0 + # via -r requirements/pip.in + +# The following packages are considered to be unsafe in a requirements file: +pip==24.2 + # via -r requirements/pip.in +setuptools==75.1.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..d2fa4c9 --- /dev/null +++ b/requirements/quality.txt @@ -0,0 +1,338 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# 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.3.5 + # via + # pylint + # pylint-celery +binaryornot==0.4.4 + # via + # -r requirements/test.txt + # cookiecutter +boto3==1.35.34 + # via + # -r requirements/test.txt + # fs-s3fs +botocore==1.35.34 + # via + # -r requirements/test.txt + # boto3 + # s3transfer +cachetools==5.5.0 + # via + # -r requirements/test.txt + # tox +certifi==2024.8.30 + # via + # -r requirements/test.txt + # requests +chardet==5.2.0 + # via + # -r requirements/test.txt + # binaryornot + # tox +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 +colorama==0.4.6 + # via + # -r requirements/test.txt + # tox +cookiecutter==2.6.0 + # via + # -r requirements/test.txt + # xblock-sdk +coverage[toml]==7.6.1 + # via + # -r requirements/test.txt + # pytest-cov +dill==0.3.9 + # via pylint +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 + # 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.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 + # fs-s3fs + # openedx-django-pyfs + # xblock +fs-s3fs==1.1.1 + # via + # -r requirements/test.txt + # openedx-django-pyfs + # xblock-sdk +idna==3.10 + # 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 +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 + # xblock +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.7.0 + # via -r requirements/test.txt +packaging==24.1 + # via + # -r requirements/test.txt + # pyproject-api + # pytest + # tox +path==16.16.0 + # via + # -r requirements/test.txt + # edx-i18n-tools +pbr==6.1.0 + # via + # -r requirements/test.txt + # stevedore +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 + # edx-i18n-tools +pycodestyle==2.12.1 + # 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.3.1 + # 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 +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.9.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.2 + # via + # -r requirements/test.txt + # xblock +pyyaml==6.0.2 + # 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.9.2 + # via + # -r requirements/test.txt + # cookiecutter +s3transfer==0.10.2 + # via + # -r requirements/test.txt + # boto3 +simplejson==3.19.3 + # via + # -r requirements/test.txt + # xblock + # xblock-sdk +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.1 + # via + # -r requirements/test.txt + # django +stevedore==5.3.0 + # via + # -r requirements/test.txt + # code-annotations +text-unidecode==1.3 + # via + # -r requirements/test.txt + # python-slugify +tomlkit==0.13.2 + # via pylint +tox==4.21.2 + # via -r requirements/test.txt +types-python-dateutil==2.9.0.20241003 + # via + # -r requirements/test.txt + # arrow +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 + # xblock + # xblock-sdk +webob==1.8.8 + # via + # -r requirements/test.txt + # xblock + # xblock-sdk +xblock==5.1.0 + # via + # -r requirements/test.txt + # xblock-sdk +xblock-sdk==0.12.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..7601a2e --- /dev/null +++ b/requirements/test.in @@ -0,0 +1,10 @@ +# 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 +tox # Virtualenv management for tests diff --git a/requirements/test.txt b/requirements/test.txt new file mode 100644 index 0000000..a516778 --- /dev/null +++ b/requirements/test.txt @@ -0,0 +1,239 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# 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.35.34 + # via + # -r requirements/base.txt + # fs-s3fs +botocore==1.35.34 + # via + # -r requirements/base.txt + # boto3 + # s3transfer +cachetools==5.5.0 + # via tox +certifi==2024.8.30 + # via requests +chardet==5.2.0 + # via + # binaryornot + # tox +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 +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 + # 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.3 + # via -r requirements/base.txt +filelock==3.16.1 + # via + # tox + # virtualenv +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.10 + # 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 +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 + # xblock +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.7.0 + # via -r requirements/base.txt +packaging==24.1 + # 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 + # tox +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 +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.9.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.2 + # via + # -r requirements/base.txt + # xblock +pyyaml==6.0.2 + # via + # -r requirements/base.txt + # code-annotations + # cookiecutter + # edx-i18n-tools + # xblock +requests==2.32.3 + # via + # cookiecutter + # xblock-sdk +rich==13.9.2 + # via cookiecutter +s3transfer==0.10.2 + # via + # -r requirements/base.txt + # boto3 +simplejson==3.19.3 + # via + # -r requirements/base.txt + # xblock + # xblock-sdk +six==1.16.0 + # via + # -r requirements/base.txt + # fs + # fs-s3fs + # python-dateutil +sqlparse==0.5.1 + # via + # -r requirements/base.txt + # django +stevedore==5.3.0 + # via code-annotations +text-unidecode==1.3 + # via python-slugify +tox==4.21.2 + # via -r requirements/test.in +types-python-dateutil==2.9.0.20241003 + # via arrow +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 + # xblock + # xblock-sdk +webob==1.8.8 + # via + # -r requirements/base.txt + # xblock + # xblock-sdk +xblock==5.1.0 + # via + # -r requirements/base.txt + # xblock-sdk +xblock-sdk==0.12.0 + # via -r requirements/test.in + +# 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 100644 index 0000000..dfae3d0 --- /dev/null +++ b/setup.py @@ -0,0 +1,210 @@ +#!/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, sub_roots): + """ + Declare package_data based on all root directories inside `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)): + 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": [ + # _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("xblocks_contrib", ["static", "public", "templates"]), +) diff --git a/tox.ini b/tox.ini new file mode 100644 index 0000000..292b6f2 --- /dev/null +++ b/tox.ini @@ -0,0 +1,86 @@ +[tox] +envlist = py{311,312}-django{42,51}, 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 + django51: Django>=5.1,<5.2 + -r{toxinidir}/requirements/test.txt +allowlist_externals = + mkdir +commands = + pip install -e . + 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 + pycodestyle xblocks_contrib + pydocstyle xblocks_contrib + isort --check-only --diff xblocks_contrib + make selfcheck 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..26e7071 --- /dev/null +++ b/utils/create_xblock.sh @@ -0,0 +1,298 @@ +#!/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; + # 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 + } + 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 && /^__version__/) { + print new_import "\n" + added = 1 + } + print + } + ' "$init_file" > temp_init.py && mv temp_init.py "$init_file" +} + +# 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 + +# Define paths and filenames +base_dir="xblocks_contrib/$xblock_name" +init_file="$base_dir/__init__.py" +xblock_file="$base_dir/$xblock_name.py" +static_dir="$base_dir/static" +templates_dir="$base_dir/templates" +conf_locale_dir="$base_dir/conf/locale" +tests_dir="$base_dir/tests" +setup_file="setup.py" +main_init_file="xblocks_contrib/__init__.py" +utils_config_file="utils/config.yaml" + +# Create directories +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" "$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 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." + +# Populate XBlock file with content +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", + ) + + # 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.""" + 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_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/> + + """, + ), + ] + + @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." %} +

+ +EOL + +# Populate JavaScript file +cat > "$static_dir/js/src/$xblock_name.js" < { + \$('.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 + }); +} +EOL + +# Populate CSS file +cat > "$static_dir/css/$xblock_name.css" < "$tests_dir/test_${xblock_name}.py" < "$init_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..e851e54 --- /dev/null +++ b/xblocks_contrib/annotatable/annotatable.py @@ -0,0 +1,104 @@ +"""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", + ) + + # 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.""" + 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", + """<_annotatable_extracted/> + """, + ), + ( + "Multiple AnnotatableBlock", + """ + <_annotatable_extracted/> + <_annotatable_extracted/> + <_annotatable_extracted/> + + """, + ), + ] + + @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/annotatable/tests/test_annotatable.py b/xblocks_contrib/annotatable/tests/test_annotatable.py new file mode 100644 index 0000000..6c48b61 --- /dev/null +++ b/xblocks_contrib/annotatable/tests/test_annotatable.py @@ -0,0 +1,26 @@ +""" +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/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..ed945c6 --- /dev/null +++ b/xblocks_contrib/discussion/discussion.py @@ -0,0 +1,104 @@ +"""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", + ) + + # 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.""" + 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", + """<_discussion_extracted/> + """, + ), + ( + "Multiple DiscussionXBlock", + """ + <_discussion_extracted/> + <_discussion_extracted/> + <_discussion_extracted/> + + """, + ), + ] + + @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/discussion/tests/test_discussion.py b/xblocks_contrib/discussion/tests/test_discussion.py new file mode 100644 index 0000000..be91476 --- /dev/null +++ b/xblocks_contrib/discussion/tests/test_discussion.py @@ -0,0 +1,26 @@ +""" +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/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..7aac1de --- /dev/null +++ b/xblocks_contrib/html/html.py @@ -0,0 +1,104 @@ +"""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", + ) + + # 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.""" + 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", + """<_html_extracted/> + """, + ), + ( + "Multiple HtmlBlock", + """ + <_html_extracted/> + <_html_extracted/> + <_html_extracted/> + + """, + ), + ] + + @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/html/tests/test_html.py b/xblocks_contrib/html/tests/test_html.py new file mode 100644 index 0000000..48643d4 --- /dev/null +++ b/xblocks_contrib/html/tests/test_html.py @@ -0,0 +1,26 @@ +""" +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/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..5dbaf15 --- /dev/null +++ b/xblocks_contrib/lti/lti.py @@ -0,0 +1,104 @@ +"""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", + ) + + # 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.""" + 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", + """<_lti_extracted/> + """, + ), + ( + "Multiple LTIBlock", + """ + <_lti_extracted/> + <_lti_extracted/> + <_lti_extracted/> + + """, + ), + ] + + @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/lti/tests/test_lti.py b/xblocks_contrib/lti/tests/test_lti.py new file mode 100644 index 0000000..f4a4a53 --- /dev/null +++ b/xblocks_contrib/lti/tests/test_lti.py @@ -0,0 +1,26 @@ +""" +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/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..6eddb6a --- /dev/null +++ b/xblocks_contrib/poll/__init__.py @@ -0,0 +1,5 @@ +""" +Init for the PollBlock. +""" + +from .poll import PollBlock 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..37cbfc4 --- /dev/null +++ b/xblocks_contrib/poll/poll.py @@ -0,0 +1,104 @@ +"""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 PollBlock(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", + ) + + # 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.""" + 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, 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/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("PollBlock") + 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 [ + ( + "PollBlock", + """<_poll_question_extracted/> + """, + ), + ( + "Multiple PollBlock", + """ + <_poll_question_extracted/> + <_poll_question_extracted/> + <_poll_question_extracted/> + + """, + ), + ] + + @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 new file mode 100644 index 0000000..b337caf --- /dev/null +++ b/xblocks_contrib/poll/static/css/poll.css @@ -0,0 +1,9 @@ +/* CSS for PollBlock */ + +.poll .count { + font-weight: bold; +} + +.poll p { + cursor: pointer; +} 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..7389c87 --- /dev/null +++ b/xblocks_contrib/poll/static/js/src/poll.js @@ -0,0 +1,38 @@ + +/* JavaScript for PollBlock. */ +function PollBlock(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/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/poll/tests/test_poll.py b/xblocks_contrib/poll/tests/test_poll.py new file mode 100644 index 0000000..a55cc7b --- /dev/null +++ b/xblocks_contrib/poll/tests/test_poll.py @@ -0,0 +1,26 @@ +""" +Tests for PollBlock +""" + +from django.test import TestCase +from xblock.fields import ScopeIds +from xblock.test.toy_runtime import ToyRuntime + +from xblocks_contrib import PollBlock + + +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 = PollBlock(ToyRuntime(), scope_ids=scope_ids) + frag = block.student_view() + as_dict = frag.to_dict() + content = as_dict["content"] + self.assertIn( + "PollBlock: count is now", + content, + "XBlock did not render correct student view", + ) 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..912fc32 --- /dev/null +++ b/xblocks_contrib/problem/problem.py @@ -0,0 +1,104 @@ +"""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", + ) + + # 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.""" + 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", + """<_problem_extracted/> + """, + ), + ( + "Multiple ProblemBlock", + """ + <_problem_extracted/> + <_problem_extracted/> + <_problem_extracted/> + + """, + ), + ] + + @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/problem/tests/test_problem.py b/xblocks_contrib/problem/tests/test_problem.py new file mode 100644 index 0000000..b33f2a3 --- /dev/null +++ b/xblocks_contrib/problem/tests/test_problem.py @@ -0,0 +1,26 @@ +""" +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/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/tests/test_video.py b/xblocks_contrib/video/tests/test_video.py new file mode 100644 index 0000000..784b92f --- /dev/null +++ b/xblocks_contrib/video/tests/test_video.py @@ -0,0 +1,26 @@ +""" +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/xblocks_contrib/video/video.py b/xblocks_contrib/video/video.py new file mode 100644 index 0000000..b11baeb --- /dev/null +++ b/xblocks_contrib/video/video.py @@ -0,0 +1,105 @@ +"""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", + ) + + # 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.""" + 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", + """<_video_extracted/> + """, + ), + ( + "Multiple VideoBlock", + """ + <_video_extracted/> + <_video_extracted/> + <_video_extracted/> + + """, + ), + ] + + @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/tests/test_word_cloud.py b/xblocks_contrib/word_cloud/tests/test_word_cloud.py new file mode 100644 index 0000000..3cd45b7 --- /dev/null +++ b/xblocks_contrib/word_cloud/tests/test_word_cloud.py @@ -0,0 +1,26 @@ +""" +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/xblocks_contrib/word_cloud/word_cloud.py b/xblocks_contrib/word_cloud/word_cloud.py new file mode 100644 index 0000000..331022e --- /dev/null +++ b/xblocks_contrib/word_cloud/word_cloud.py @@ -0,0 +1,104 @@ +"""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", + ) + + # 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.""" + 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", + """<_word_cloud_extracted/> + """, + ), + ( + "Multiple WordCloudBlock", + """ + <_word_cloud_extracted/> + <_word_cloud_extracted/> + <_word_cloud_extracted/> + + """, + ), + ] + + @staticmethod + def get_dummy(): + """ + Generate initial i18n with dummy method. + """ + return translation.gettext_noop("Dummy")