diff --git a/.github/workflows/cpythonmanylinuxbuild_nosendpypi.yml b/.github/workflows/cpythonmanylinuxbuild_nosendpypi.yml index 43d08082..2ac9c7f8 100644 --- 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 deleted file mode 100644 index 311b5855..00000000 --- a/0812repair/repair.bash +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/bash - -set -x -OUTPUTDIR=$(readlink -f .) -TEMPDIR=$(readlink -f out) -DISTINFODIR="gmic-2.9.1a5.dist-info" -LIBSPATH=$TEMPDIR -EXCLUDEFILEPATH=/tmp/exclude-list-gmic -PIP3=${PIP3:-pip} -PYTHON3=${PYTHON3:-python} -PYARCH="cp$($PYTHON3 --version | sed -e 's/[a-z .]*//gi' | cut -c1-2)" - -cat >$EXCLUDEFILEPATH < *.dist-info/RECORD -echo "$DISTINFODIR/RECORD,," >> *.dist-info/RECORD -cat >$DISTINFODIR/WHEEL <`_ written in C++. -``gmic`` is the package name of `gmic-py on pypi.org `_, so you should ``pip install gmic``. +``gmic`` is the package name of `gmic-py on pypi.org `_, 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 `_, * with the `Python Imaging Library (PIL) `_, * with `scikit-image `_, -* (soon) with `pygame `_, +* (soon) with `pygame `_ and `Tkinter `_, * (soon) with `p5 processing for Python `_. -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 index cba3bcf8..cbbc51a8 100644 --- 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 `_ 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 index 490ebaf7..5f0f13b3 100644 --- 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 `_, 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 `_. \ No newline at end of file +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 `_. diff --git a/manylinux/build-wheels.sh b/manylinux/build-wheels.sh index 092279a0..9184a73e 100644 --- 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