Skip to content

Commit

Permalink
Merge branch 'master' into omer/replace_pkg_resources
Browse files Browse the repository at this point in the history
  • Loading branch information
OmerBhatti authored Sep 25, 2024
2 parents 9648bea + a6f5321 commit 4f82097
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 35 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@ on:

jobs:
run_tests:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
strategy:
matrix:
python-version:
- '3.11'
- '3.12'
TOX_ENV:
- csslint
- eslint
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pypi-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
push:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest

steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ def is_requirement(line):

setup(
name='xblock-sql-grader',
version='0.6.0',
version='1.0.0',
description='SQL Grader XBlock', # TODO: write a better description.
license='AGPLv3',
long_description=README,
Expand Down
63 changes: 31 additions & 32 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,102 +1,101 @@
[tox]
envlist =
envlist =
csslint
eslint
py{311}-django{42}quality
py{311,312}-django{42},quality

[testenv]
deps =
deps =
-rrequirements/test.txt
-e git+https://github.com/openedx/[email protected]\#egg=codejail
django42: Django>=4.2,<4.3

commands =
commands =
coverage run manage.py test
coverage report
coverage html

[testenv:clean]
commands =
commands =
coverage erase
skip_install = True

[testenv:csslint]
allowlist_externals = {toxinidir}/node_modules/csslint/dist/cli.js
passenv =
passenv =
TRAVIS
TRAVIS_JOB_ID
TRAVIS_BRANCH
commands =
commands =
{toxinidir}/node_modules/csslint/dist/cli.js sql_grader/static/
deps =
deps =
skip_install = True

[testenv:eslint]
allowlist_externals = {toxinidir}/node_modules/eslint/bin/eslint.js
passenv =
passenv =
TRAVIS
TRAVIS_JOB_ID
TRAVIS_BRANCH
commands =
commands =
{toxinidir}/node_modules/eslint/bin/eslint.js sql_grader/static/view.js
deps =
deps =
skip_install = True

[testenv:quality]
passenv =
passenv =
TRAVIS
TRAVIS_JOB_ID
TRAVIS_BRANCH
deps =
deps =
-rrequirements/quality.txt
commands =
commands =
pycodestyle sql_grader/
pylint sql_grader/

[testenv:translations_push]
deps =
deps =
transifex-client
commands =
commands =
tx push -s

[testenv:translations_pull]
deps =
deps =
edx-i18n-tools==1.3.0
transifex-client
commands =
commands =
cd sql_grader && i18n_tool transifex pull
allowlist_externals =
allowlist_externals =
cd

[testenv:translations_compile]
deps =
deps =
edx-i18n-tools==1.3.0
commands =
commands =
cd sql_grader && i18n_tool generate
allowlist_externals =
allowlist_externals =
cd

[testenv:translations_dummy]
deps =
deps =
edx-i18n-tools==1.3.0
commands =
commands =
cd sql_grader && i18n_tool dummy
allowlist_externals =
allowlist_externals =
cd

[testenv:translations_detect_changed]
deps =
deps =
edx-i18n-tools==1.3.0
commands =
commands =
cd sql_grader && i18n_tool changed
allowlist_externals =
allowlist_externals =
cd

[testenv:translations_extract]
deps =
deps =
edx-i18n-tools==1.3.0
commands =
commands =
cd sql_grader && i18n_tool extract
allowlist_externals =
allowlist_externals =
cd

0 comments on commit 4f82097

Please sign in to comment.