From f8cbcc8e8ce501f9af2a84c4a8021c07e7ed273f Mon Sep 17 00:00:00 2001 From: Shadi Naif Date: Fri, 8 Mar 2024 12:22:29 +0300 Subject: [PATCH] feat: add eox-tenant --- .github/PULL_REQUEST_TEMPLATE.md | 10 ---------- .github/workflows/ci.yml | 21 +++++++++++++++++---- requirements/base.in | 2 +- requirements/base.txt | 2 +- requirements/ci.txt | 2 +- requirements/dev.txt | 8 ++++---- requirements/doc.txt | 6 +++--- requirements/pip-tools.txt | 2 +- requirements/quality.txt | 4 ++-- requirements/test.txt | 4 ++-- 10 files changed, 32 insertions(+), 29 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index ed62972a..e69de29b 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,10 +0,0 @@ - -**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 index cc6ff1e0..890bc069 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,12 +3,25 @@ name: Python CI on: push: branches: [main] - pull_request: - branches: - - '**' - + issue_comment: + types: [created] jobs: + check_comment: + runs-on: ubuntu-latest + if: github.event.issue.pull_request != '' # Only runs if the comment is on a PR + outputs: + should_run: ${{ steps.comment_check.outputs.should_run }} + steps: + - name: Check for 'run tests' comment + id: comment_check + uses: actions/github-script@v5 + with: + github-token: ${{secrets.GITHUB_TOKEN}} + script: | + const isRunTestsComment = '${{ github.event.comment.body }}'.trim() === 'run tests'; + core.setOutput('should_run', isRunTestsComment ? 'true' : 'false'); + run_tests: name: tests runs-on: ${{ matrix.os }} diff --git a/requirements/base.in b/requirements/base.in index b4987454..c7cf1d71 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -4,4 +4,4 @@ Django # Web application framework django-model-utils # Provides TimeStampedModel abstract base class -openedx-atlas +eox-tenant diff --git a/requirements/base.txt b/requirements/base.txt index 0c2c1d74..08c7935e 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -13,7 +13,7 @@ django==4.2.11 # django-model-utils django-model-utils==4.4.0 # via -r requirements/base.in -openedx-atlas==0.6.0 +eox-tenant==11.0.1 # via -r requirements/base.in sqlparse==0.4.4 # via django diff --git a/requirements/ci.txt b/requirements/ci.txt index 4e4b3347..baae04fa 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -32,7 +32,7 @@ tomli==2.0.1 # via # pyproject-api # tox -tox==4.13.0 +tox==4.14.1 # via -r requirements/ci.in virtualenv==20.25.1 # via tox diff --git a/requirements/dev.txt b/requirements/dev.txt index 56f758b8..4fdef7f2 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -72,6 +72,8 @@ edx-i18n-tools==1.3.0 # via -r requirements/dev.in edx-lint==5.3.6 # via -r requirements/quality.txt +eox-tenant==11.0.1 + # via -r requirements/quality.txt exceptiongroup==1.2.0 # via # -r requirements/quality.txt @@ -104,8 +106,6 @@ mccabe==0.7.0 # via # -r requirements/quality.txt # pylint -openedx-atlas==0.6.0 - # via -r requirements/quality.txt packaging==23.2 # via # -r requirements/ci.txt @@ -121,7 +121,7 @@ pbr==6.0.0 # via # -r requirements/quality.txt # stevedore -pip-tools==7.4.0 +pip-tools==7.4.1 # via -r requirements/pip-tools.txt platformdirs==4.2.0 # via @@ -229,7 +229,7 @@ tomlkit==0.12.4 # via # -r requirements/quality.txt # pylint -tox==4.13.0 +tox==4.14.1 # via -r requirements/ci.txt typing-extensions==4.10.0 # via diff --git a/requirements/doc.txt b/requirements/doc.txt index 6d4f4bab..90c53264 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -54,6 +54,8 @@ docutils==0.20.1 # readme-renderer # restructuredtext-lint # sphinx +eox-tenant==11.0.1 + # via -r requirements/test.txt exceptiongroup==1.2.0 # via # -r requirements/test.txt @@ -62,7 +64,7 @@ idna==3.6 # via requests imagesize==1.4.1 # via sphinx -importlib-metadata==7.0.1 +importlib-metadata==7.0.2 # via # keyring # twine @@ -95,8 +97,6 @@ more-itertools==10.2.0 # via jaraco-classes nh3==0.2.15 # via readme-renderer -openedx-atlas==0.6.0 - # via -r requirements/test.txt packaging==23.2 # via # -r requirements/test.txt diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 89412462..67f898be 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -10,7 +10,7 @@ click==8.1.7 # via pip-tools packaging==23.2 # via build -pip-tools==7.4.0 +pip-tools==7.4.1 # via -r requirements/pip-tools.in pyproject-hooks==1.0.0 # via diff --git a/requirements/quality.txt b/requirements/quality.txt index 5ae64ab6..12b1f6e2 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -39,6 +39,8 @@ django-model-utils==4.4.0 # via -r requirements/test.txt edx-lint==5.3.6 # via -r requirements/quality.in +eox-tenant==11.0.1 + # via -r requirements/test.txt exceptiongroup==1.2.0 # via # -r requirements/test.txt @@ -61,8 +63,6 @@ markupsafe==2.1.5 # jinja2 mccabe==0.7.0 # via pylint -openedx-atlas==0.6.0 - # via -r requirements/test.txt packaging==23.2 # via # -r requirements/test.txt diff --git a/requirements/test.txt b/requirements/test.txt index b65b6259..a1bd7ff2 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -20,6 +20,8 @@ coverage[toml]==7.4.3 # django-model-utils django-model-utils==4.4.0 # via -r requirements/base.txt +eox-tenant==11.0.1 + # via -r requirements/base.txt exceptiongroup==1.2.0 # via pytest iniconfig==2.0.0 @@ -28,8 +30,6 @@ jinja2==3.1.3 # via code-annotations markupsafe==2.1.5 # via jinja2 -openedx-atlas==0.6.0 - # via -r requirements/base.txt packaging==23.2 # via pytest pbr==6.0.0