From 9bd012a1a41baeacf083043462d592fa787b1bf3 Mon Sep 17 00:00:00 2001 From: yomguy Date: Wed, 11 Apr 2012 22:47:06 +0200 Subject: [PATCH] fix setup closes: #1 --- CHANGELOG | 13 +++++++++ LICENSE => License.txt | 0 README.rst | 8 +++--- deefuzzer/__init__.py | 2 +- example/webm_test_video.xml | 12 ++++----- setup.py | 54 ++++++++++++++++++------------------- 6 files changed, 51 insertions(+), 38 deletions(-) rename LICENSE => License.txt (100%) diff --git a/CHANGELOG b/CHANGELOG index d900893..509889d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,16 @@ +deefuzzer (0.6.3-1) unstable; urgency=low + + * setup rewritten + * closes: #1 + +deefuzzer (0.6.2-1) unstable; urgency=low + + * No new functions but bugfixes (including a serious one during install from pypi) + * Definitely moved the project to `GitHub `_ + * Update various README details + * update API doc: http://files.parisson.com/doc/deefuzzer/ + + deefuzzer (0.6.1-1) unstable; urgency=low * new HTTP steamer based on pycurl to handle stream-m servers (webm streaming) diff --git a/LICENSE b/License.txt similarity index 100% rename from LICENSE rename to License.txt diff --git a/README.rst b/README.rst index 606dad5..f2530ad 100644 --- a/README.rst +++ b/README.rst @@ -32,6 +32,8 @@ Because our aim is to get DeeFuzzer as light as possible it is NOT capable of re News ===== +0.6.3 Fix install bug ! + 0.6.2 has been released ! * No new functions but bugfixes (including a serious one during install from pypi) @@ -46,7 +48,7 @@ News * live webm relaying works good, webm playlist reading NEED testing * new parameter ('icecast or 'stream-m') -`Download it `_ +`Download it `_ and enjoy the video streaming ! ;) @@ -197,8 +199,8 @@ YomguY aka Guillaume Pellerin: License ======= -This software is licensed under the terms of the CeCILL license (much like GPLv2) -as described in the file LICENSE in the source directory or online https://github.com/yomguy/DeeFuzzer/blob/master/LICENSE +This software is released under the terms of the CeCILL license (GPLv2 compatible). +as described in the file LICENSE in the source directory or online https://github.com/yomguy/DeeFuzzer/blob/master/License.txt Aknowledgements =============== diff --git a/deefuzzer/__init__.py b/deefuzzer/__init__.py index 129afb1..437480d 100644 --- a/deefuzzer/__init__.py +++ b/deefuzzer/__init__.py @@ -2,4 +2,4 @@ from core import * from station import * from tools import * -__version__ = '0.6.2' +__version__ = '0.6.3' diff --git a/example/webm_test_video.xml b/example/webm_test_video.xml index 3ecce60..3b96979 100644 --- a/example/webm_test_video.xml +++ b/example/webm_test_video.xml @@ -8,18 +8,18 @@ TeleCaster LocalHost TeleCaster local audio streaming http://parisson.com - Audio + Video stream-m - 127.0.0.1 - 8080 + parisson.com + 9000 source2parisson 0 /home/momo/media/webm - mp3 + webm 96 7 44100 @@ -47,11 +47,11 @@ 1 - http://192.168.0.16:9000/ + http://127.0.0.1:9000/ Parisson - 1 + 0 /tmp diff --git a/setup.py b/setup.py index 497ce84..d6d9394 100644 --- a/setup.py +++ b/setup.py @@ -1,40 +1,38 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -'''The setup and build script for the python-twitter library.''' +'''The setup and build script for the library.''' +from setuptools import setup, find_packages import os import deefuzzer -README = os.path.join(os.path.dirname(__file__), 'README.rst') +CLASSIFIERS = ['Programming Language :: Python', + 'Topic :: Internet :: WWW/HTTP :: Dynamic Content', + 'Topic :: Multimedia :: Sound/Audio', + 'Topic :: Multimedia :: Sound/Audio :: Players',] -# The base package metadata to be used by both distutils and setuptools -METADATA = dict( +setup( name = "DeeFuzzer", + url = "http://github.com/yomguy/DeeFuzzer", + description = "an open, light and instant media streaming tool", + long_description = open('README.rst').read(), + author = "Guillaume Pellerin", + author_email = "yomguy@parisson.com", version = deefuzzer.__version__, - py_modules = ['deefuzzer'], - description='an open, light and instant media streaming tool', - author='Guillaume Pellerin', - author_email='yomguy@parisson.com', - license='CeCILL', - url='http://github.com/yomguy/DeeFuzzer', - keywords='media audio video streaming broadcast shout', - install_requires = ['setuptools', 'tinyurl', 'python-shout', 'python-twitter', 'mutagen', 'pyliblo', 'pycurl'], - packages=['deefuzzer', 'deefuzzer.tools'], + install_requires = [ + 'setuptools', + 'tinyurl', + 'python-shout', + 'python-twitter', + 'mutagen', + 'pyliblo', + 'pycurl', + ], + platforms=['OS Independent'], + license='CeCILL v2', + classifiers = CLASSIFIERS, + packages = find_packages(), include_package_data = True, - scripts=['scripts/deefuzzer'], - classifiers = ['Programming Language :: Python', 'Topic :: Internet :: WWW/HTTP :: Dynamic Content', 'Topic :: Multimedia :: Sound/Audio', 'Topic :: Multimedia :: Sound/Audio :: Players',], - long_description=open(README).read(), + zip_safe = False, ) - -def Main(): - # Use setuptools if available, otherwise fallback and use distutils - try: - import setuptools - setuptools.setup(**METADATA) - except ImportError: - import distutils.core - distutils.core.setup(**METADATA) - -if __name__ == '__main__': - Main() -- 2.39.5