Skip to content

Commit 5829949

Browse files
authored
Do not install ev-cli, enable building wheels (#19)
* * Add install build * Do not install ev-cli Signed-off-by: Andreas Heinrich <andreas.heinrich@rwth-aachen.de> * bump everest-cmake Signed-off-by: Andreas Heinrich <andreas.heinrich@rwth-aachen.de> * Apply suggestions from code review Signed-off-by: Andreas Heinrich <andreas.heinrich@rwth-aachen.de> --------- Signed-off-by: Andreas Heinrich <andreas.heinrich@rwth-aachen.de>
1 parent 355f3a8 commit 5829949

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

docker/images/build-kit/alpine.Dockerfile

+3-6
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,8 @@ RUN python3 -m pip install \
7070
py4j>=0.10.9.5 \
7171
netifaces>=0.11.0 \
7272
python-dateutil>=2.8.2 \
73-
gcovr==5.0
74-
75-
# install ev-cli
76-
ARG EVEREST_UTILS_VERSION=v0.2.3
77-
RUN python3 -m pip install git+https://github.com/EVerest/everest-utils@${EVEREST_UTILS_VERSION}#subdirectory=ev-dev-tools
73+
gcovr==5.0 \
74+
build
7875

7976
# install edm
8077
RUN python3 -m pip install git+https://github.com/EVerest/everest-dev-environment@v0.5.5#subdirectory=dependency_manager
@@ -84,7 +81,7 @@ RUN git clone https://github.com/EVerest/everest-cmake.git $EVEREST_CMAKE_PATH
8481

8582
RUN ( \
8683
cd $EVEREST_CMAKE_PATH \
87-
git checkout 329f8db \
84+
git checkout v0.4.0 \
8885
rm -r .git \
8986
)
9087

docker/images/build-kit/debian.Dockerfile

+3-6
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,8 @@ RUN python3 -m pip install \
6161
py4j>=0.10.9.5 \
6262
netifaces>=0.11.0 \
6363
python-dateutil>=2.8.2 \
64-
gcovr==5.0
65-
66-
# install ev-cli
67-
ARG EVEREST_UTILS_VERSION=v0.2.3
68-
RUN python3 -m pip install git+https://github.com/EVerest/everest-utils@${EVEREST_UTILS_VERSION}#subdirectory=ev-dev-tools
64+
gcovr==5.0 \
65+
build
6966

7067
# install edm
7168
RUN python3 -m pip install git+https://github.com/EVerest/everest-dev-environment@v0.5.5#subdirectory=dependency_manager
@@ -75,7 +72,7 @@ RUN git clone https://github.com/EVerest/everest-cmake.git $EVEREST_CMAKE_PATH
7572

7673
RUN ( \
7774
cd $EVEREST_CMAKE_PATH \
78-
git checkout 329f8db \
75+
git checkout v0.4.0 \
7976
rm -r .git \
8077
)
8178

0 commit comments

Comments
 (0)