Commits

Stefan Scherfke committed 5be483f

Various changes in preparation for an actual release.

  • Participants
  • Parent commits bef1957

Comments (0)

Files changed (8)

 *~
 .DS_Store
 .ropeproject/*
-_build/*
+build/*
 dist/*
 MANIFEST
 *.egg-info/*
-The primary author of django-weblog is Stefan Scherfke, who may be found online 
+
+Authors
+=======
+
+The primary author of django-weblog is Stefan Scherfke, who may be found online
 at http://stefan.sofa-rockers.org/.
 Changelog for django-lastfm
 ===========================
 
+v0.2 – 2013-xx-xx:
+------------------
+
+- [CHANGE] A lot of various changes that accumulated over time.
+
+
 v0.1 – 2010-05-02:
 ------------------
 
-Copyright (c) 2009, Stefan Scherfke
-All rights reserved.
+The MIT License (MIT)
 
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
+Copyright (c) 2009 Stefan Scherfke (also see AUTHORS.txt)
 
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
 
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-    * Neither the name of the <ORGANIZATION> nor the names of its contributors
-      may be used to endorse or promote products derived from this software
-      without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 This app is tested with Django 1.1. It might also work with older versions, but
 I haven’t tested it.
 
-If you want to run the tests, you’ll need to install `Mock 
+If you want to run the tests, you’ll need to install `Mock
 <http://www.voidspace.org.uk/python/mock/>`_.
 
 There are no other requirements.
 file (e.g. ``cd ~/Downloads/django-weblog``). Then execute::
 
     python setup.py install
-    
+
 If you checked out the repository and always want to use the newest version,
 type::
 
     pip install -e path/to/django-weblog
-    
+
 
 Usage
 -----
+[wheel]
+universal = 1
-#! /usr/bin/env python
-# encoding: utf-8
-
-from distutils.core import setup
-
-
-class UltraMagicString(object):
-    # Catch-22:
-    # - if I return Unicode, python setup.py --long-description as well
-    #   as python setup.py upload fail with a UnicodeEncodeError
-    # - if I return UTF-8 string, python setup.py sdist register
-    #   fails with an UnicodeDecodeError
-
-    def __init__(self, value):
-        self.value = value
-
-    def __str__(self):
-        return self.value
-
-    def __unicode__(self):
-        return self.value.decode('UTF-8')
-
-    def __add__(self, other):
-        return UltraMagicString(self.value + str(other))
-
-    def split(self, *args, **kw):
-        return self.value.split(*args, **kw)
+from setuptools import setup, find_packages
 
 
 setup(
     name='django-weblog',
-    version='0.1',
+    version='0.2',
     author='Stefan Scherfke',
     author_email='stefan at sofa-rockers.org',
     description='A Django weblog app with hierarchic categories.',
-    long_description=UltraMagicString(open('README.txt').read()),
-    url='http://stefan.sofa-rockers.org/django-weblog/',
-    download_url='http://bitbucket.org/scherfke/django-weblog/downloads/',
-    license='BSD',
-    packages=[
-        'weblog',
-        'weblog.templatetags',
+    long_description=(open('README.txt').read() + '\n\n' +
+                      open('CHANGES.txt').read() + '\n\n' +
+                      open('AUTHORS.txt').read()),
+    url='https://bitbucket.org/ssc/django-weblog',
+    license='MIT',
+    install_requires=[
+        'Django>=1.4',
+        'django-haystack>=2.1',
     ],
-    package_data={
-        'weblog': [
-            'templates/comments/*',
-            'templates/weblog/*',
-        ],
-    },
+    packages=find_packages(exclude=['*.tests', '*.tests.*', 'tests.*']),
+    include_package_data=True,
     classifiers=[
         'Development Status :: 4 - Beta',
+        'Intended Audience :: Developers',
+        'Natural Language :: English',
+        'License :: OSI Approved :: MIT License',
+        'Operating System :: OS Independent',
         'Environment :: Web Environment',
         'Framework :: Django',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: BSD License',
-        'Operating System :: OS Independent',
         'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
         'Topic :: Software Development :: Libraries :: Python Modules',
         'Topic :: Utilities',
     ],

weblog/__init__.py

+__version__ = '0.2'