Skip to content

Commit 4211e51

Browse files
elpransahmelsayed
authored andcommitted
packapp: Fix NLTK installation
There is a version mismatch between the sdist filename and the actual package version which confused packapp. Fixes: Azure/azure-functions-python-worker#175
1 parent 1fd0c75 commit 4211e51

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

tools/python/packapp.py

+5-8
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import subprocess
1010
import sys
1111
import tempfile
12-
import zipfile
1312

1413
import distlib.scripts
1514
import distlib.wheel
@@ -160,7 +159,7 @@ def build_independent_wheel(name, version, args, dest):
160159
if pip.returncode != 0:
161160
return False
162161

163-
wheel_re = _wheel_file_pattern.format(namever=f'{name}-{version}')
162+
wheel_re = _wheel_file_pattern.format(namever=f'{name}-[^-]*')
164163

165164
for filename in os.listdir(td):
166165
m = re.match(wheel_re, filename, re.VERBOSE)
@@ -179,8 +178,7 @@ def build_independent_wheel(name, version, args, dest):
179178

180179

181180
def build_binary_wheel(name, version, args, dest):
182-
if args.platform != 'linux':
183-
die('packapp can only build binary dependencies for Linux targets')
181+
die('binary dependencies without wheels are not supported')
184182

185183

186184
def parse_args(argv):
@@ -189,7 +187,9 @@ def parse_args(argv):
189187
parser.add_argument('--python-version', type=str)
190188
parser.add_argument('--no-deps', default=False, action='store_true')
191189
parser.add_argument('--packages-dir-name', type=str,
192-
help='folder to save packages in. Default: .python_packages')
190+
default='.python_packages',
191+
help='folder to save packages in. '
192+
'Default: .python_packages')
193193
parser.add_argument('path', type=str,
194194
help='Path to a function app to pack.')
195195

@@ -200,9 +200,6 @@ def parse_args(argv):
200200
if not args.python_version:
201201
die('missing required argument: --python-version')
202202

203-
if not args.packages_dir_name:
204-
args.packages_dir_name = '.python_packages'
205-
206203
return args
207204

208205

0 commit comments

Comments
 (0)