Skip to content

Commit 7913c3e

Browse files
committed
Merge pull request #5 from richardasaurus/lxml-version-range
Widened range of LXML package compatibility and add tox tests with Python 2.7, Python 3.3 and Python 3.4 (thanks to @richardasaurus).
2 parents 4a1a434 + 8d46797 commit 7913c3e

File tree

6 files changed

+32
-9
lines changed

6 files changed

+32
-9
lines changed

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2013 Exirel
3+
Copyright (c) 2015 Exirel
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of
66
this software and associated documentation files (the "Software"), to deal in

README.rst

+10
Original file line numberDiff line numberDiff line change
@@ -66,3 +66,13 @@ Example:
6666
# Check
6767
self.assertXpathsUniqueValue(root, ('./leaf@id', ))
6868
self.assertXpathValues(root, './leaf@active', ('on', 'off'))
69+
70+
71+
Running the tests
72+
======
73+
74+
To run the unit tests for this package::
75+
76+
77+
pip install tox
78+
tox

doc/index.rst

+2-1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ Python ``xmlunittest`` has been tested with:
4444

4545
* ``lxml`` version 3.4.0
4646
* Python 2.7.6
47+
* Python 3.3.0
4748
* Python 3.4.0
4849

4950
Be aware: as a lot of string manipulation is involved, a lot of issues can
@@ -151,7 +152,7 @@ Tips
151152

152153
**Do**:
153154

154-
* Always tests with both Python 2.7 and Python 3.4.
155+
* Always tests with both Python 2.7, Python 3.3 and Python 3.4.
155156
* Always tests with namespaces
156157
* Always provide unit-tests.
157158
* Always provide documentation.

requirements.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
pytest
2-
pytest-cov
3-
lxml
1+
pytest>=2.0.3
2+
pytest-cov>=1.8.1
3+
lxml>=2.3,<3.4.0

setup.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -16,29 +16,30 @@
1616

1717

1818
def read(*parts):
19-
return codecs.open(os.path.join(os.path.dirname(__file__), *parts), encoding='utf-8').read()
19+
return codecs.open(os.path.join(os.path.dirname(__file__), *parts),
20+
encoding='utf-8').read()
2021

2122

2223
classifiers = [
2324
'Development Status :: 4 - Beta',
2425
'Intended Audience :: Developers',
2526
'License :: OSI Approved :: MIT License',
2627
'Programming Language :: Python :: 2.7',
28+
'Programming Language :: Python :: 3.3',
2729
'Programming Language :: Python :: 3.4',
2830
'Topic :: Software Development :: Libraries :: Python Modules',
2931
'Topic :: Software Development :: Testing',
3032
'Topic :: Text Processing :: Markup :: XML'
3133
]
3234

3335
setup(name='xmlunittest',
34-
version='0.3.0',
36+
version='0.3.1',
3537
description='Library using lxml and unittest for unit testing XML.',
3638
long_description=read('README.rst'),
3739
author='Florian Strzelecki',
3840
author_email='[email protected]',
3941
license='MIT',
4042
url='http://python-xmlunittest.readthedocs.org/en/latest/',
4143
py_modules=['xmlunittest'],
42-
install_requires=['lxml>=3.3.6'],
44+
install_requires=['lxml>=2.3,<3.4.0'],
4345
classifiers=classifiers)
44-

tox.ini

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
[tox]
2+
envlist = py27, py33, py34
3+
4+
[testenv]
5+
6+
commands =
7+
py.test
8+
9+
deps =
10+
lxml==2.3
11+
pytest==2.6.4

0 commit comments

Comments
 (0)