|
45 | 45 | import http |
46 | 46 | IncompleteRead = http.client.IncompleteRead |
47 | 47 |
|
48 | | -from pkg_resources import parse_version |
| 48 | +from packaging import version |
49 | 49 |
|
50 | 50 | nodeenv_version = '1.8.0' |
51 | 51 |
|
@@ -177,9 +177,9 @@ def node_version_from_args(args): |
177 | 177 | if args.node == 'system': |
178 | 178 | out, err = subprocess.Popen( |
179 | 179 | ["node", "--version"], stdout=subprocess.PIPE).communicate() |
180 | | - return parse_version(clear_output(out).replace('v', '')) |
| 180 | + return version.parse(clear_output(out).replace('v', '')) |
181 | 181 |
|
182 | | - return parse_version(args.node) |
| 182 | + return version.parse(args.node) |
183 | 183 |
|
184 | 184 |
|
185 | 185 | def create_logger(): |
@@ -519,9 +519,9 @@ def callit(cmd, show_stdout=True, in_shell=False, |
519 | 519 | return proc.returncode, all_output |
520 | 520 |
|
521 | 521 |
|
522 | | -def get_root_url(version): |
523 | | - if parse_version(version) > parse_version("0.5.0"): |
524 | | - return '%s/v%s/' % (src_base_url, version) |
| 522 | +def get_root_url(version_str): |
| 523 | + if version.parse(version_str) > version.parse("0.5.0"): |
| 524 | + return '%s/v%s/' % (src_base_url, version_str) |
525 | 525 | else: |
526 | 526 | return src_base_url |
527 | 527 |
|
@@ -1004,7 +1004,7 @@ def create_environment(env_dir, args): |
1004 | 1004 | # before npm install, npm use activate |
1005 | 1005 | # for install |
1006 | 1006 | install_activate(env_dir, args) |
1007 | | - if node_version_from_args(args) < parse_version("0.6.3") or args.with_npm: |
| 1007 | + if node_version_from_args(args) < version.parse("0.6.3") or args.with_npm: |
1008 | 1008 | instfunc = install_npm_win if is_WIN or is_CYGWIN else install_npm |
1009 | 1009 | instfunc(env_dir, src_dir, args) |
1010 | 1010 | if args.requirements: |
|
0 commit comments