Skip to content

Commit b4d9845

Browse files
author
Josh Mervine
committed
cleaning up make for py versions
1 parent 7b2fe9a commit b4d9845

File tree

3 files changed

+62
-6
lines changed

3 files changed

+62
-6
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ python:
44
- "2.7"
55
- "3.2"
66
- "3.3"
7+
- "3.4"
78
script: make travis

Makefile

Lines changed: 46 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,24 +26,64 @@ clean:
2626
coverage: build/coverage
2727
$(pypath) python $(nose) $(cov_opts) $(tests)
2828

29-
nose: build/nose
30-
$(pypath) $(nose) $(nose_opts) $(tests)
31-
32-
nose/int: build/nose
33-
$(pypath) $(nose) $(nose_opts) $(int)
34-
3529
test:
3630
$(pypath) python $(tests)
3731

32+
test/2:
33+
# python 2.x
34+
$(pypath) python2 $(tests)
35+
3836
test/32:
37+
# python 3.2
3938
$(pypath) python3.2 $(tests)
4039

4140
test/33:
41+
# python 3.3
4242
$(pypath) python3.3 $(tests)
4343

44+
test/34:
45+
# python 3.4
46+
$(pypath) python3.4 $(test_opts) $(tests)
47+
48+
test/all:
49+
-make test/2
50+
-make test/32
51+
-make test/33
52+
-make test/34
53+
54+
nose: build/nose
55+
$(pypath) $(nose) $(nose_opts) $(tests)
56+
57+
nose/int: build/nose
58+
$(pypath) $(nose) $(nose_opts) $(int)
59+
60+
nose/all: nose nose/int
61+
4462
int:
4563
$(pypath) python $(test_opts) $(int)
4664

65+
int/2:
66+
# python 2.x
67+
$(pypath) python2 $(test_opts) $(int)
68+
69+
int/32:
70+
# python 3.2
71+
$(pypath) python3.2 $(test_opts) $(int)
72+
73+
int/33:
74+
# python 3.3
75+
$(pypath) python3.3 $(test_opts) $(int)
76+
77+
int/34:
78+
# python 3.4
79+
$(pypath) python3.4 $(test_opts) $(int)
80+
81+
int/all:
82+
-make int/2
83+
-make int/32
84+
-make int/33
85+
-make int/34
86+
4787
travis: setup test
4888

4989
distribute:

README.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,3 +83,18 @@ api = MaxCDN("myalias", "consumer_key", "consumer_secret",
8383
You can also send the optional parameter header_auth, which takes a boolean
8484
to send the OAuth header in the body or URLEncoded.
8585

86+
# Development
87+
88+
```
89+
git clone https://github.com/jmervine/python-maxcdn.git
90+
91+
make # setup and test
92+
make setup # installation w/ deps
93+
make test # test w/ primary python
94+
make int # integration tests w/ primary python
95+
make test/all # test w/ python2 python3.2 python3.3 python3.4
96+
make int # integration tests
97+
make int/all # integration w/ python2 python3.2 python3.3 python3.4
98+
make nose # verbose test output w/ nosetests
99+
```
100+

0 commit comments

Comments
 (0)