Skip to content

Commit

Permalink
Merge branch 'develop' into devel
Browse files Browse the repository at this point in the history
  • Loading branch information
darshanip authored Nov 10, 2022
2 parents 9bb09b1 + 220ce40 commit 16bb4f0
Show file tree
Hide file tree
Showing 69 changed files with 2,875 additions and 5,844 deletions.
27 changes: 27 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -897,6 +897,33 @@
"contributions": [
"code"
]
},
{
"login": "zafar-hussain",
"name": "zafar hussain",
"avatar_url": "https://avatars.githubusercontent.com/u/7498674?v=4",
"profile": "https://www.facebook.com/zafar.hussain2000",
"contributions": [
"doc"
]
},
{
"login": "TimOsahenru",
"name": "Osahenru",
"avatar_url": "https://avatars.githubusercontent.com/u/93861430?v=4",
"profile": "https://github.com/TimOsahenru",
"contributions": [
"code"
]
},
{
"login": "werberger",
"name": "werb",
"avatar_url": "https://avatars.githubusercontent.com/u/106753124?v=4",
"profile": "https://github.com/werberger",
"contributions": [
"bug"
]
}
],
"contributorsPerLine": 7,
Expand Down
7 changes: 0 additions & 7 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,3 @@ repos:
rev: v0.13.1
hooks:
- id: curlylint

- repo: https://github.com/pre-commit/mirrors-mypy
rev: v0.981
hooks:
- id: mypy
args: [--no-strict-optional, --ignore-missing-imports]

15 changes: 8 additions & 7 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,24 +65,25 @@ To develop the project, activate the virtual environment with the following comm
poetry shell
```

### Change into the project directory
### Install pre-commit

Once you have installed the project dependencies and activated the virtual environment, change into the project directory.
We use `pre-commit` to run code-quality checks before every commit. Install `pre-commit` in your local project by running the following command (from within the virtual environment.)

```sh
cd project/
pre-commit install
```

Once you are in the project directory, you can continue the following sections of this guide.

### Install pre-commit
### Change into the project directory

We use `pre-commit` to run code-quality checks before every commit. Install `pre-commit` in your local project by running the following command (from within the virtual environment.)
Once you have installed the project dependencies and activated the virtual environment, change into the project directory.

```sh
pre-commit install
cd project/
```

Once you are in the project directory, you can continue the following sections of this guide.

### Run migrations

To create the (initial) database structure, run migrations as follows:
Expand Down
22 changes: 13 additions & 9 deletions README.md

Large diffs are not rendered by default.

323 changes: 91 additions & 232 deletions poetry.lock

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion project/accounts/admin.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from django.contrib import admin
from .models import User

from .models import Profile, User

# Register your models here.
admin.site.register(Profile)
admin.site.register(User)
Loading

0 comments on commit 16bb4f0

Please sign in to comment.