Skip to content

Commit

Permalink
drop support for python 2.6
Browse files Browse the repository at this point in the history
  • Loading branch information
cenkalti committed Aug 17, 2013
1 parent 426e833 commit f62755a
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 57 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
language: python
python:
- 2.6
- 2.7
install:
- pip install --use-mirrors -r requirements.txt
Expand Down
10 changes: 1 addition & 9 deletions kuyruk/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,12 @@
__version__ = '0.20.3'
__all__ = ['Kuyruk', 'Task', 'Worker']

try:
# not available in python 2.6
from logging import NullHandler
except ImportError:
class NullHandler(logging.Handler):
def emit(self, record):
pass


logger = logging.getLogger(__name__)


# Add NullHandler to prevent logging warnings on startup
null_handler = NullHandler()
null_handler = logging.NullHandler()
logger.addHandler(null_handler)


Expand Down
30 changes: 0 additions & 30 deletions kuyruk/helpers/total_ordering.py

This file was deleted.

2 changes: 1 addition & 1 deletion kuyruk/manager/server.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import Queue
from pprint import pformat
from functools import total_ordering
from SocketServer import ThreadingTCPServer, BaseRequestHandler

from kuyruk.manager.messaging import message_loop
from kuyruk.helpers.total_ordering import total_ordering


class ManagerServer(ThreadingTCPServer):
Expand Down
23 changes: 7 additions & 16 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,6 @@ def get_version():
raise Exception('Cannot find version')


install_requires = [
'Flask>=0.9',
'pika>=0.9.12, !=0.9.13',
'setproctitle>=1.1.7',
'blinker>=1.2',
'argparse>=1.2.1',
]
try:
# not available in python 2.6
import importlib
except ImportError:
install_requires.append('importlib>=1.0.2, <2')


setup(
name='Kuyruk',
version=get_version(),
Expand All @@ -40,7 +26,13 @@ def get_version():
url='http://github.com/cenkalti/kuyruk',
packages=find_packages(),
include_package_data=True,
install_requires=install_requires,
install_requires=[
'Flask>=0.9',
'pika>=0.9.12, !=0.9.13',
'setproctitle>=1.1.7',
'blinker>=1.2',
'argparse>=1.2.1',
],
description='A distributed task runner',
long_description=read('README.rst'),
zip_safe=True,
Expand All @@ -55,7 +47,6 @@ def get_version():
'License :: OSI Approved :: MIT License',
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Software Development :: Object Brokering',
'Topic :: System :: Distributed Computing',
Expand Down

0 comments on commit f62755a

Please sign in to comment.