Skip to content

Commit

Permalink
feat: Adds xblock-utils repository code into this repository
Browse files Browse the repository at this point in the history
  • Loading branch information
farhan committed Sep 25, 2023
1 parent 3304375 commit f502eae
Show file tree
Hide file tree
Showing 41 changed files with 2,073 additions and 18 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,15 @@ jobs:
toxenv: [quality, django32, django42]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: setup python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}

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

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

Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ Unreleased
----------


1.8.0 - 2023-09-25
------------------
* Added `xblock-utils <https://github.com/openedx/xblock-utils>`_ repository code into this repository along with docs.
Docs moved into the docs/ directory.

1.7.0 - 2023-08-03
------------------

Expand Down
7 changes: 7 additions & 0 deletions conftest.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import pytest


# https://pytest-django.readthedocs.io/en/latest/faq.html#how-can-i-give-database-access-to-all-my-tests-without-the-django-db-marker
@pytest.fixture(autouse=True)
def enable_db_access_for_all_tests(db):
pass
1 change: 1 addition & 0 deletions requirements/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

fs
lxml
mako
markupsafe
python-dateutil
pytz
Expand Down
6 changes: 5 additions & 1 deletion requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,12 @@ fs==2.4.16
# via -r requirements/base.in
lxml==4.9.3
# via -r requirements/base.in
markupsafe==2.1.3
mako==1.2.4
# via -r requirements/base.in
markupsafe==2.1.3
# via
# -r requirements/base.in
# mako
python-dateutil==2.8.2
# via -r requirements/base.in
pytz==2023.3.post1
Expand Down
92 changes: 88 additions & 4 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ appdirs==1.4.4
# via
# -r requirements/test.txt
# fs
arrow==1.2.3
# via
# -r requirements/test.txt
# cookiecutter
astroid==2.15.7
# via
# -r requirements/test.txt
Expand All @@ -21,6 +25,10 @@ attrs==23.1.0
# via
# -r requirements/test.txt
# hypothesis
binaryornot==0.4.4
# via
# -r requirements/test.txt
# cookiecutter
boto3==1.28.53
# via
# -r requirements/test.txt
Expand All @@ -34,12 +42,25 @@ build==1.0.3
# via
# -r requirements/pip-tools.txt
# pip-tools
certifi==2023.7.22
# via
# -r requirements/test.txt
# requests
chardet==5.2.0
# via
# -r requirements/test.txt
# binaryornot
charset-normalizer==3.2.0
# via
# -r requirements/test.txt
# requests
click==8.1.7
# via
# -r requirements/pip-tools.txt
# -r requirements/test.txt
# click-log
# code-annotations
# cookiecutter
# edx-lint
# pip-tools
click-log==0.4.0
Expand All @@ -50,6 +71,10 @@ code-annotations==1.5.0
# via
# -r requirements/test.txt
# edx-lint
cookiecutter==2.3.1
# via
# -r requirements/test.txt
# xblock-sdk
coverage[toml]==7.3.1
# via
# -r requirements/ci.txt
Expand All @@ -75,6 +100,7 @@ django==2.2.28
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/test.txt
# openedx-django-pyfs
# xblock-sdk
edx-lint==5.3.4
# via -r requirements/test.txt
exceptiongroup==1.1.3
Expand All @@ -93,12 +119,18 @@ fs==2.4.16
# -r requirements/test.txt
# fs-s3fs
# openedx-django-pyfs
# xblock
fs-s3fs==1.1.1
# via
# -r requirements/test.txt
# openedx-django-pyfs
hypothesis==6.86.2
# xblock-sdk
hypothesis==6.87.0
# via -r requirements/test.txt
idna==3.4
# via
# -r requirements/test.txt
# requests
importlib-metadata==6.8.0
# via
# -r requirements/pip-tools.txt
Expand All @@ -119,6 +151,7 @@ jinja2==3.1.2
# via
# -r requirements/test.txt
# code-annotations
# cookiecutter
# diff-cover
# jinja2-pluralize
jinja2-pluralize==0.3.0
Expand All @@ -137,15 +170,30 @@ lazy-object-proxy==1.9.0
# -r requirements/test.txt
# astroid
lxml==4.9.3
# via
# -r requirements/test.txt
# xblock
# xblock-sdk
mako==1.2.4
# via -r requirements/test.txt
markdown-it-py==3.0.0
# via
# -r requirements/test.txt
# rich
markupsafe==2.1.3
# via
# -r requirements/test.txt
# jinja2
# mako
# xblock
mccabe==0.7.0
# via
# -r requirements/test.txt
# pylint
mdurl==0.1.2
# via
# -r requirements/test.txt
# markdown-it-py
mock==5.1.0
# via -r requirements/test.txt
openedx-django-pyfs==3.4.0
Expand Down Expand Up @@ -198,6 +246,7 @@ pygments==2.16.1
# via
# -r requirements/test.txt
# diff-cover
# rich
pylint==2.17.5
# via
# -r requirements/test.txt
Expand All @@ -218,6 +267,10 @@ pylint-plugin-utils==0.8.2
# -r requirements/test.txt
# pylint-celery
# pylint-django
pypng==0.20220715.0
# via
# -r requirements/test.txt
# xblock-sdk
pyproject-hooks==1.0.0
# via
# -r requirements/pip-tools.txt
Expand All @@ -234,25 +287,42 @@ pytest-django==4.5.2
python-dateutil==2.8.2
# via
# -r requirements/test.txt
# arrow
# botocore
# xblock
python-slugify==8.0.1
# via
# -r requirements/test.txt
# code-annotations
# cookiecutter
pytz==2023.3.post1
# via
# -r requirements/test.txt
# django
# xblock
pyyaml==6.0.1
# via
# -r requirements/test.txt
# code-annotations
# cookiecutter
# xblock
requests==2.31.0
# via
# -r requirements/test.txt
# cookiecutter
# xblock-sdk
rich==13.5.3
# via
# -r requirements/test.txt
# cookiecutter
s3transfer==0.6.2
# via
# -r requirements/test.txt
# boto3
simplejson==3.19.1
# via -r requirements/test.txt
# via
# -r requirements/test.txt
# xblock-sdk
six==1.16.0
# via
# -r requirements/ci.txt
Expand Down Expand Up @@ -311,19 +381,27 @@ typing-extensions==4.8.0
# pydantic
# pydantic-core
# pylint
# rich
urllib3==1.26.16
# via
# -r requirements/test.txt
# botocore
# requests
virtualenv==20.24.5
# via
# -r requirements/ci.txt
# -r requirements/test.txt
# tox
web-fragments==2.1.0
# via -r requirements/test.txt
# via
# -r requirements/test.txt
# xblock
# xblock-sdk
webob==1.8.7
# via -r requirements/test.txt
# via
# -r requirements/test.txt
# xblock
# xblock-sdk
wheel==0.41.2
# via
# -r requirements/pip-tools.txt
Expand All @@ -332,6 +410,12 @@ wrapt==1.15.0
# via
# -r requirements/test.txt
# astroid
xblock==1.7.0
# via
# -r requirements/test.txt
# xblock-sdk
xblock-sdk==0.7.0
# via -r requirements/test.txt
zipp==3.17.0
# via
# -r requirements/pip-tools.txt
Expand Down
6 changes: 5 additions & 1 deletion requirements/django.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,12 @@ lazy==1.6
# via -r requirements/django.in
lxml==4.9.3
# via -r requirements/base.txt
markupsafe==2.1.3
mako==1.2.4
# via -r requirements/base.txt
markupsafe==2.1.3
# via
# -r requirements/base.txt
# mako
openedx-django-pyfs==3.4.0
# via -r requirements/django.in
python-dateutil==2.8.2
Expand Down
3 changes: 3 additions & 0 deletions requirements/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,13 @@ lazy==1.6
# via -r requirements/django.txt
lxml==4.9.3
# via -r requirements/django.txt
mako==1.2.4
# via -r requirements/django.txt
markupsafe==2.1.3
# via
# -r requirements/django.txt
# jinja2
# mako
mock==5.1.0
# via -r requirements/doc.in
openedx-django-pyfs==3.4.0
Expand Down
1 change: 1 addition & 0 deletions requirements/test.in
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ pytest
pytest-cov
pytest-django
tox
xblock-sdk
Loading

0 comments on commit f502eae

Please sign in to comment.