1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
diff --unified --recursive --text package.orig/linode-cli-2.1.2/Makefile package.new/linode-cli-2.1.2/Makefile
--- package.orig/linode-cli-2.1.2/Makefile 2019-03-14 08:49:40.000000000 +1300
+++ package.new/linode-cli-2.1.2/Makefile 2019-03-25 13:54:28.602667639 +1300
@@ -9,8 +9,8 @@
PYCMD=python3
PIPCMD=pip3
else
- PYCMD=python
- PIPCMD=pip
+ PYCMD=python2
+ PIPCMD=pip2
endif
install: check-prerequisites requirements build
@@ -18,7 +18,7 @@
.PHONY: build
build: clean
- python -m linodecli bake ${SPEC} --skip-config
+ python2 -m linodecli bake ${SPEC} --skip-config
python3 -m linodecli bake ${SPEC} --skip-config
cp data-2 linodecli/
cp data-3 linodecli/
@@ -26,14 +26,14 @@
.PHONY: requirements
requirements:
- pip install -r requirements.txt
+ pip2 install -r requirements.txt
pip3 install -r requirements.txt
.PHONY: check-prerequisites
check-prerequisites:
- @ pip -v >/dev/null
+ @ pip2 -v >/dev/null
@ pip3 -v >/dev/null
- @ python -V >/dev/null
+ @ python2 -V >/dev/null
@ python3 -V >/dev/null
.PHONY: clean
diff --unified --recursive --text package.orig/linode-cli-2.1.2/requirements.txt package.new/linode-cli-2.1.2/requirements.txt
--- package.orig/linode-cli-2.1.2/requirements.txt 2019-03-14 08:49:40.000000000 +1300
+++ package.new/linode-cli-2.1.2/requirements.txt 2019-03-25 13:55:52.365450565 +1300
@@ -2,4 +2,4 @@
colorclass
requests
PyYAML
-enum34
+enum34; python_version < '3.4'
diff --unified --recursive --text package.orig/linode-cli-2.1.2/setup.py package.new/linode-cli-2.1.2/setup.py
--- package.orig/linode-cli-2.1.2/setup.py 2019-03-14 08:49:40.000000000 +1300
+++ package.new/linode-cli-2.1.2/setup.py 2019-03-25 14:14:14.785811129 +1300
@@ -47,7 +47,10 @@
'linodecli.plugins',
],
license="BSD 3-Clause License",
- install_requires=["terminaltables","colorclass","requests","PyYAML","enum34"],
+ install_requires=["terminaltables","colorclass","requests","PyYAML"],
+ extras_require={
+ ":python_version<'3.4'": ['enum34'],
+ },
entry_points={
"console_scripts": [
"linode-cli = linodecli:main",
|