Skip to content

Commit

Permalink
Fix packaging
Browse files Browse the repository at this point in the history
  • Loading branch information
cyberdelia committed Jan 22, 2018
1 parent 72c1b67 commit 4314d1e
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 8 deletions.
5 changes: 5 additions & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
History
=======

1.6.14
======

* Fix packaging issues.

1.6.13
======

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Copyright (©) 2008 Andreas Pelme <[email protected]>
Copyright (©) 2011-2014 Timothée Peignier <[email protected]>
Copyright (©) 2011-2018 Timothée Peignier <[email protected]>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
# The short X.Y version.
version = '1.6'
# The full version, including alpha/beta/rc tags.
release = '1.6.13'
release = '1.6.14'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 2 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
[wheel]
universal = 1

[metadata]
license_file = LICENSE
8 changes: 2 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,9 @@
from setuptools import setup, find_packages
import sys

install_requires = []
if (sys.version_info[0], sys.version_info[1]) < (3, 2):
install_requires.append('futures>=2.1.3')

setup(
name='django-pipeline',
version='1.6.13',
version='1.6.14',
description='Pipeline is an asset packaging library for Django.',
long_description=io.open('README.rst', encoding='utf-8').read() + '\n\n' +
io.open('HISTORY.rst', encoding='utf-8').read(),
Expand All @@ -20,7 +16,7 @@
license='MIT',
packages=find_packages(exclude=['tests', 'tests.tests']),
zip_safe=False,
install_requires=install_requires,
extras_require={ ':python_version<"3"': ['futures>=2.1.3'] },
include_package_data=True,
keywords=('django pipeline asset compiling concatenation compression'
' packaging'),
Expand Down

0 comments on commit 4314d1e

Please sign in to comment.