Drop lettuce, up req versions

kmmbvnr · Feb 14, 2014 · c648205 · c648205
1 parent 625eb6c
commit c648205
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 118 deletions.
diff --git a/README.rst b/README.rst
@@ -27,7 +27,6 @@ Latest git version::
 Installation for Python 3::
 
     Works out of the box
-    Note that lettuce itself is not yet ported to python 3
 
 
 Usage
@@ -159,13 +158,6 @@ Here is the list of tasks prebuild with django-jenkins
 .. _django-extensions: http://pypi.python.org/pypi/django-extensions
 .. _pygraphviz: http://pypi.python.org/pypi/pygraphviz/
 
-- ``django_jenkins.tasks.lettuce_tests``
-
-  Discover Lettuce tests from app/feature directories.
-
-  You should have the Lettuce_ Python package installed to run this task.
-
-.. _Lettuce: http://lettuce.it/
 
 - ``django_jenkins.tasks.with_local_celery``
 
@@ -188,6 +180,7 @@ Changelog
 GIT Version
 ~~~~~~~~~~~
 * django_tests and dir_tests test dicovery tasks are replaced by directory discover test runner build-in in django 1.6
+* removed unmaintained lettuce support
 
 0.14.1 2013-08-15
 ~~~~~~~~~~~~~~~~~

diff --git a/django_jenkins/management/commands/jtest.py b/django_jenkins/management/commands/jtest.py
@@ -30,9 +30,6 @@ def get_task_list(self):
 
         tasks = []
 
-        if 'django_jenkins.tasks.lettuce_tests' in enabled_tasks:
-            tasks.append('django_jenkins.tasks.lettuce_tests')
-
         if 'django_jenkins.tasks.with_local_celery' in enabled_tasks:
             tasks.append('django_jenkins.tasks.with_local_celery')
 

diff --git a/django_jenkins/management/commands/lettuce.py b/django_jenkins/management/commands/lettuce.py
diff --git a/django_jenkins/tasks/lettuce_tests.py b/django_jenkins/tasks/lettuce_tests.py
diff --git a/requirements.txt b/requirements.txt
@@ -1,10 +1,9 @@
-django==1.5.4
+django==1.6.2
 django-discover-runner==1.0
-pylint==1.0.0
-coverage==3.7
+pylint==1.1.0
+coverage==3.7.1
 pyflakes==0.7.3
 pep8==1.4.6
-lettuce==0.2.19
-selenium==2.35.0
+selenium==2.39.0
 flake8==2.0
 behave==1.2.3
diff --git a/setup.py b/setup.py
@@ -10,19 +10,19 @@
 
 
 setup(
-    name = 'django-jenkins',
-    version = '0.14.1',
-    author = 'Mikhail Podgurskiy',
-    author_email = 'kmmbvnr@gmail.com',
-    description = 'Plug and play continuous integration with django and jenkins',
+    name='django-jenkins',
+    version='0.15.0',
+    author='Mikhail Podgurskiy',
+    author_email='kmmbvnr@gmail.com',
+    description='Plug and play continuous integration with django and jenkins',
     long_description=read(path.abspath(path.join(path.dirname(__file__), 'README.rst'))),
-    license = 'LGPL',
-    platforms = ['Any'],
-    keywords = ['pyunit', 'unittest', 'testrunner', 'hudson', 'jenkins', 
-                'django', 'pylint', 'pep8', 'pyflakes', 'csslint', 'jshint',
-                'coverage'],
-    url = 'http://github.com/kmmbvnr/django-jenkins',
-    classifiers = [
+    license='LGPL',
+    platforms=['Any'],
+    keywords=['pyunit', 'unittest', 'testrunner', 'hudson', 'jenkins',
+              'django', 'pylint', 'pep8', 'pyflakes', 'csslint', 'jshint',
+              'coverage'],
+    url='http://github.com/kmmbvnr/django-jenkins',
+    classifiers=[
         'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)',
@@ -34,12 +34,13 @@
         'Topic :: Software Development :: Testing'
     ],
     install_requires=[
-        'Django>=1.4',
-        'coverage>=3.6',
+        'Django>=1.6',
+        'coverage>=3.7',
         'pylint>=1.0',
     ],
-    packages = ['django_jenkins', 'django_jenkins.management', 'django_jenkins.tasks', 'django_jenkins.management.commands'],
+    packages=['django_jenkins', 'django_jenkins.management',
+              'django_jenkins.tasks', 'django_jenkins.management.commands'],
     package_data={'django_jenkins': ['tasks/pylint.rc']},
-    zip_safe = False,
-    include_package_data = True
+    zip_safe=False,
+    include_package_data=True
 )
diff --git a/tests/settings.py b/tests/settings.py
@@ -43,11 +43,6 @@
 )
 
 
-# not ported to python 3 libs
-if sys.version_info[0] < 3:
-    JENKINS_TASKS += ('django_jenkins.tasks.lettuce_tests',)
-
-
 # bug in python3 version
 if sys.version_info[0] < 3:
     JENKINS_TASKS += ('django_jenkins.tasks.run_pylint',)

diff --git a/tests/test_app/urls.py b/tests/test_app/urls.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 from django.views.generic.base import TemplateView
 
-urlpatterns = patterns('',
+urlpatterns = patterns('',  # NOQA
      url(r'^test_click/$', TemplateView.as_view(template_name='test_app/wm_test_click.html'), name='wm_test_click')
 )
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26, py27, py33, beta
+envlist = py27, py33, beta
 
 [testenv]
 usedevelop = True
@@ -10,7 +10,7 @@ deps = -r{toxinidir}/requirements.txt
 
 [testenv:beta]
 basepython = python3.3
-deps = https://github.com/django/django/archive/1.6b4.zip
+deps = https://github.com/django/django/archive/1.7a2.zip
        pylint
        coverage
        pyflakes