Skip to content

Commit

Permalink
refactor: Block type processing is refactored
Browse files Browse the repository at this point in the history
- `attrs` dependency is added
- block type processors are implemented
- Block type processors are integrated into the script workflow
  • Loading branch information
myhailo-chernyshov-rg committed Jan 8, 2025
1 parent 1db76ff commit 6a2f75f
Show file tree
Hide file tree
Showing 57 changed files with 2,372 additions and 1,617 deletions.
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
include LICENSE
include README.rst

recursive-include src/cc2olx/templates *
recursive-include tests *
recursive-exclude * __pycache__
recursive-exclude * *.py[co]
Expand Down
1 change: 1 addition & 0 deletions requirements/base.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Core requirements for this package

attrs
lxml
requests
youtube-dl
14 changes: 8 additions & 6 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,19 @@
#
# make upgrade
#
certifi==2024.2.2
attrs==24.3.0
# via -r requirements/base.in
certifi==2024.12.14
# via requests
charset-normalizer==3.3.2
charset-normalizer==3.4.1
# via requests
idna==3.6
idna==3.10
# via requests
lxml==5.1.0
lxml==5.3.0
# via -r requirements/base.in
requests==2.31.0
requests==2.32.3
# via -r requirements/base.in
urllib3==2.2.1
urllib3==2.2.3
# via requests
youtube-dl==2021.12.17
# via -r requirements/base.in
57 changes: 31 additions & 26 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,52 +4,56 @@
#
# make upgrade
#
black==24.3.0
attrs==24.3.0
# via
# -c requirements/constraints.txt
# -r requirements/quality.txt
black==24.8.0
# via -r requirements/quality.txt
cachetools==5.3.3
cachetools==5.5.0
# via tox
certifi==2024.2.2
certifi==2024.12.14
# via
# -r requirements/quality.txt
# requests
chardet==5.2.0
# via tox
charset-normalizer==3.3.2
charset-normalizer==3.4.1
# via
# -r requirements/quality.txt
# requests
click==8.1.7
click==8.1.8
# via
# -r requirements/quality.txt
# black
colorama==0.4.6
# via tox
coverage[toml]==7.4.4
coverage[toml]==7.6.1
# via
# -r requirements/ci.in
# -r requirements/quality.txt
# -r requirements/ci.in
# pytest-cov
distlib==0.3.8
distlib==0.3.9
# via virtualenv
exceptiongroup==1.2.0
exceptiongroup==1.2.2
# via
# -r requirements/quality.txt
# pytest
filelock==3.13.3
filelock==3.16.1
# via
# tox
# virtualenv
flake8==7.0.0
flake8==7.1.1
# via -r requirements/quality.txt
idna==3.6
idna==3.10
# via
# -r requirements/quality.txt
# requests
iniconfig==2.0.0
# via
# -r requirements/quality.txt
# pytest
lxml==5.1.0
lxml==5.3.0
# via -r requirements/quality.txt
mccabe==0.7.0
# via
Expand All @@ -59,7 +63,7 @@ mypy-extensions==1.0.0
# via
# -r requirements/quality.txt
# black
packaging==24.0
packaging==24.2
# via
# -r requirements/quality.txt
# black
Expand All @@ -70,28 +74,28 @@ pathspec==0.12.1
# via
# -r requirements/quality.txt
# black
platformdirs==4.2.0
platformdirs==4.3.6
# via
# -r requirements/quality.txt
# black
# tox
# virtualenv
pluggy==1.4.0
pluggy==1.5.0
# via
# -r requirements/quality.txt
# pytest
# tox
pycodestyle==2.11.1
pycodestyle==2.12.1
# via
# -r requirements/quality.txt
# flake8
pyflakes==3.2.0
# via
# -r requirements/quality.txt
# flake8
pyproject-api==1.6.1
pyproject-api==1.8.0
# via tox
pytest==8.1.1
pytest==8.3.4
# via
# -r requirements/quality.txt
# pytest-cov
Expand All @@ -100,29 +104,30 @@ pytest-cov==5.0.0
# via -r requirements/quality.txt
pytest-mock==3.14.0
# via -r requirements/quality.txt
requests==2.31.0
requests==2.32.3
# via -r requirements/quality.txt
tomli==2.0.1
tomli==2.2.1
# via
# -r requirements/quality.txt
# black
# coverage
# pyproject-api
# pytest
# tox
tox==4.14.2
tox==4.23.2
# via -r requirements/ci.in
typing-extensions==4.10.0
typing-extensions==4.12.2
# via
# -r requirements/quality.txt
# black
urllib3==2.2.1
# tox
urllib3==2.2.3
# via
# -r requirements/quality.txt
# requests
virtualenv==20.25.1
virtualenv==20.28.1
# via tox
xmlformatter==0.2.6
xmlformatter==0.2.8
# via -r requirements/quality.txt
youtube-dl==2021.12.17
# via -r requirements/quality.txt
17 changes: 8 additions & 9 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,21 @@
# Note: Changes to this file will automatically be used by other repos, referencing
# this file from Github directly. It does not require packaging in edx-lint.


# using LTS django version
Django<5.0

# elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process.
# elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
# See https://github.com/openedx/edx-platform/issues/35126 for more info
elasticsearch<7.14.0

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

# opentelemetry requires version 6.x at the moment:
# https://github.com/open-telemetry/opentelemetry-python/issues/3570
# Normally this could be added as a constraint in edx-django-utils, where we're
# adding the opentelemetry dependency. However, when we compile pip-tools.txt,
# that uses version 7.x, and then there's no undoing that when compiling base.txt.
# So we need to pin it globally, for now.
# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407
importlib-metadata<7
# Cause: https://github.com/openedx/edx-lint/issues/458
# This can be unpinned once https://github.com/openedx/edx-lint/issues/459 has been resolved.
pip<24.3

# Cause: https://github.com/openedx/edx-lint/issues/475
# This can be unpinned once https://github.com/openedx/edx-lint/issues/476 has been resolved.
urllib3<2.3.0
2 changes: 2 additions & 0 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@
# 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.

attrs==24.3.0
Loading

0 comments on commit 6a2f75f

Please sign in to comment.