Skip to content

Commit 471fe16

Browse files
committed
👷(eucalyptus/3/wb) fix Docker build by removing nose-faulthandler
The "faulthandler" packet is not available anymore for Python 2 which breaks the build. Since this packet is only useful to run the tests, we think we can skip its installation in the production image.
1 parent 2ad4fef commit 471fe16

4 files changed

Lines changed: 28 additions & 8 deletions

File tree

‎.circleci/config.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -158,11 +158,11 @@ jobs:
158158
#
159159
# Note that the job name should match the EDX_RELEASE value
160160

161-
# Run jobs for the dogwood.3-fun release
162-
dogwood.3-fun:
163-
<<: [*defaults, *build_steps]
161+
# No changes detected for dogwood.3-fun
164162
# No changes detected for eucalyptus.3-bare
165-
# No changes detected for eucalyptus.3-wb
163+
# Run jobs for the eucalyptus.3-wb release
164+
eucalyptus.3-wb:
165+
<<: [*defaults, *build_steps]
166166
# No changes detected for hawthorn.1-bare
167167
# No changes detected for hawthorn.1-oee
168168
# No changes detected for ironwood.2-bare
@@ -257,15 +257,15 @@ workflows:
257257

258258
# Build jobs
259259

260-
# Run jobs for the dogwood.3-fun release
261-
- dogwood.3-fun:
260+
# No changes detected so no job to run for dogwood.3-fun
261+
# No changes detected so no job to run for eucalyptus.3-bare
262+
# Run jobs for the eucalyptus.3-wb release
263+
- eucalyptus.3-wb:
262264
requires:
263265
- check-configuration
264266
filters:
265267
tags:
266268
ignore: /.*/
267-
# No changes detected so no job to run for eucalyptus.3-bare
268-
# No changes detected so no job to run for eucalyptus.3-wb
269269
# No changes detected so no job to run for hawthorn.1-bare
270270
# No changes detected so no job to run for hawthorn.1-oee
271271
# No changes detected so no job to run for ironwood.2-bare

‎releases/eucalyptus/3/wb/CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ release.
1111

1212
### Fixed
1313

14+
- Fix Docker build by removing `nose-faulthandler` Python dependency
1415
- Avoid build error when running npm install on `edx-ui-toolkit` due to github command
1516

1617
## [eucalyptus.3-wb-1.12.1] - 2022-04-14

‎releases/eucalyptus/3/wb/Dockerfile‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,13 @@ RUN python get-pip.py
123123

124124
WORKDIR /edx/app/edxapp/edx-platform
125125

126+
# Patches
127+
COPY patches/* /tmp/
128+
129+
# Patches pre-install
130+
# Remove faulthandler dependency that is no more available and is useful only for running tests
131+
RUN patch -p1 < /tmp/edx-platform_eucalyptus.3-remove_faulthandler.patch
132+
126133
# Install python dependencies
127134
#
128135
# Note that we force some pinned release installations before installing github
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
2+
index 9bc8908d72..5b374a18e2 100644
3+
--- a/requirements/edx/base.txt
4+
+++ b/requirements/edx/base.txt
5+
@@ -169,7 +169,6 @@ selenium==2.53.1
6+
splinter==0.5.4
7+
testtools==0.9.34
8+
testfixtures==4.5.0
9+
-nose-faulthandler==0.1
10+
11+
# Used for Segment analytics
12+
analytics-python==1.1.0

0 commit comments

Comments
 (0)