Skip to content

Commit

Permalink
Replace pinax-theme-bootstrap with pinax-templates for tests
Browse files Browse the repository at this point in the history
Update pinax-images requirement.
  • Loading branch information
grahamu committed Jan 17, 2018
1 parent 4a26c9c commit 693f364
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,10 @@ Both templates ship already configured to work out of the box.

## Change Log

### 7.0.1

* Replace pinax-theme-bootstrap test dependency with pinax-templates

### 7.0.0

* Add Django 2.0 compatibility testing
Expand Down
3 changes: 1 addition & 2 deletions runtests.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"pinax.images",
"pinax.blog",
"pinax.blog.tests",
"pinax_theme_bootstrap",
"pinax.templates",
],
DATABASES={
"default": {
Expand All @@ -35,7 +35,6 @@
"debug": True,
"context_processors": [
"django.contrib.auth.context_processors.auth",
"pinax_theme_bootstrap.context_processors.theme",
]
}
},
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from setuptools import find_packages, setup

VERSION = "7.0.0"
VERSION = "7.0.1"
LONG_DESCRIPTION = """
.. image:: http://pinaxproject.com/pinax-design/patches/pinax-app.svg
:target: https://pypi.python.org/pypi/pinax-app/
Expand Down Expand Up @@ -97,14 +97,14 @@
install_requires=[
"django>=1.11",
"django-appconf>=1.0.1",
"pinax-images>=3.0.0",
"pinax-images>=3.0.1",
"pytz>=2016.6.1",
"Pillow>=3.0.0",
"Markdown>=2.6.5",
"Pygments>=2.0.2",
],
tests_require=[
"pinax-theme-bootstrap>=7.4.0",
"pinax-templates>=1.0.0",
],
test_suite="runtests.runtests",
zip_safe=False
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=creole,pinax,pytz,pygments,markdown,appconf
known_third_party=appconf,creole,markdown,pinax,pygments,pytz
sections=FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
include_trailing_comma=True
skip_glob=**/*/migrations/*
Expand Down

0 comments on commit 693f364

Please sign in to comment.