From fcd4472b387d142a1f5164f92047c79457cdab3a Mon Sep 17 00:00:00 2001 From: Hironsan Date: Fri, 18 Dec 2020 15:23:16 +0900 Subject: [PATCH 1/2] Add lockfile as a dependency to pass tests --- Pipfile | 1 + Pipfile.lock | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Pipfile b/Pipfile index 9517d208..241d322c 100644 --- a/Pipfile +++ b/Pipfile @@ -40,6 +40,7 @@ whitenoise = "*" dj-database-url = "*" python-jose = "*" pyexcel-xlsx = "*" +lockfile = "*" [requires] python_version = "3.8" diff --git a/Pipfile.lock b/Pipfile.lock index 26d65838..02227f89 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "7a101e25710dcef37ef85bbe7c5f3dd6b32e9e0af6e464f640433484e8534340" + "sha256": "c526ff500b5455d7a06d1c54ffe82f875617ed24cb53ac309b0414bd15e539eb" }, "pipfile-spec": 6, "requires": { @@ -315,6 +315,14 @@ ], "version": "==0.1.0" }, + "lockfile": { + "hashes": [ + "sha256:6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799", + "sha256:6c3cb24f344923d30b2785d5ad75182c8ea7ac1b6171b08657258ec7429d50fa" + ], + "index": "pypi", + "version": "==0.12.2" + }, "markupsafe": { "hashes": [ "sha256:00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473", From 1695b17ff80ba7adfbf89bb3b2ffdf3997578e1c Mon Sep 17 00:00:00 2001 From: Hironsan Date: Fri, 18 Dec 2020 15:33:14 +0900 Subject: [PATCH 2/2] Add a workflow for unit testing --- .github/workflows/ci.yml | 29 +++++++++++++++++++++++++++++ Pipfile | 6 ++++++ 2 files changed, 35 insertions(+) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 00000000..c926ace1 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,29 @@ +name: doccano CI + +on: [push, pull_request] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up Python 3.8 + uses: actions/setup-python@v2 + with: + python-version: 3.8 + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install pipenv + pipenv sync --dev + - name: Run migrations + run: | + pipenv run wait_for_db + pipenv run migrate + working-directory: ./app + - name: Run tests + run: | + pipenv run test + working-directory: ./app diff --git a/Pipfile b/Pipfile index 241d322c..9dedfe93 100644 --- a/Pipfile +++ b/Pipfile @@ -44,3 +44,9 @@ lockfile = "*" [requires] python_version = "3.8" + +[scripts] +isort = "isort . -c" +wait_for_db = "python manage.py wait_for_db" +test = "python manage.py test api.tests" +migrate = "python manage.py migrate"