Skip to content

Commit ea7048b

Browse files
authored
Merge branch 'main' into fix_formulas
2 parents f20ab4e + 01a5593 commit ea7048b

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

docs/docker/dev.dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ ENV CC clang-10
88
ENV CXX clang++-10
99
WORKDIR /app
1010
ADD docs/requirements.txt docs/requirements.txt
11+
ADD docs/requirements_mkdoc.txt docs/requirements_mkdoc.txt
1112
RUN python3 -m pip install -r docs/requirements.txt
1213
ADD . .
1314
CMD docs/docker/docker_run.sh

docs/source/conf.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@
2222
subprocess.check_call(['make', 'install'], cwd=tmpdir+'/libusb-1.0.24')
2323
env['PATH'] = tmpdir+'/libusb/include:'+tmpdir+'/libusb/lib'+':'+env['PATH']
2424

25-
# libclang
26-
subprocess.check_call(['wget', 'https://artifacts.luxonis.com/artifactory/luxonis-depthai-data-local/misc/libclang-11_manylinux2014_x86_64.tar.xz'], cwd=tmpdir)
27-
subprocess.check_call(['mkdir', '-p', 'libclang'], cwd=tmpdir)
28-
subprocess.check_call(['tar', 'xf', 'libclang-11_manylinux2014_x86_64.tar.xz', '-C', tmpdir+'/libclang/'], cwd=tmpdir)
29-
env['LIBCLANG_PATH'] = tmpdir+'/libclang/usr/lib/llvm-11/lib/libclang.so.1'
30-
env['LLVM_DIR_PATH'] = tmpdir+'/libclang/usr/lib/llvm-11/'
25+
# Not needed anymore, part of pip install that carries the binary itself also
26+
# # libclang
27+
# subprocess.check_call(['wget', 'https://artifacts.luxonis.com/artifactory/luxonis-depthai-data-local/misc/libclang-11_manylinux2014_x86_64.tar.xz'], cwd=tmpdir)
28+
# subprocess.check_call(['mkdir', '-p', 'libclang'], cwd=tmpdir)
29+
# subprocess.check_call(['tar', 'xf', 'libclang-11_manylinux2014_x86_64.tar.xz', '-C', tmpdir+'/libclang/'], cwd=tmpdir)
30+
# env['LIBCLANG_PATH'] = tmpdir+'/libclang/usr/lib/llvm-11/lib/libclang.so.1'
31+
# env['LLVM_DIR_PATH'] = tmpdir+'/libclang/usr/lib/llvm-11/'
3132

3233
# Build library and generate actual conf.py
3334
subprocess.run(["cmake -P ../ci.cmake"], cwd=cwd, shell=True, check=True, env=env)

0 commit comments

Comments
 (0)