Skip to content

Commit 5b83a5c

Browse files
committed
Add version constraint to system_provided plugins #3967
* Update configure script Signed-off-by: Jono Yang <[email protected]>
1 parent 17bd8e0 commit 5b83a5c

File tree

3 files changed

+16
-13
lines changed

3 files changed

+16
-13
lines changed

configure

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -141,23 +141,26 @@ CLI_ARGS=$1
141141
# Defaults. Change these variables to customize this script
142142
################################
143143

144-
BASE=".[packages]"
145-
BASE_DEV=".[packages,testing]"
144+
BASE=".[packages"
145+
BASE_DEV=".[packages,testing"
146146
if [[ $OSTYPE == 'darwin'* ]]; then
147-
BASE="."
148-
BASE_DEV=".[testing]"
147+
BASE=""
148+
BASE_DEV=".[testing"
149149
fi
150150

151151
# If SCANCODE_SYSTEM_PROVIDED is set, then we install system_provided extra_require
152152
if [[ SCANCODE_SYSTEM_PROVIDED ]]; then
153-
BASE=".[packages,system_provided]"
154-
BASE_DEV=".[packages,testing,system_provided]"
155153
if [[ $OSTYPE == 'darwin'* ]]; then
156154
BASE=".[system_provided]"
157-
BASE_DEV=".[testing,system_provided]"
155+
else
156+
BASE+=",system_provided"
158157
fi
158+
BASE_DEV+=",system_provided"
159159
fi
160160

161+
BASE="$BASE]"
162+
BASE_DEV="$BASE_DEV]"
163+
161164
# Requirement arguments passed to pip and used by default or with --dev.
162165
REQUIREMENTS="--editable $BASE --constraint requirements.txt --constraint requirements-linux.txt"
163166
DEV_REQUIREMENTS="--editable $BASE_DEV --constraint requirements.txt --constraint requirements-linux.txt --constraint requirements-dev.txt"

setup-mini.cfg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@ packages =
153153

154154
# use 7zip, libarchive, and libmagic provided on the system
155155
system_provided =
156-
extractcode-7z-system-provided
157-
extractcode-libarchive-system-provided
158-
typecode-libmagic-system-provided
156+
extractcode-7z-system-provided >= 33.0.0
157+
extractcode-libarchive-system-provided >= 33.0.0
158+
typecode-libmagic-system-provided >= 33.0.0
159159

160160
[options.entry_points]
161161
console_scripts =

setup.cfg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@ packages =
153153

154154
# use 7zip, libarchive, and libmagic provided on the system
155155
system_provided =
156-
extractcode-7z-system-provided
157-
extractcode-libarchive-system-provided
158-
typecode-libmagic-system-provided
156+
extractcode-7z-system-provided >= 33.0.0
157+
extractcode-libarchive-system-provided >= 33.0.0
158+
typecode-libmagic-system-provided >= 33.0.0
159159

160160
[options.entry_points]
161161
console_scripts =

0 commit comments

Comments
 (0)