Skip to content

Commit 9771572

Browse files
authored
Merge pull request #87 from adavidw/patch-tests
update config for CI tests to pass again
2 parents 631ea24 + b99671a commit 9771572

File tree

3 files changed

+50
-25
lines changed

3 files changed

+50
-25
lines changed

.travis.yml

Lines changed: 37 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,50 @@
11
language: python
2+
23
sudo: false
34

5+
env:
6+
- TEST_SUITE=samples
7+
- TEST_SUITE=coverage
48
python:
59
- "2.7"
610
- "3.4"
711
- "3.5"
8-
# - "pypy" Disabling pypy until travis moves to newer version, known issue with lxml crashing pypy
12+
- "3.6"
13+
- "3.7-dev"
14+
- "pypy"
15+
- "pypy3"
16+
17+
matrix:
18+
fast_finish: true
19+
allow_failures:
20+
- python: "3.7-dev"
21+
# 3.7-dev started crashing when building lxml although the neither the python version nor the lxml version seemed to change.
22+
# Will have to investigate further.
23+
- python: "pypy"
24+
- python: "pypy3"
25+
# pypy will just crash due to an incompatibility with lxml.
26+
# Newer versions of pypy seem to crash also, so we probably have to fix with a newer version of lxml
27+
28+
before_install:
29+
# execute all of the commands which need to be executed
30+
# before installing dependencies
931

1032
install:
11-
- pip install unittest2
12-
- pip install nose
13-
- pip install pyxb
14-
- pip install lxml
15-
- pip install coveralls
33+
# install all of the dependencies we need here
34+
- pip install nose
35+
- pip install pyxb==1.2.5
36+
# can't change the pyxb version without changing the version in setup.py
37+
# and regenerating the bindings in apicontractsv1.py
38+
- pip install lxml
39+
- if [[ "$TEST_SUITE" == "coverage" ]]; then pip install coveralls; fi
1640

1741
before_script:
18-
- git submodule update --remote --recursive
42+
# execute all of the commands which need to be executed
43+
# before running actual tests
44+
- if [[ "$TEST_SUITE" == "samples" ]]; then git submodule update --remote --recursive; fi
1945

2046
script:
21-
- nosetests --with-coverage -cover-package=authorizenet
22-
- coveralls
23-
- python setup.py install
24-
- cd sample-code-python
25-
- python ./test-runner.py
47+
# execute all of the tests or other commands to determine
48+
# whether the build will pass or fail
49+
- if [[ "$TEST_SUITE" == "coverage" ]]; then nosetests --with-coverage -cover-package=authorizenet; coveralls; fi
50+
- if [[ "$TEST_SUITE" == "samples" ]]; then python setup.py install; cd sample-code-python; python ./test-runner.py; fi

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ The API Reference Guide provides examples of what information is needed for a pa
7272

7373
Run the following to get pyxb and nosetests:
7474
- pip install pyxb==1.2.5
75-
- pip install unittest2
7675
- pip install nose
7776
- pip install lxml
7877

setup.py

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@
4848

4949
# Specify the Python versions you support here. In particular, ensure
5050
# that you indicate whether you support Python 2, Python 3 or both.
51-
'Programming Language :: Python :: 3.5'
51+
'Programming Language :: Python :: 2.7',
52+
'Programming Language :: Python :: 3.4'
5253
],
5354

5455
# What does your project relate to?
@@ -63,11 +64,11 @@
6364
# requirements files see:
6465
# https://packaging.python.org/en/latest/requirements.html
6566
install_requires=['pyxb==1.2.5', 'nose', 'mock', 'lxml'],
66-
#install_requires=['nose'],
67-
#install_requires=['nosetests'],
68-
#install_requires=['mock'],
69-
#install_requires=['lxml'],
70-
67+
#install_requires=['nose'],
68+
#install_requires=['nosetests'],
69+
#install_requires=['mock'],
70+
#install_requires=['lxml'],
71+
7172
# List additional groups of dependencies here (e.g. development
7273
# dependencies). You can install these using the following syntax,
7374
# for example:
@@ -80,22 +81,22 @@
8081
},
8182
environment_variables={
8283
#api.login.id : xyz
83-
#transaction.key : xyz
84+
#transaction.key : xyz
8485
#md5.hash.key : MD5_HASH_KEY
8586
},
8687

8788
# If there are data files included in your packages that need to be
8889
# installed, specify them here. If using Python 2.6 or less, then these
8990
# have to be included in MANIFEST.in as well.
90-
#package_data={
91+
#package_data={
9192
# 'sample': ['package_data.dat'],
92-
#},
93-
93+
#},
94+
9495
# Although 'package_data' is the preferred approach, in some case you may
9596
# need to place data files outside of your packages. See:
9697
# http://docs.python.org/3.4/distutils/setupscript.html#installing-additional-files # noqa
9798
# In this case, 'data_file' will be installed into '<sys.prefix>/my_data'
98-
# data_files=[('my_data', ['data/data_file'])],
99+
# data_files=[('my_data', ['data/data_file'])],
99100

100101
# To provide executable scripts, use entry points in preference to the
101102
# "scripts" keyword. Entry points provide cross-platform support and allow
@@ -104,5 +105,5 @@
104105
# 'console_scripts': [
105106
# 'sample=sample:main',
106107
# ],
107-
#},
108+
#},
108109
)

0 commit comments

Comments
 (0)