From 4314d1eb7d03a347bd200432d1441dabc0f91e72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Peignier?= Date: Sun, 21 Jan 2018 17:13:38 -0800 Subject: [PATCH] Fix packaging --- HISTORY.rst | 5 +++++ LICENSE | 2 +- docs/conf.py | 2 +- setup.cfg | 2 ++ setup.py | 8 ++------ 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 874bb07a..7e8ded33 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -3,6 +3,11 @@ History ======= +1.6.14 +====== + +* Fix packaging issues. + 1.6.13 ====== diff --git a/LICENSE b/LICENSE index 351fb9fb..5a2b550a 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ Copyright (©) 2008 Andreas Pelme -Copyright (©) 2011-2014 Timothée Peignier +Copyright (©) 2011-2018 Timothée Peignier Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/docs/conf.py b/docs/conf.py index 58b73d58..435e647c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -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. diff --git a/setup.cfg b/setup.cfg index 8951ea8e..44d9e374 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,3 +1,5 @@ [wheel] universal = 1 +[metadata] +license_file = LICENSE diff --git a/setup.py b/setup.py index 817e7ea1..14dbd9c4 100644 --- a/setup.py +++ b/setup.py @@ -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(), @@ -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'),