File tree Expand file tree Collapse file tree 3 files changed +16
-13
lines changed Expand file tree Collapse file tree 3 files changed +16
-13
lines changed Original file line number Diff line number Diff 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"
146146if [[ $OSTYPE == ' darwin' * ]]; then
147- BASE=" . "
148- BASE_DEV=" .[testing] "
147+ BASE=" "
148+ BASE_DEV=" .[testing"
149149fi
150150
151151# If SCANCODE_SYSTEM_PROVIDED is set, then we install system_provided extra_require
152152if [[ 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"
159159fi
160160
161+ BASE=" $BASE ]"
162+ BASE_DEV=" $BASE_DEV ]"
163+
161164# Requirement arguments passed to pip and used by default or with --dev.
162165REQUIREMENTS=" --editable $BASE --constraint requirements.txt --constraint requirements-linux.txt"
163166DEV_REQUIREMENTS=" --editable $BASE_DEV --constraint requirements.txt --constraint requirements-linux.txt --constraint requirements-dev.txt"
Original file line number Diff line number Diff line change @@ -153,9 +153,9 @@ packages =
153153
154154# use 7zip, libarchive, and libmagic provided on the system
155155system_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]
161161console_scripts =
Original file line number Diff line number Diff line change @@ -153,9 +153,9 @@ packages =
153153
154154# use 7zip, libarchive, and libmagic provided on the system
155155system_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]
161161console_scripts =
You can’t perform that action at this time.
0 commit comments