Browse Source

use pypa build instead of setup.py build and move ldap to extras

Nick Sweeting 2 years ago
parent
commit
b6113cc00c
2 changed files with 11 additions and 5 deletions
  1. 7 4
      bin/build_pip.sh
  2. 4 1
      setup.py

+ 7 - 4
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

+ 4 - 1
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",