Skip to content
This repository was archived by the owner on Mar 8, 2020. It is now read-only.

Commit dda1dbd

Browse files
author
Juanjo Alvarez
committed
Dockerfile fix. Regenerated integration tests. Bump dependency of pydetector
Signed-off-by: Juanjo Alvarez <[email protected]>
1 parent 3c0c2f6 commit dda1dbd

File tree

98 files changed

+3545
-156
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+3545
-156
lines changed

‎Dockerfile.tpl

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@ MAINTAINER source{d}
33

44
ARG DEVDEPS=native/dev_deps
55
ARG CONTAINER_DEVDEPS=/tmp/dev_deps
6-
ARG PYDETECTOR_VER=0.10.3
6+
ARG PYDETECTOR_VER=0.11.0
77

88
RUN apk add --no-cache --update python python3 py-pip py2-pip git
99

1010
ADD build /opt/driver/bin
1111
ADD native/python_package /tmp/python_driver
12-
RUN pip3 install /tmp/python_driver
13-
RUN yes|rm -rf /tmp/python_driver
1412

1513
ADD ${DEVDEPS} ${CONTAINER_DEVDEPS}
1614
ENV ENV_DEVDEPS=${DEVDEPS}
@@ -19,4 +17,7 @@ RUN pip2 install -U ${CONTAINER_DEVDEPS}/python-pydetector || pip2 install pydet
1917
RUN pip3 install -U ${CONTAINER_DEVDEPS}/python-pydetector || pip3 install pydetector-bblfsh==${PYDETECTOR_VER}
2018
RUN yes|rm -rf ${CONTAINER_DEVDEPS}
2119

20+
RUN pip3 install /tmp/python_driver
21+
RUN yes|rm -rf /tmp/python_driver
22+
2223
CMD /opt/driver/bin/driver

‎Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ test-native-internal:
77
python3 -m unittest discover
88

99
build-native-internal:
10+
pip3 install --user ${DEV_DEPS}/python-pydetector/ || pip3 install --user pydetector-bblfsh
1011
cd native/python_package/ && \
1112
pip3 install -U --user .
1213
cp native/sh/native.sh $(BUILD_PATH)/native;

‎native/python_package/requirements.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
pydetector-bblfsh==0.10.3
2-
//github.com/python/mypy.git@0bb2d1680e8b9522108b38d203cb73021a617e64#egg=mypy
1+
pydetector-bblfsh==0.11.0
2+
-e git+git://github.com/python/mypy.git@0bb2d1680e8b9522108b38d203cb73021a617e64#egg=mypy-lang
3+
typed-ast==1.0.1

‎native/python_package/setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
]
3232
},
3333
install_requires=[
34-
"pydetector-bblfsh==0.10.3"
34+
"pydetector-bblfsh==0.11.0"
3535
],
3636
classifiers=[
3737
"Development Status :: 4 - Beta",

‎tests/aritmeticops.py.native

+80-7
Original file line numberDiff line numberDiff line change
@@ -8,213 +8,286 @@
88
{
99
"ast_type": "Expr",
1010
"col_offset": 1,
11+
"end_col_offset": 3,
12+
"end_lineno": 1,
1113
"lineno": 1,
1214
"value": {
1315
"ast_type": "BinOp",
1416
"col_offset": 1,
17+
"end_col_offset": 3,
18+
"end_lineno": 1,
1519
"left": {
1620
"LiteralValue": 1,
1721
"NumType": "int",
1822
"ast_type": "NumLiteral",
1923
"col_offset": 1,
24+
"end_col_offset": 1,
25+
"end_lineno": 1,
2026
"lineno": 1
2127
},
2228
"lineno": 1,
2329
"op": {
2430
"ast_type": "Add",
25-
"col_offset": 1,
31+
"col_offset": 2,
32+
"end_col_offset": 2,
33+
"end_lineno": 1,
2634
"lineno": 1
2735
},
2836
"right": {
2937
"LiteralValue": 2,
3038
"NumType": "int",
3139
"ast_type": "NumLiteral",
3240
"col_offset": 3,
41+
"end_col_offset": 3,
42+
"end_lineno": 1,
3343
"lineno": 1
3444
}
3545
}
3646
},
3747
{
3848
"ast_type": "Expr",
3949
"col_offset": 1,
50+
"end_col_offset": 3,
51+
"end_lineno": 2,
4052
"lineno": 2,
4153
"value": {
4254
"ast_type": "BinOp",
4355
"col_offset": 1,
56+
"end_col_offset": 3,
57+
"end_lineno": 2,
4458
"left": {
4559
"LiteralValue": 1,
4660
"NumType": "int",
4761
"ast_type": "NumLiteral",
4862
"col_offset": 1,
63+
"end_col_offset": 1,
64+
"end_lineno": 2,
4965
"lineno": 2
5066
},
5167
"lineno": 2,
5268
"op": {
5369
"ast_type": "Sub",
54-
"col_offset": 1,
70+
"col_offset": 2,
71+
"end_col_offset": 2,
72+
"end_lineno": 2,
5573
"lineno": 2
5674
},
5775
"right": {
5876
"LiteralValue": 2,
5977
"NumType": "int",
6078
"ast_type": "NumLiteral",
6179
"col_offset": 3,
80+
"end_col_offset": 3,
81+
"end_lineno": 2,
6282
"lineno": 2
6383
}
6484
}
6585
},
6686
{
6787
"ast_type": "Expr",
6888
"col_offset": 1,
89+
"end_col_offset": 3,
90+
"end_lineno": 3,
6991
"lineno": 3,
7092
"value": {
7193
"ast_type": "BinOp",
7294
"col_offset": 1,
95+
"end_col_offset": 3,
96+
"end_lineno": 3,
7397
"left": {
7498
"LiteralValue": 1,
7599
"NumType": "int",
76100
"ast_type": "NumLiteral",
77101
"col_offset": 1,
102+
"end_col_offset": 1,
103+
"end_lineno": 3,
78104
"lineno": 3
79105
},
80106
"lineno": 3,
81107
"op": {
82108
"ast_type": "Mult",
83-
"col_offset": 1,
109+
"col_offset": 2,
110+
"end_col_offset": 2,
111+
"end_lineno": 3,
84112
"lineno": 3
85113
},
86114
"right": {
87115
"LiteralValue": 2,
88116
"NumType": "int",
89117
"ast_type": "NumLiteral",
90118
"col_offset": 3,
119+
"end_col_offset": 3,
120+
"end_lineno": 3,
91121
"lineno": 3
92122
}
93123
}
94124
},
95125
{
96126
"ast_type": "Expr",
97127
"col_offset": 1,
128+
"end_col_offset": 3,
129+
"end_lineno": 4,
98130
"lineno": 4,
99131
"value": {
100132
"ast_type": "BinOp",
101133
"col_offset": 1,
134+
"end_col_offset": 3,
135+
"end_lineno": 4,
102136
"left": {
103137
"LiteralValue": 1,
104138
"NumType": "int",
105139
"ast_type": "NumLiteral",
106140
"col_offset": 1,
141+
"end_col_offset": 1,
142+
"end_lineno": 4,
107143
"lineno": 4
108144
},
109145
"lineno": 4,
110146
"op": {
111147
"ast_type": "Div",
112-
"col_offset": 1,
148+
"col_offset": 2,
149+
"end_col_offset": 2,
150+
"end_lineno": 4,
113151
"lineno": 4
114152
},
115153
"right": {
116154
"LiteralValue": 2,
117155
"NumType": "int",
118156
"ast_type": "NumLiteral",
119157
"col_offset": 3,
158+
"end_col_offset": 3,
159+
"end_lineno": 4,
120160
"lineno": 4
121161
}
122162
}
123163
},
124164
{
125165
"ast_type": "Expr",
126166
"col_offset": 1,
167+
"end_col_offset": 4,
168+
"end_lineno": 5,
127169
"lineno": 5,
128170
"value": {
129171
"ast_type": "BinOp",
130172
"col_offset": 1,
173+
"end_col_offset": 4,
174+
"end_lineno": 5,
131175
"left": {
132176
"LiteralValue": 1,
133177
"NumType": "int",
134178
"ast_type": "NumLiteral",
135179
"col_offset": 1,
180+
"end_col_offset": 1,
181+
"end_lineno": 5,
136182
"lineno": 5
137183
},
138184
"lineno": 5,
139185
"op": {
140186
"ast_type": "FloorDiv",
141-
"col_offset": 1,
187+
"col_offset": 2,
188+
"end_col_offset": 3,
189+
"end_lineno": 5,
142190
"lineno": 5
143191
},
144192
"right": {
145193
"LiteralValue": 2,
146194
"NumType": "int",
147195
"ast_type": "NumLiteral",
148196
"col_offset": 4,
197+
"end_col_offset": 4,
198+
"end_lineno": 5,
149199
"lineno": 5
150200
}
151201
}
152202
},
153203
{
154204
"ast_type": "Expr",
155205
"col_offset": 1,
206+
"end_col_offset": 3,
207+
"end_lineno": 6,
156208
"lineno": 6,
157209
"value": {
158210
"ast_type": "BinOp",
159211
"col_offset": 1,
212+
"end_col_offset": 3,
213+
"end_lineno": 6,
160214
"left": {
161215
"LiteralValue": 1,
162216
"NumType": "int",
163217
"ast_type": "NumLiteral",
164218
"col_offset": 1,
219+
"end_col_offset": 1,
220+
"end_lineno": 6,
165221
"lineno": 6
166222
},
167223
"lineno": 6,
168224
"op": {
169225
"ast_type": "Mod",
170226
"col_offset": 1,
227+
"end_col_offset": 1,
228+
"end_lineno": 6,
171229
"lineno": 6
172230
},
173231
"right": {
174232
"LiteralValue": 2,
175233
"NumType": "int",
176234
"ast_type": "NumLiteral",
177235
"col_offset": 3,
236+
"end_col_offset": 3,
237+
"end_lineno": 6,
178238
"lineno": 6
179239
}
180240
}
181241
},
182242
{
183243
"ast_type": "Expr",
184244
"col_offset": 1,
245+
"end_col_offset": 4,
246+
"end_lineno": 7,
185247
"lineno": 7,
186248
"value": {
187249
"ast_type": "BinOp",
188250
"col_offset": 1,
251+
"end_col_offset": 4,
252+
"end_lineno": 7,
189253
"left": {
190254
"LiteralValue": 1,
191255
"NumType": "int",
192256
"ast_type": "NumLiteral",
193257
"col_offset": 1,
258+
"end_col_offset": 1,
259+
"end_lineno": 7,
194260
"lineno": 7
195261
},
196262
"lineno": 7,
197263
"op": {
198264
"ast_type": "Pow",
199-
"col_offset": 1,
265+
"col_offset": 2,
266+
"end_col_offset": 3,
267+
"end_lineno": 7,
200268
"lineno": 7
201269
},
202270
"right": {
203271
"LiteralValue": 2,
204272
"NumType": "int",
205273
"ast_type": "NumLiteral",
206274
"col_offset": 4,
275+
"end_col_offset": 4,
276+
"end_lineno": 7,
207277
"lineno": 7
208278
}
209279
}
210280
}
211281
],
212282
"col_offset": 1,
283+
"end_col_offset": 4,
284+
"end_lineno": 7,
213285
"lineno": 1,
214286
"noops_remainder": {
215287
"ast_type": "RemainderNoops",
216288
"col_offset": 1,
217-
"end_lineno": 9,
289+
"end_col_offset": 1,
290+
"end_lineno": 8,
218291
"lineno": 8,
219292
"lines": [
220293
{

0 commit comments

Comments
 (0)