File tree 5 files changed +18
-3
lines changed
5 files changed +18
-3
lines changed Original file line number Diff line number Diff line change @@ -28,8 +28,10 @@ matrix:
28
28
install :
29
29
- pip2 install -q --user setuptools
30
30
- pip2 install -q --user -r PythonAPI/test/requirements.txt
31
+ - pip2 install -q --user -r PythonAPI/carla/requirements.txt
31
32
- pip3 install -q --user setuptools
32
33
- pip3 install -q --user -r PythonAPI/test/requirements.txt
34
+ - pip3 install -q --user -r PythonAPI/carla/requirements.txt
33
35
script :
34
36
- while sleep 2m; do echo "still building..."; done &
35
37
- make setup >> build.log 2>&1
Original file line number Diff line number Diff line change 28
28
* Fixed collision issues when debug draw(debug.draw_line) is called
29
29
* Fixed Gyroscope sensor to properly give angular velocity readings in local frame
30
30
* Added Renderdoc plugin to the Unreal project.
31
+ * Replace deprectated ` platform.dist() ` with recommended ` distro.linux_distribution() `
31
32
32
33
## CARLA 0.9.9
33
34
Original file line number Diff line number Diff line change 1
1
networkx
2
2
numpy ; python_version < '3.0'
3
3
numpy == 1.18.4 ; python_version >= '3.0'
4
+ distro
Original file line number Diff line number Diff line change 10
10
11
11
import fnmatch
12
12
import os
13
- import platform
14
13
import sys
15
14
16
15
def is_rss_variant_enabled ():
@@ -33,8 +32,9 @@ def walk(folder, file_filter='*'):
33
32
yield os .path .join (root , filename )
34
33
35
34
if os .name == "posix" :
36
- # @todo Replace deprecated method.
37
- linux_distro = platform .dist ()[0 ] # pylint: disable=W1505
35
+ import distro
36
+
37
+ linux_distro = distro .linux_distribution ()[0 ]
38
38
if linux_distro .lower () in ["ubuntu" , "debian" , "deepin" ]:
39
39
pwd = os .path .dirname (os .path .realpath (__file__ ))
40
40
pylib = "libboost_python%d%d.a" % (sys .version_info .major ,
Original file line number Diff line number Diff line change 368
368
369
369
unset RECAST_BASENAME
370
370
371
+ # ==============================================================================
372
+ # -- Install python requirements -----------------------------------------------
373
+ # ==============================================================================
374
+
375
+ log " Installing python requirements"
376
+
377
+ pip2 install --ignore-installed --user setuptools==44.1.1
378
+ pip2 install --user distro
379
+ pip3 install --ignore-installed --user setuptools
380
+ pip3 install --user distro
381
+
371
382
# ==============================================================================
372
383
# -- Generate Version.h --------------------------------------------------------
373
384
# ==============================================================================
You can’t perform that action at this time.
0 commit comments