From b6113cc00ced886c43cc7ae9e1fa9d8d42ac0a17 Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Thu, 19 Oct 2023 16:44:44 -0700 Subject: [PATCH] use pypa build instead of setup.py build and move ldap to extras --- bin/build_pip.sh | 11 +++++++---- setup.py | 5 ++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/bin/build_pip.sh b/bin/build_pip.sh index 532a8058..e2edace2 100755 --- a/bin/build_pip.sh +++ b/bin/build_pip.sh @@ -25,7 +25,10 @@ cd "$REPO_DIR" rm -Rf build dist echo "[+] Building sdist, bdist_wheel, and egg_info" -python3 setup.py \ - sdist --dist-dir=./pip_dist \ - bdist_wheel --dist-dir=./pip_dist \ - egg_info --egg-base=./pip_dist +# python3 setup.py \ +# sdist --dist-dir=./pip_dist \ +# bdist_wheel --dist-dir=./pip_dist \ +# egg_info --egg-base=./pip_dist + +# pip install --upgrade pip setuptools build +python -m build diff --git a/setup.py b/setup.py index 6f1848d7..218aec47 100755 --- a/setup.py +++ b/setup.py @@ -47,13 +47,16 @@ INSTALL_REQUIRES = [ "croniter>=0.3.34", "w3lib>=1.22.0", "ipython>5.0.0", - "django-auth-ldap>=4.1.0" ] EXTRAS_REQUIRE = { 'sonic': [ "sonic-client>=0.0.5", ], + 'ldap': [ + "django-auth-ldap>=4.1.0", + ], 'dev': [ + "build", "setuptools", "twine", "wheel",