Skip to content

Commit b714829

Browse files
committed
Merge branch '3.x'
2 parents 0219706 + 2bbde52 commit b714829

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+929
-1654
lines changed

.coveragerc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[run]
2+
relative_files = True

.coveralls.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

.editorconfig

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
[*]
2+
charset = utf-8
3+
indent_style = space
4+
indent_size = 2
5+
insert_final_newline = true
6+
trim_trailing_whitespace = true
7+
8+
[*.py]
9+
indent_style = space
10+
indent_size = 4
11+
12+
[Makefile]
13+
indent_style = tab
14+
15+
[*.{md,rst}]
16+
indent_style = space
17+
indent_size = 4

.github/CONTRIBUTING.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,22 @@ Follow the following steps to get started contributing to this project.
1616
git checkout -b name-of-your-bugfix-or-feature
1717

1818
3. Create a virtual environment of your choice and activate it.
19-
4. Install the dependencies via pip and run the migrations for demo_project.
19+
4. Install the dependencies via pip and run the migrations for django application.
2020

21-
npm run pip-install
22-
npm run migrate
21+
make
2322

24-
5. Now you can run the demo_project on localhost:8000 to see the changes you make in action real-time.
23+
5. Now you can run the django application on localhost:8000 to see the changes you make in action real-time.
2524

26-
npm run demo
25+
make dev
2726

2827

2928
## Testing
3029

3130
1. Run the tests by the following command.
3231

33-
npm run test
32+
make test
3433

3534
2. See the coverage report by the following command.
3635

37-
npm run coverage
36+
make coverage
3837

.github/workflows/build.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: build
2+
3+
on:
4+
push:
5+
branches: ['*']
6+
pull_request:
7+
8+
jobs:
9+
build:
10+
if: "!contains(github.event.head_commit.message, 'skip-ci')"
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v2
14+
15+
- name: Set up Python 3.6
16+
uses: actions/setup-python@v2
17+
with:
18+
python-version: '3.6'
19+
20+
- name: Install
21+
run: python3 -m pip install -r requirements/build.txt
22+
23+
- name: Lint
24+
run: make lint
25+
26+
- name: Test & Coverage
27+
run: make coverage
28+
29+
- name: Coveralls.io notification
30+
uses: AndreMiras/coveralls-python-action@develop
31+
with:
32+
parallel: true
33+
flag-name: Unit Test
34+
35+
coveralls_finish:
36+
needs: build
37+
runs-on: ubuntu-latest
38+
steps:
39+
- name: Coveralls Finished
40+
uses: AndreMiras/coveralls-python-action@develop
41+
with:
42+
parallel-finished: true

.github/workflows/deploy.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: deploy
2+
3+
on:
4+
release:
5+
types: [created]
6+
7+
jobs:
8+
deploy:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v2
12+
13+
- name: Set up Python 3.6
14+
uses: actions/setup-python@v2
15+
with:
16+
python-version: '3.6'
17+
18+
- name: Install dependencies
19+
run: 'python -m pip install build wheel --user'
20+
21+
- name: Build
22+
run: make build
23+
24+
- name: Publish to PyPI
25+
uses: pypa/gh-action-pypi-publish@master
26+
with:
27+
password: ${{ secrets.PYPI_API_TOKEN }}

.github/workflows/docs.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: docs
2+
3+
on:
4+
push:
5+
branches: [master, 3.x]
6+
7+
jobs:
8+
deploy:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Trigger RTDs build
12+
uses: dfm/rtds-action@v1
13+
with:
14+
webhook_url: ${{ secrets.RTDS_WEBHOOK_URL }}
15+
webhook_token: ${{ secrets.RTDS_WEBHOOK_TOKEN }}
16+
commit_ref: ${{ github.ref }}

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.venv
1+
/venv*
22
.vscode
33
node_modules
44
db.sqlite3

.pylintrc

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
[MASTER]
2+
init-hook='import os, sys; sys.path.append(os.path.abspath("."))'
3+
disable=
4+
R,
5+
C,
6+
missing-docstring,
7+
W0143, # comparison-with-callable
8+
W0613, # unused-argument
9+
10+
[FORMAT]
11+
max-line-length=88 # black

.travis.yml

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)