diff --git a/build-requirements.txt b/build-requirements.txt index aab6943b..71149866 100644 --- a/build-requirements.txt +++ b/build-requirements.txt @@ -1,3 +1,4 @@ pip wheel setuptools +twine diff --git a/colourettu/__init__.py b/colourettu/__init__.py index 1b8f16bb..ba889de1 100644 --- a/colourettu/__init__.py +++ b/colourettu/__init__.py @@ -11,4 +11,4 @@ from ._palette import palette -__version__ = '1.1.0-a2' +__version__ = '1.1.0' diff --git a/docs/changelog.rst b/docs/changelog.rst index 4d49ed44..b1799a51 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -3,6 +3,7 @@ Changelog .. currentmodule:: colourettu +- :release:`1.1.0 <2015-07-20>` - :support:`5` add project logo - :feature:`8` allow addition of palettes, and palettes and colours - :support:`-` manage changelog with `Releases `_ diff --git a/make_release.py b/make_release.py index f5f831eb..620cebdc 100644 --- a/make_release.py +++ b/make_release.py @@ -12,7 +12,7 @@ print(' cd ..') print('Build distribution') print(' python -m pip install pip -U') -print(' pip install setuptools twine -U') +print(' pip install setuptools wheel twine -U') print(' python setup.py sdist bdist_egg bdist_wheel') print('Test distribution') # see https://hynek.me/articles/sharing-your-labor-of-love-pypi-quick-and-dirty/ diff --git a/readme.rst b/readme.rst index 80d3c085..ed01ac63 100644 --- a/readme.rst +++ b/readme.rst @@ -32,7 +32,12 @@ Installation Documentation ------------- -Full documentation is at http://minchin.ca/colourettu/ +Full documentation is available at http://minchin.ca/colourettu/ + +Changelog +--------- + +Full changelog is available at http://minchin.ca/colourettu/changelog.html Links ----- diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 00000000..def50325 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,7 @@ +[zest.releaser] +python-file-with-version = colourettu/__init__.py +create-wheel = yes +extra-message = [ci skip] + +[wheel] +universal = 1 diff --git a/setup.py b/setup.py index 1f163a2f..62c0fef6 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ def find_version(*file_paths): raise RuntimeError("Unable to find version string.") -long_description = read('readme.rst') + '\n' + read('changes.rst') +long_description = read('readme.rst') setup( @@ -29,13 +29,13 @@ def find_version(*file_paths): url='http://github.com/minchinweb/colourettu', license='MIT License', author='William Minchin', - install_requires=['', + install_requires=['Pillow', ], author_email='w_minchin@hotmail.com', description='Colour related functions', long_description=long_description, packages=['colourettu'], - package_data={'': ['readme.rst', 'changes.rst', 'LICENSE']}, + package_data={'': ['readme.rst', 'LICENSE']}, include_package_data=True, platforms='any', classifiers=[