Skip to content
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
4 changes: 3 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ atomic = true
multi_line_output = 5
line_length = 79
combine_as_imports = true
skip = wsgi.py,docs
skip = wsgi.py,docs,.tox,env
known_first_party = stdimage,tests
known_third_party = django


[*.{rst,ini}]
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ django_stdimage.egg-info
build/
dist/
.idea/
.tox/


.cache/
Expand Down
23 changes: 23 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Contributing Guide [![badge](https://img.shields.io/badge/Django-CC-ee66dd.svg)][django-cc]
This project follows the **[Django Contributing Commons][django-cc]**.

## Getting started
Getting started is simple, just do:
```bash
pip install dcc
dcc django-stdimage
hub checkout -b patch-1
```

To test locally simply run:
```bash
tox
```

After that just write your code. Once you are done, just follow this easy flow:
```bash
hub commit
hub pull-request -b codingjoe
```

[django-cc]: https://github.com/codingjoe/django-cc/blob/master/CONTRIBUTING.md
20 changes: 6 additions & 14 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
:alt: Join the chat at https://gitter.im/codingjoe/django-stdimage
:target: https://gitter.im/codingjoe/django-stdimage?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge

.. image:: https://img.shields.io/badge/Django-CC-ee66dd.svg
:alt: Django-CC
:target: https://github.com/codingjoe/django-cc

Django Standarized Image Field
==============================

Expand Down Expand Up @@ -236,17 +240,5 @@ Multi processing
for that matter all multiprocessing is disabled in PyPy.


Contributing
============

Getting started is easy. After setting up your env, just install:

.. code::

pip install -r requirements-dev.txt; pre-commit install

To make contributing even easier, make sure your editor's or IDE's [EditorConfig] support is enabled.

Testing
-------
To run the tests simply run ``python setup.py test``
`Contributing <CONTRIBUTING.md>`_
=================================
5 changes: 3 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ max-line-length = 79
max-complexity = 10
statistics = true
show-source = true
exclude = */migrations/*,docs/*,env/*,venv/*
exclude = */migrations/*,docs/*,env/*,venv/*,.tox/*

[pep257]
ignore = D100,D101,D102,D103,D104,D105,D203
Expand All @@ -21,6 +21,7 @@ omit =
*/migrations/*
*/tests/*
*/test_*.py
.tox

[coverage:report]
ignore_errors = True
Expand All @@ -31,6 +32,6 @@ atomic = true
multi_line_output = 5
line_length = 79
combine_as_imports = true
skip = wsgi.py,docs,tests/test_models.py
skip = wsgi.py,docs,tests/test_models.py,.tox,env
known_first_party = stdimage,tests
known_third_party = django
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
description='Django Standarized Image Field',
author='codingjoe',
url='https://github.com/codingjoe/django-stdimage',
download_url='https://github.com/codingjoe/django-stdimage',
author_email='info@johanneshoppe.com',
license='MIT',
classifiers=[
Expand Down
22 changes: 22 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
[tox]
envlist = py{27,34,35}-django{18,19,master},qa
[testenv]
deps=
-rrequirements-dev.txt
django18: Django>=1.8,<1.9
django19: Django>=1.9,<1.10
djangomaster: -egit+https://github.com/django/django.git@master#egg=Django
commands=
py.test \
--basetemp={envtmpdir} \
--ignore=.tox \
{posargs}

[testenv:qa]
changedir={toxinidir}
deps=
-rrequirements-dev.txt
commands=
isort --check-only --recursive --diff {posargs}
flake8 --jobs=2 {posargs}
pep257 --verbose --explain --source --count {posargs}