Skip to content

Introduce pre-commit to simplify contributions #866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 5, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
repos:
- repo: local
hooks:
- id: black
stages: [commit]
name: black
language: system
entry: black
types: [python]
- id: isort
stages: [commit]
name: isort
language: system
entry: isort
types: [python]
- id: flake8
stages: [commit]
name: flake8
language: system
entry: flake8
types: [python]
12 changes: 0 additions & 12 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -142,18 +142,6 @@ Browse to
* http://localhost:8000/openapi for the schema view's OpenAPI specification document.


Running Tests and linting
^^^^^^^^^^^^^^^^^^^^^^^^^

It is recommended to create a virtualenv for testing. Assuming it is already
installed and activated:

::

$ pip install -Ur requirements.txt
$ flake8
$ pytest

-----
Usage
-----
Expand Down
72 changes: 51 additions & 21 deletions docs/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,30 +1,60 @@
Contributing
============
# Contributing

DJA should be easy to contribute to.
Django REST Framework JSON API (aka DJA) should be easy to contribute to.
If anything is unclear about how to contribute,
please submit an issue on GitHub so that we can fix it!

How
---
Before writing any code, have a conversation on a GitHub issue to see
if the proposed change makes sense for the project.

Before writing any code,
have a conversation on a GitHub issue
to see if the proposed change makes sense
for the project.
## Setup development environment

Fork DJA on [GitHub](https://github.com/django-json-api/django-rest-framework-json-api) and
[submit a Pull Request](https://help.github.com/articles/creating-a-pull-request/)
when you're ready.
### Clone

For maintainers
---------------
To start developing on Django REST Framework JSON API you need to first clone the repository:

To upload a release (using version 1.2.3 as the example):
git clone https://github.com/django-json-api/django-rest-framework-json-api.git

```bash
(venv)$ python setup.py sdist bdist_wheel
(venv)$ twine upload dist/*
(venv)$ git tag -a v1.2.3 -m 'Release 1.2.3'
(venv)$ git push --tags
```
### Testing

To run tests clone the repository, and then:

# Setup the virtual environment
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sliverc my point of tox -e devenv is you can turn these several steps into one.

python3 -m venv env
source env/bin/activate
pip install -r requirements.txt

# Format code
black .

# Run linting
flake8

# Run tests
pytest

### Running against multiple environments

You can also use the excellent [tox](https://tox.readthedocs.io/en/latest/) testing tool to run the tests against all supported versions of Python and Django. Install `tox` globally, and then simply run:

tox


### Setup pre-commit

pre-commit hooks is an additional option to check linting and formatting of code independent of
an editor before you commit your changes with git.

To setup pre-commit hooks first create a testing environment as explained above before running below commands:

pip install pre-commit
pre-commit install

## For maintainers

To upload a release (using version 1.2.3 as the example) first setup testing environment as above before running below commands:

python setup.py sdist bdist_wheel
twine upload dist/*
git tag -a v1.2.3 -m 'Release 1.2.3'
git push --tags