Skip to content

Commit 441de9c

Browse files
authored
Switch to packaging (#338)
* Switch to packaging * install package * fix * support isolated builds
1 parent 4ae75e3 commit 441de9c

File tree

4 files changed

+20
-11
lines changed

4 files changed

+20
-11
lines changed

.github/workflows/main.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@ jobs:
3131

3232
- name: Install dependencies
3333
run: |
34-
python -m pip install --upgrade pip setuptools wheel
35-
python -m pip install --upgrade tox
34+
# build and test dependencies
35+
python -m pip install --upgrade pip wheel tox
36+
# runtime dependencies
37+
python -m pip install -e .
3638
3739
- name: Run tox targets for ${{ matrix.python-version }}
3840
run: |

nodeenv.py

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

48-
from pkg_resources import parse_version
48+
from packaging import version
4949

5050
nodeenv_version = '1.8.0'
5151

@@ -177,9 +177,9 @@ def node_version_from_args(args):
177177
if args.node == 'system':
178178
out, err = subprocess.Popen(
179179
["node", "--version"], stdout=subprocess.PIPE).communicate()
180-
return parse_version(clear_output(out).replace('v', ''))
180+
return version.parse(clear_output(out).replace('v', ''))
181181

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

184184

185185
def create_logger():
@@ -519,9 +519,9 @@ def callit(cmd, show_stdout=True, in_shell=False,
519519
return proc.returncode, all_output
520520

521521

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)
525525
else:
526526
return src_base_url
527527

@@ -1004,7 +1004,7 @@ def create_environment(env_dir, args):
10041004
# before npm install, npm use activate
10051005
# for install
10061006
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:
10081008
instfunc = install_npm_win if is_WIN or is_CYGWIN else install_npm
10091009
instfunc(env_dir, src_dir, args)
10101010
if args.requirements:

pyproject.toml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[build-system]
2+
requires = ["setuptools", "setuptools-scm"]
3+
build-backend = "setuptools.build_meta"

setup.py

+6-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,14 @@
77
"""
88
import codecs
99
import os
10+
import sys
1011

11-
from nodeenv import nodeenv_version
1212
from setuptools import setup
1313

14+
sys.path.insert(0, '.')
15+
16+
from nodeenv import nodeenv_version
17+
1418

1519
def read_file(file_name):
1620
return codecs.open(
@@ -32,7 +36,7 @@ def read_file(file_name):
3236
license='BSD',
3337
author='Eugene Kalinin',
3438
author_email='[email protected]',
35-
install_requires=['setuptools'],
39+
install_requires=['packaging'],
3640
python_requires=(
3741
">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*"
3842
),

0 commit comments

Comments
 (0)