Skip to content

Commit

Permalink
Add django>=1.11 to requirements
Browse files Browse the repository at this point in the history
Update django-user-accounts requirement for Django 2.0
Update CI config
Improve documentation markup
  • Loading branch information
grahamu committed Jan 17, 2018
1 parent 258193f commit 9700be2
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 12 deletions.
1 change: 0 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ common: &common
- restore_cache:
keys:
- v2-deps-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}
- v2-deps-
- run:
name: install dependencies
command: pip install --user tox
Expand Down
2 changes: 0 additions & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
include AUTHORS
include LICENSE
include README.md
recursive-include pinax/invitations/static *
recursive-include pinax/invitations/templates *
21 changes: 15 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,9 @@ Django \ Python | 2.7 | 3.4 | 3.5 | 3.6

To install pinax-invitations:

pip install pinax-invitations
```commandline
$ pip install pinax-invitations
```

Add `pinax.invitations` to your `INSTALLED_APPS` setting:

Expand Down Expand Up @@ -197,6 +199,7 @@ Adds invites to all users with 0 invites remaining.
```python
manage.py add_invites 10 # Adds 10 new invites to all users with 0 invites remaining
```

#### infinite_invites

Gives all users unlimited invites.
Expand Down Expand Up @@ -231,7 +234,7 @@ URL: `pinax_invitations:topoff_all`

Returns:

```djangotemplate
```python
{
"inner-fragments": {
".invite-total": amount
Expand All @@ -247,7 +250,7 @@ URL: `pinax_invitations:topoff_user user.pk`

Returns:

```djangotemplate
```python
{
"html": amount
}
Expand All @@ -261,7 +264,7 @@ URL: `pinax_invitations:addto_all`

Returns:

```djangotemplate
```python
{
"inner-fragments": {
".amount-added": amount
Expand All @@ -277,7 +280,7 @@ URL: `pinax_invitations:addto_user user.pk`

Returns:

```djangotemplate
```python
{
"inner-fragments": {
".html": amount
Expand All @@ -296,7 +299,7 @@ URL: `pinax_invitations:invite_stat user.pk`

Returns:

```djangotemplate
```python
{
"html": <rendered pinax/invitations/_invite_stat.html> # provided by site developer
}
Expand All @@ -305,6 +308,12 @@ Returns:

## Change Log

### 6.1.1

* Add django>=1.11 to requirements
* Update CI config
* Improve documentation markup

### 6.1.0

* Standardize documentation layout
Expand Down
5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from setuptools import find_packages, setup

VERSION = "6.1.0"
VERSION = "6.1.1"
LONG_DESCRIPTION = """
.. image:: http://pinaxproject.com/pinax-design/patches/pinax-invitations.svg
:target: https://pypi.python.org/pypi/pinax-invitations/
Expand Down Expand Up @@ -62,8 +62,9 @@
"invitations": []
},
install_requires=[
"django>=1.11",
"django-appconf>=1.0.1",
"django-user-accounts>=1.3",
"django-user-accounts>=2.0.3",
],
test_suite="runtests.runtests",
tests_require=[
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ inline-quotes = double
[isort]
multi_line_output=3
known_django=django
known_third_party=pinax,account,appconf
known_third_party=account,appconf,pinax
sections=FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
include_trailing_comma=True
skip_glob=**/*/migrations/*
Expand Down

0 comments on commit 9700be2

Please sign in to comment.