Skip to content

Commit

Permalink
Merge pull request #23 from pinax/release-cleanup
Browse files Browse the repository at this point in the history
Cleanup prep for distribution release
  • Loading branch information
grahamu authored Jan 16, 2018
2 parents 599f722 + ebca187 commit 629e3a0
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
lint:
<<: *common
docker:
- image: circleci/python:3.6.1
- image: circleci/python:3.6
environment:
- TOXENV=checkqa
- UPLOAD_COVERAGE=0
Expand Down
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,13 @@ PINAX_IMAGES_THUMBNAIL_SPEC = "{{my_app}}.specs.MyCustomImageThumbnail"

## Change Log

### 3.0.1

* Standardize documentation, badges
* Remove django-appconf from setup.py `install_requires`
* Add third-party libs for isort-ing
* Add trove classifiers

### 3.0.0

* Add Django 2.0 compatibility testing
Expand Down
20 changes: 16 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from setuptools import find_packages, setup

VERSION = "3.0.0"
VERSION = "3.0.1"
LONG_DESCRIPTION = """
.. image:: http://pinaxproject.com/pinax-design/patches/pinax-images.svg
:target: https://pypi.python.org/pypi/pinax-images/
Expand All @@ -11,8 +11,9 @@
.. image:: https://img.shields.io/pypi/v/pinax-images.svg
:target: https://pypi.python.org/pypi/pinax-images/
.. image:: https://img.shields.io/badge/license-MIT-blue.svg
:target: https://pypi.python.org/pypi/pinax-images/
\
.. image:: https://img.shields.io/circleci/project/github/pinax/pinax-images.svg
:target: https://circleci.com/gh/pinax/pinax-images
.. image:: https://img.shields.io/codecov/c/github/pinax/pinax-images.svg
Expand All @@ -23,8 +24,16 @@
:target: https://github.com/pinax/pinax-images/pulls
.. image:: https://img.shields.io/github/issues-pr-closed/pinax/pinax-images.svg
:target: https://github.com/pinax/pinax-images/pulls?q=is%3Apr+is%3Aclosed
\
.. image:: http://slack.pinaxproject.com/badge.svg
:target: http://slack.pinaxproject.com/
.. image:: https://img.shields.io/badge/license-MIT-blue.svg
:target: https://pypi.python.org/pypi/pinax-images/
\
``pinax-images`` is a Django app for managing collections of images associated with a content object.
Expand Down Expand Up @@ -65,12 +74,15 @@
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 2",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Topic :: Software Development :: Libraries :: Python Modules",
],
install_requires=[
"django>=1.11",
"django-appconf>=1.0.1",
"django-imagekit>=3.2.7",
"pilkit>=1.1.13",
"pillow>=3.3.0",
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
known_third_party=account,imagekit,pilkit,pinax,pytz
sections=FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
skip_glob=**/*/migrations/*

Expand Down

0 comments on commit 629e3a0

Please sign in to comment.