#45 #82 removing libcurl dependency, document requirement for curl ex…

…ecutable
myselfhimself · Dec 9, 2020 · 4096471 · 4096471
1 parent a0641de
commit 4096471
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 93 deletions.
diff --git a/.github/workflows/cpythonmanylinuxbuild_nosendpypi.yml b/.github/workflows/cpythonmanylinuxbuild_nosendpypi.yml
@@ -46,8 +46,7 @@ jobs:
           CMD: ${{ matrix.cmd }}
         run: |
           for apt_file in `grep -lr microsoft /etc/apt/sources.list.d/`; do sudo rm $apt_file; done
-          # Enforcing CPython 3.6
-          bash build_tools.bash 33_build_manylinux cp36 # && bash build_tools.bash 11_send_to_pypi
+          bash build_tools.bash 33_build_manylinux # && bash build_tools.bash 11_send_to_pypi
       - name: upload wheelhouse as artifact
         uses: actions/upload-artifact@v2
         with:

diff --git a/0812repair/repair.bash b/0812repair/repair.bash
diff --git a/0812repair/requirements.txt b/0812repair/requirements.txt
diff --git a/docs/index.rst b/docs/index.rst
@@ -2,7 +2,7 @@ Welcome to gmic-py's documentation!
 ===================================
 ``gmic-py`` is a Python 3 binding for the `G'MIC Image Processing Framework <https://gmic.eu/>`_ written in C++.
 
-``gmic`` is the package name of `gmic-py on pypi.org <https://pypi.org/project/gmic/>`_, so you should ``pip install gmic``.
+``gmic`` is the package name of `gmic-py on pypi.org <https://pypi.org/project/gmic/>`_, so you should ``pip install gmic`` (see :doc:`installing`).
 
 G'MIC provides image-processing commands for 1D to 4D images, as well as many graphical filters.
 It is thus targetted at both artists and data-scientists.
@@ -15,20 +15,9 @@ This documentation showcases various uses of ``gmic-py``:
 * with `Numpy <https://numpy.org/>`_,
 * with the `Python Imaging Library (PIL) <https://python-pillow.org/>`_,
 * with `scikit-image <https://scikit-image.org/>`_,
-* (soon) with `pygame <https://www.pygame.org/>`_,
+* (soon) with `pygame <https://www.pygame.org/>`_ and `Tkinter <https://wiki.python.org/moin/TkInter>`_,
 * (soon) with `p5 processing for Python <https://pypi.org/project/p5/>`_.
 
-For Linux and generally, ``gmic-py`` can be installed for Python >= 3.6 using:
-
-.. code-block:: sh
-
-    pip install gmic
-
-MacOS works the same but needs `libomp` on top.
-Windows will be supported in the third quarter of 2020.
-
-Head over to the :doc:`installing` section for more setup details.
-
 Head over to the :doc:`gettingstarted` section for examples.
 
 .. toctree::

diff --git a/docs/installing.rst b/docs/installing.rst
@@ -1,6 +1,12 @@
 Installing
 ===============
-Here is how to install the gmic-py binary Python module on your OS.
+Here is how to install the ``gmic-py`` binary Python module on your operating system.
+
+For now only Mac OS (till 2.8.3) and Linux / Unix (2.9.x) are supported.
+
+For ``sp`` / ``sample`` and ``update`` commands to work, the `curl <https://curl.se/>`_ executable must be installed (highly likely).
+
+If you cannot install anything on your machine, you may also install ``gmic-py`` from a Jupyter Notepad or Google Colab, see :doc:`jupyter`
 
 For Linux / Unix
 #########################

diff --git a/docs/jupyter.rst b/docs/jupyter.rst
@@ -84,4 +84,4 @@ The core tricks of `gmic-py`'s support for IPython-based web-based graphical she
 
 For desktop UI implementations such as `Jupyter QtConsole <https://jupyter.org/qtconsole/stable/>`_, since your operating systems' `DISPLAY` environment variable is set, above point 1. is still relevant, but the G'MIC native display will probably pop up instead of the `PNG` trick.
 
-The Jupyter support in `gmic-py` can be disabled before module compilation by unsetting the `gmic_py_jupyter_ipython_display` compiler variable. See `setup.py <https://github.com/myselfhimself/gmic-py/blob/13c3b72f1de2f759bc830a048f24bf55b11c3d0e/setup.py#L32>`_.
+The Jupyter support in `gmic-py` can be disabled before module compilation by unsetting the `gmic_py_jupyter_ipython_display` compiler variable. See `setup.py <https://github.com/myselfhimself/gmic-py/blob/13c3b72f1de2f759bc830a048f24bf55b11c3d0e/setup.py#L32>`_.
diff --git a/manylinux/build-wheels.sh b/manylinux/build-wheels.sh
@@ -9,8 +9,7 @@ PYBIN_PREFIX=${PYBIN_PREFIX:-cp3}
 
 # Install a system package required by our library
 yum check-update || { echo "yum check-update failed but manylinux build-wheels script will continue" ; }
-yum reinstall ca-certificates -y # prevent libcurl CA 77 certificate error
-yum install fftw-devel curl-devel openssl-devel nss-softokn-devel libcurl-devel libpng-devel zlib-devel libgomp libtiff-devel libjpeg-devel wget zip unzip -y || { echo "Fatal yum dependencies install error" ; exit 1; }
+yum install fftw-devel libpng-devel zlib-devel libgomp libtiff-devel libjpeg-devel wget -y || { echo "Fatal yum dependencies install error" ; exit 1; }
 
 cd /io/
 
@@ -41,8 +40,5 @@ cd /io/wheelhouse
 # Bundle external shared libraries into the wheels
 for whl in *gmic*$PYBIN_PREFIX*-linux*.whl; do
     which auditwheel
-    #auditwheel -v repair "$whl" --plat $PLAT -w /io/wheelhouse/  2>&1 | tee -a /io/REPAIRLOG || { echo "Fatal auditwheel repair error" ; exit 1; }
-    # 2nd repair pass
-    #bash ../0812repair/repair.bash $(echo $whl | sed -e 's/linux/manylinux2014/') gmic.libs
-    bash ../0812repair/repair.bash $whl .
+    auditwheel -v repair "$whl" --plat $PLAT -w /io/wheelhouse/  2>&1 | tee -a /io/REPAIRLOG || { echo "Fatal auditwheel repair error" ; exit 1; }
 done