Skip to content

Commit dc114e1

Browse files
authored
Drop packaging dependency in favor of a simple version-parsing function (#352)
1 parent 3e574a5 commit dc114e1

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

nodeenv.py

+11-6
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@
4545
import http
4646
IncompleteRead = http.client.IncompleteRead
4747

48-
from packaging import version
49-
5048
nodeenv_version = '1.8.0'
5149

5250
join = os.path.join
@@ -170,16 +168,23 @@ def remove_env_bin_from_path(env, env_bin_dir):
170168
return env.replace(env_bin_dir + ':', '')
171169

172170

171+
def parse_version(version_str):
172+
"""
173+
Parse version string to a tuple of integer parts
174+
"""
175+
return tuple(map(int, version_str.replace('v', '').split('.')))
176+
177+
173178
def node_version_from_args(args):
174179
"""
175180
Parse the node version from the argparse args
176181
"""
177182
if args.node == 'system':
178183
out, err = subprocess.Popen(
179184
["node", "--version"], stdout=subprocess.PIPE).communicate()
180-
return version.parse(clear_output(out).replace('v', ''))
185+
return parse_version(clear_output(out))
181186

182-
return version.parse(args.node)
187+
return parse_version(args.node)
183188

184189

185190
def create_logger():
@@ -520,7 +525,7 @@ def callit(cmd, show_stdout=True, in_shell=False,
520525

521526

522527
def get_root_url(version_str):
523-
if version.parse(version_str) > version.parse("0.5.0"):
528+
if parse_version(version_str) > (0, 5):
524529
return '%s/v%s/' % (src_base_url, version_str)
525530
else:
526531
return src_base_url
@@ -1004,7 +1009,7 @@ def create_environment(env_dir, args):
10041009
# before npm install, npm use activate
10051010
# for install
10061011
install_activate(env_dir, args)
1007-
if node_version_from_args(args) < version.parse("0.6.3") or args.with_npm:
1012+
if node_version_from_args(args) < (0, 6, 3) or args.with_npm:
10081013
instfunc = install_npm_win if is_WIN or is_CYGWIN else install_npm
10091014
instfunc(env_dir, src_dir, args)
10101015
if args.requirements:

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def read_file(file_name):
3636
license='BSD',
3737
author='Eugene Kalinin',
3838
author_email='[email protected]',
39-
install_requires=['packaging'],
39+
install_requires=[],
4040
python_requires=(
4141
">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*"
4242
),

0 commit comments

Comments
 (0)