From d3bb49f707481362d5b67c1ae8c5d915b20489a1 Mon Sep 17 00:00:00 2001 From: Lakshmi Narasimhan Date: Fri, 6 Nov 2015 10:05:31 +0530 Subject: [PATCH] Prep for 0.8.9 release. - Update changelog - Relax dependency version requirements - Update readme - Read setup.py requirements from requirements text files --- CHANGELOG.rst | 42 ++++++++++++++++++++++++++++++++++++++++++ MANIFEST.in | 3 +++ README.rst | 33 +++++++++++++++++++++++---------- dev-only.txt | 8 ++++++++ dev-req.txt | 9 +-------- hyde/version.py | 2 +- requirements.txt | 18 +++++++++--------- setup.py | 40 +++++++++++++++++----------------------- 8 files changed, 104 insertions(+), 51 deletions(-) create mode 100644 dev-only.txt diff --git a/CHANGELOG.rst b/CHANGELOG.rst index ff49777..5372cd0 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,3 +1,45 @@ +Version 0.8.9 (2015-11-06) +=========================================================== + +* Add mailing list and IRC channel information to README. + +Thanks to @jonafato: + +* Update command and fswrap dependencies. +* Use setuptools directly. +* Improve travis builds with caching and preventing duplicate builds. + +Thanks to @bheesham: + +* Bugfix: Fix favicon and apple touch icon paths in basic template. + +Thanks to @jd: + +* Bugfix: Paginator fails when there is no meta variable. +* Add tox support. +* Fix setup.py and make it pep8 compliant. +* Add pages list to resources in paginator plugin. + +Thanks to @mtahmed: + +* Bugfix: Ensure that `self.q` is assigned to None when PyQuery is unavilable. + +Thanks to @ftao: + +* Bugfix: Remove typo in sphinx plugin commando import. + +Thanks to Alexey Biryukov: + +* Hyde now supports assigning jinja2 custom tests similar to custom filters in site.yaml. + +Thanks to @llonchj: + +* Huge updates to unit tests, development dependencies (flake8, pep8 etc). +* Travis support. +* The ``h`` binary is now deprecated and will be removed in one of the future releases. +* libsass support. + + Version 0.8.8 (2013-08-20) =========================================================== diff --git a/MANIFEST.in b/MANIFEST.in index bf65ea9..827e862 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -4,6 +4,9 @@ include LICENSE include README.rst include AUTHORS.rst include CHANGELOG.rst +include requirements.txt +include dev-req.txt +include dev-only.txt recursive-include hyde *.py recursive-include hyde/tests *.py recursive-include hyde/layouts *.* diff --git a/README.rst b/README.rst index c2f60e4..d37b436 100644 --- a/README.rst +++ b/README.rst @@ -1,12 +1,9 @@ -Version 0.8.9a +Version 0.8.9 .. image:: https://travis-ci.org/hyde/hyde.svg?branch=master -A brand new **hyde** -==================== - -This is the new version of `hyde`_ under active development. -`Hyde documentation`_ is a work in progress. +Overview +======== `Hyde starter kit`_ by `merlinrebrovic`_ is a really nice way to get started with hyde. @@ -16,6 +13,16 @@ like Twitter's `bootstrap framework`_. You can also take a look at `Hyde Powered Websites`_ for inspiration and reference. +Currently hyde is only supported on python 2.7.x. Python 3.x support is in +progress, thanks to `jonafato`_. + +Active development of hyde had stalled for some time, but thanks to `llonchj`_ +and `jonafato`_ there is now a slow but steady progress towards 1.0. + +Mailing List: `hyde-dev`_ on google groups. +IRC: #hyde on freenode + + Installation ------------ @@ -128,9 +135,11 @@ command once PyFS is installed: Examples -------- -1. `Hyde Documentation Source`_ -2. `Cloudpanic`_ -3. `Ringce`_ +1. `julien.danjou.info`_ +2. `luffy.cx`_ +3. `Cloudpanic`_ +4. `Hyde Documentation Source`_ + A brief list of features -------------------------- @@ -157,7 +166,6 @@ Links .. _Hyde documentation: http://hyde.github.com .. _Hyde Documentation Source: https://github.com/hyde/docs .. _Cloudpanic: https://github.com/tipiirai/cloudpanic -.. _Ringce: https://github.com/lakshmivyas/ringce/tree/v3.0 .. _Authors: https://github.com/hyde/hyde/graphs/contributors .. _Changelog: https://github.com/hyde/hyde/blob/master/CHANGELOG.rst .. _Hyde starter kit: http://merlin.rebrovic.net/hyde-starter-kit/about.html @@ -168,3 +176,8 @@ Links .. _auzigog: https://github.com/auzigog .. _bootstrap framework: http://twitter.github.com/bootstrap/ .. _Hyde Powered Websites: https://github.com/hyde/hyde/wiki/Hyde-Powered +.. _hyde-dev: https://groups.google.com/forum/#!forum/hyde-dev +.. _julien.danjou.info: https://github.com/jd/julien.danjou.info +.. _luffy.cx: https://github.com/vincentbernat/www.luffy.cx +.. _jonafato: https://github.com/jonafato +.. _llonchj: https://github.com/llonchj diff --git a/dev-only.txt b/dev-only.txt new file mode 100644 index 0000000..082d587 --- /dev/null +++ b/dev-only.txt @@ -0,0 +1,8 @@ +pyquery>=1.2.9, <2.0 +docutils>=0.12, <1.0 +mock>=1.0.1, <2.0 +nose>=1.3.6, <2.0 +Pillow>=2.7.0, <3.0 +pyScss>=1.3.4, <2.0 +libsass>=0.8.2, <1.0 +flake8>=2.4.1, <3.0 diff --git a/dev-req.txt b/dev-req.txt index 9c8dbd3..3d27d99 100644 --- a/dev-req.txt +++ b/dev-req.txt @@ -1,9 +1,2 @@ -r requirements.txt -pyquery==1.2.9 -docutils==0.12 -mock==1.0.1 -nose==1.3.6 -Pillow==2.7.0 -pyScss==1.3.4 -libsass==0.8.2 -flake8==2.4.1 \ No newline at end of file +-r dev-only.txt diff --git a/hyde/version.py b/hyde/version.py index 036fe51..c5c8592 100644 --- a/hyde/version.py +++ b/hyde/version.py @@ -2,4 +2,4 @@ """ Handles hyde version. """ -__version__ = '0.8.9a' +__version__ = '0.8.9' diff --git a/requirements.txt b/requirements.txt index ddbac12..29601b5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,9 @@ -fswrap==1.0.0 -commando==1.0.0 -PyYAML==3.11 -Markdown==2.6.2 -MarkupSafe==0.23 -Pygments==2.0.2 -typogrify==2.0.7 -smartypants==1.8.6 -Jinja2==2.7.3 +fswrap>=1.0.0, <2.0 +commando>=1.0.0, <2.0 +PyYAML>=3.11, <4.0 +Markdown>=2.6.2, <3.0 +MarkupSafe>=0.23, <1.0 +Pygments>=2.0.2, <3.0 +typogrify>=2.0.7, <3.0 +smartypants>=1.8.6, <2.0 +Jinja2>=2.7.3, <3.0 diff --git a/setup.py b/setup.py index 63c169f..f2fc207 100644 --- a/setup.py +++ b/setup.py @@ -107,35 +107,29 @@ def find_package_data( ############################################################################## + +def read_requirements(f): + reqs = [] + with open(f, "r") as h: + reqs = [req.split('#', 1)[0].strip() for req in h] + reqs = [req for req in reqs if req] + return reqs + + +install_requires = read_requirements('requirements.txt') +dev_requires = read_requirements('dev-only.txt') + setup(name=PROJECT, version=__version__, description='hyde is a static website generator', long_description=long_description, - author='Lakshmi Vyas', - author_email='lakshmi.vyas@gmail.com', - url='http://hyde.github.com', + author='hyde developers', + author_email='hyde-dev@googlegroups.com', + url='http://hyde.github.io', packages=find_packages(), requires=['python (>= 2.7)'], - install_requires=( - 'fswrap==1.0.0', - 'commando==1.0.0', - 'PyYAML==3.11', - 'Markdown==2.6.2', - 'MarkupSafe==0.23', - 'Pygments==2.0.2', - 'typogrify==2.0.7', - 'smartypants==1.8.6', - 'Jinja2==2.7.3' - ), - tests_require=( - 'nose==1.3.6', - 'mock==1.0.1', - 'pyquery==1.2.9', - 'docutils==0.12', - 'Pillow==2.7.0', - 'pyScss==1.3.4', - 'flake8==2.4.1' - ), + install_requires=install_requires, + tests_require=dev_requires, test_suite='nose.collector', include_package_data=True, # Scan the input for package information