Skip to content

Commit

Permalink
Fixed build. 'tox' command was failling because it said there is no a…
Browse files Browse the repository at this point in the history
…ttribute called 'test_pylleida'. Running the shell of the .tox folder's embedded Python, and executing the line 'import tests.test_pylleida' raised a 'Cannot import requests module' error.
  • Loading branch information
nick13jaremek committed Nov 10, 2017
1 parent d134bcd commit 10317f1
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 28 deletions.
1 change: 0 additions & 1 deletion pylleida/api/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,3 @@ def _update_attributes(self, obj, data):
setattr(obj, formatted_key, new_obj)
else:
setattr(obj, formatted_key, value)

1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
Jinja2==2.9.5
xmltodict==0.10.2
requests==2.18.4
34 changes: 12 additions & 22 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -12,17 +12,15 @@
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',
Expand All @@ -31,13 +29,10 @@
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",
Expand All @@ -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,
Expand Down
7 changes: 2 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,12 @@ python =
[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

0 comments on commit 10317f1

Please sign in to comment.