Merge pull request #17 from sananth12/travis-branch

Travis branch

.travis.yml

@@ -1,10 +1,15 @@
 language: python
 python:
+  - "2.6"
   - "2.7"
+# command to install dependencies
+#install: pip install -r requirements.txt --use-mirrors
 install:
-  - "pip install ImageScraper"
-  - "pip install coveralls --use-mirrors"
-script: "coverage run --source=image_scraper setup.py test"
-after_success: "coveralls"
+  - pip install ImageScraper
+# command to run tests
+script:
+  - nosetests
+#after_success:
+#  coveralls
 notifications:
   email: false

setup.py

@@ -1,8 +1,11 @@
 
-from setuptools import setup
+try:
+        from setuptools import setup
+except ImportError:
+        from distutils.core import setup
 
 setup(name='ImageScraper',
-      version='2.0.5',
+    version='2.0.5',
     install_requires=['lxml', 'requests'],
     author='Anantha Natarajan S',
     author_email='sananthanatarajan12@gmail.com',
@@ -21,6 +24,6 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',
-        'Topic :: Utilities',
+        'Topic :: Utilities'
     ],  
  )