fixed sphinx deps

6 files changed, 77 insertions, 26 deletions

diff --git a/auto/pypi.sh b/auto/pypi.sh
index 05656f7..f6c554b 100755
--- a/auto/pypi.sh
+++ b/auto/pypi.sh
@@ -1,3 +1,7 @@
+#!/bin/sh
+
+[ -f /usr/lib/colors.sh ] && . /usr/lib/colors.sh
+
 if [ $# = 0 ]; then
     printf "Name of package: python-"
     read name
@@ -20,18 +24,33 @@ if [ ${#deps} != 0 ]; then
     echo $package_deps
 fi
 
+echo PKG_VER: $version
+echo DESC: $desc
+echo SOURCE: $url
+echo DEPS: $package_deps
+
 file=repo/python/python-$name.xibuild
 
-cat templates/pypi.xibuild |
-    sed "s@^SOURCE=.*@SOURCE=$url@g" |
-    sed "s/^PKG_VER=.*/PKG_VER=$version/g" |
-    sed "s/^DESC=.*/DESC=\"$desc\"/g" |
-    sed "s/^DEPS=.*/DEPS=\"$package_deps\"/g"  > $file
-echo written to $file
+inp=templates/pypi.xibuild
+if [ -f $file ]; then
+    inp=$file
+    echo "replacing existing"
+fi
+
+tmp=/tmp/python-$name.xibuild
+rm -f $tmp
+cat $inp > $tmp
+
+sed -i "s@^SOURCE=.*@SOURCE=$url@g" $tmp
+sed -i "s@^PKG_VER=.*@PKG_VER=$version@g" $tmp
+sed -i "s@^DESC=.*@DESC=\"$desc\"@g" $tmp
 
 if [ ${#deps} != 0 ]; then
-    for p in $deps; do
-        $0 $p
-    done
+    printf "${LIGHT_BLUE}Please ensure the following exist: ${BLUE}${deps}${RESET}\n"
+    sed -i "s/^DEPS=.*/DEPS=\"$package_deps\"/g" $tmp
 fi
 
+mv $tmp $file
+
+printf "${GREEN}Written to $file${RESET}\n"
+
diff --git a/repo/python/python-Pygments.xibuild b/repo/python/python-Pygments.xibuild
deleted file mode 100644
index d46f057..0000000
--- a/repo/python/python-Pygments.xibuild
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-MAKEDEPS="python"
-DEPS=""
-
-PKG_VER=2.11.2
-SOURCE=https://files.pythonhosted.org/packages/94/9c/cb656d06950268155f46d4f6ce25d7ffc51a0da47eadf1b164bbf23b718b/Pygments-$PKG_VER.tar.gz
-DESC="Pygments is a syntax highlighting package written in Python."
-
-build() {
-    python setup.py build
-}
-
-package () {
-    python setup.py install --root="$PKG_DEST" --optimize=1
-}
diff --git a/repo/python/python-certifi.xibuild b/repo/python/python-certifi.xibuild
new file mode 100644
index 0000000..5da7f2d
--- /dev/null
+++ b/repo/python/python-certifi.xibuild
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+MAKEDEPS="python"
+DEPS=""
+
+PKG_VER=2021.10.8
+SOURCE=https://files.pythonhosted.org/packages/6c/ae/d26450834f0acc9e3d1f74508da6df1551ceab6c2ce0766a593362d6d57f/certifi-$PKG_VER.tar.gz
+DESC="Python package for providing Mozilla's CA Bundle."
+
+build() {
+    python setup.py build
+}
+
+package () {
+    python setup.py install --root="$PKG_DEST" --optimize=1
+}
diff --git a/repo/python/python-idna.xibuild b/repo/python/python-idna.xibuild
new file mode 100644
index 0000000..cc3c78c
--- /dev/null
+++ b/repo/python/python-idna.xibuild
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+MAKEDEPS="python"
+DEPS=""
+
+PKG_VER=3.3
+SOURCE=https://files.pythonhosted.org/packages/62/08/e3fc7c8161090f742f504f40b1bccbfc544d4a4e09eb774bf40aafce5436/idna-$PKG_VER.tar.gz
+DESC="Internationalized Domain Names in Applications (IDNA)"
+
+build() {
+    python setup.py build
+}
+
+package () {
+    python setup.py install --root="$PKG_DEST" --optimize=1
+}
diff --git a/repo/python/python-imagesize.xibuild b/repo/python/python-imagesize.xibuild
index e69de29..03d7b78 100644
--- a/repo/python/python-imagesize.xibuild
+++ b/repo/python/python-imagesize.xibuild
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+MAKEDEPS="python"
+DEPS=""
+
+PKG_VER=1.3.0
+SOURCE=https://files.pythonhosted.org/packages/f6/27/b147794d43249e8303a06f427e407a090696b65b81045e36f8873d8d8a42/imagesize-$PKG_VER.tar.gz
+DESC="Getting image size from png/jpeg/jpeg2000/gif file"
+
+build() {
+    python setup.py build
+}
+
+package () {
+    python setup.py install --root="$PKG_DEST" --optimize=1
+}
diff --git a/repo/python/python-sphinx.xibuild b/repo/python/python-sphinx.xibuild
index 538550c..544c8c8 100644
--- a/repo/python/python-sphinx.xibuild
+++ b/repo/python/python-sphinx.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="python"
-DEPS="python-sphinxcontrib-python-applehelp python-sphinxcontrib-python-devhelp python-sphinxcontrib-python-jsmath python-sphinxcontrib-python-htmlhelp python-sphinxcontrib-python-serializinghtml python-sphinxcontrib-python-qthelp python-Jinja2 python-Pygments python-docutils python-snowballstemmer python-babel python-alabaster python-imagesize python-requests python-packaging python-importlib-python-metadata python-colorama python-sphinxcontrib-python-websupport python-flake8 python-isort python-mypy python-docutils-python-stubs python-types-python-typed-python-ast python-types-python-requests python-pytest python-pytest-python-cov python-html5lib python-cython python-typed-python-ast"
+DEPS="python-sphinxcontrib-applehelp python-sphinxcontrib-devhelp python-python-jsmath python-sphinxcontrib-htmlhelp python-sphinxcontrib-serializinghtml python-sphinxcontrib-qthelp python-Jinja2 python-Pygments python-docutils python-snowballstemmer python-babel python-alabaster python-imagesize python-requests python-packaging python-importlib-metadata python-colorama python-python-websupport python-flake8 python-isort python-mypy python-docutils-stubs python-types-typed-python-ast python-types-requests python-pytest python-python-cov python-html5lib python-cython python-typed-ast"
 
 PKG_VER=4.4.0
 SOURCE=https://files.pythonhosted.org/packages/c9/08/c2932e66460cfbc8973928d276dc82ccde2d24b365055eeda9f0afc1951e/Sphinx-$PKG_VER.tar.gz