Merge pull request #2 from nick13jaremek/master

Fixed requirements and TravisCI build due to errors.
reclamador · Nov 10, 2017 · ecbf573 · ecbf573
2 parents c426350 + 10317f1
commit ecbf573
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 42 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,17 +4,14 @@ deploy:
     python: 2.7
     repo: reclamador/pylleida
     tags: true
-  distributions: sdist bdist_wheel
   password:
     secure: TXenmQjBn5HHpWZaKwoAuMaJSBHNP7aa+1i2kg8kJ+DxrF6AZm5nCxDW2MCPWFu5WtQQoEEBsIFxR6ZwMphjitrsGobQpz1ecJVmlPWvWljyHtm+7WA96Nfj+eOQr+ekj+Pc6a+1vgRv0u4/SI7qqOlAhM8kEidfxwkx0haKOAlad1U4AgB3qfK0MGpyWiJayoNDrUF6JZs9pWh6iK/jcGwpmgH7zsmO29IJ2FuRgxmTQpFQTqjV0X0VCIKKBHERgYO4105X7UmxxR5LB4FHk8GOhvN02iOHfyLborgRL0RUXxfF/CETi5GnF6X5SXe1AwcrnqRlyAdI7MYQDh5dWwJKFIRQNh6jukzw2oLQbVL7Rf/K+qq3NBMyF+Xpsa30/EIMbiYeMtrnwRK6och5MlOjqkRyUuw3Y5oI0gQokNAE0SCGJXg+5LbvcjlEpbEJCRp3JQFc/JD5WNROd1pvPuwJ030s750AIc6upcDyD3IR+r4G4jDtFkz4KuvjChJrJx3tSKSKwXA++f3+wMAQOAcNAd5cINYAL+2WOWtXAwOB7E863uSlY/aIOlnHtcZcwFqmhvpj/C/OPJ/UXFXBJC5TQtDBugx7QUvOHptJ3WHJpKh7BmlpBgCNmZW6Q6wSF03ZsNZvzQwx4+i95xZvAyG1E04goWaUI60zkFrSYEg=
   provider: pypi
   user: nick13jaremek
-install: pip install -U tox-travis
+install:
+    - pip install -r requirements_dev.txt
+    - pip install -r requirements.txt
 language: python
 python:
-- 3.5
-- 3.4
-- 3.3
 - 2.7
-- 2.6
 script: tox
diff --git a/pylleida/__init__.py b/pylleida/__init__.py
@@ -4,7 +4,7 @@
 
 __author__ = """NickM. Jaremek"""
 __email__ = 'nick13jaremek@gmail.com'
-__version__ = '0.2.0'
+__version__ = '0.2.1'
 
 from pylleida.api.mail_cert import MailCertApi
 

diff --git a/pylleida/api/__init__.py b/pylleida/api/__init__.py
@@ -68,4 +68,3 @@ def _update_attributes(self, obj, data):
                 setattr(obj, formatted_key, new_obj)
             else:
                 setattr(obj, formatted_key, value)
-
diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,3 @@
 Jinja2==2.9.5
 xmltodict==0.10.2
+requests==2.18.4
diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.2.0
+current_version = 0.2.1
 commit = True
 tag = True
 

diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 
 """The setup script."""
 
-from setuptools import setup, find_packages
+from setuptools import setup
 
 with open('README.rst') as readme_file:
     readme = readme_file.read()
@@ -12,32 +12,27 @@
     history = history_file.read()
 
 requirements = [
-    'Click>=6.0',
-    # TODO: put package requirements here
-]
+    'Jinja2==2.9.5',
+    'xmltodict==0.10.2',
+    'requests==2.18.4'
 
-setup_requirements = [
-    # TODO(nick13jaremek): put setup requirements (distutils extensions, etc.) here
 ]
 
-test_requirements = [
-    # TODO: put package test requirements here
-]
+setup_requirements = []
+
+test_requirements = []
 
 setup(
     name='pylleida',
-    version='0.2.0',
+    version='0.2.1',
     description="A HTTP Python client to use the Lleida.net API",
     long_description=readme + '\n\n' + history,
     author="Nick M. Jaremek",
     author_email='nick13jaremek@gmail.com',
-    url='https://github.com/nick13jaremek/pylleida',
-    packages=find_packages(include=['pylleida']),
-    entry_points={
-        'console_scripts': [
-            'pylleida=pylleida.cli:main'
-        ]
-    },
+    url='https://github.com/reclamador/pylleida',
+    packages=[
+        'pylleida'
+    ],
     include_package_data=True,
     install_requires=requirements,
     license="MIT license",
@@ -49,12 +44,7 @@
         'License :: OSI Approved :: MIT License',
         'Natural Language :: English',
         "Programming Language :: Python :: 2",
-        'Programming Language :: Python :: 2.6',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 2.7'
     ],
     test_suite='tests',
     tests_require=test_requirements,

diff --git a/tox.ini b/tox.ini
@@ -1,26 +1,19 @@
 [tox]
-envlist = py26, py27, py33, py34, py35, flake8
+envlist = py27, flake8
 
 [travis]
 python =
-    3.5: py35
-    3.4: py34
-    3.3: py33
     2.7: py27
-    2.6: py26
 
 [testenv:flake8]
 basepython=python
 deps=flake8
-commands=flake8 pylleida
+commands=flake8 --ignore=E501 pylleida
 
 [testenv]
 setenv =
     PYTHONPATH = {toxinidir}
 
 commands = python setup.py test
 
-; If you want to make tox run the tests with the same versions, create a
-; requirements.txt with the pinned versions and uncomment the following lines:
-; deps =
-;     -r{toxinidir}/requirements.txt
+deps = -r{toxinidir}/requirements.txt