Commit 2c1958e6 authored by Matt Wala's avatar Matt Wala
Browse files

Merge branch 'master' into build-in-editable-mode-as-pip-install-workaround

parents d6bdb18d f1ba8067

.pylintrc-default.yml

+4 −0
Original line number Diff line number Diff line
@@ -4,3 +4,7 @@ 
  val: all

- arg: enable

  val: E



# https://github.com/PyCQA/pylint/issues/3381

- arg: disable

  val: E1136

build-and-test-py-project-within-miniconda.sh

+0 −2
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ source build-py-project-within-miniconda.sh 


PY_EXE=python



conda list



TESTABLES=""

if [ -d test ]; then

  cd test

build-py-project-and-run-examples.sh

+2 −9
Original line number Diff line number Diff line
@@ -9,12 +9,5 @@ fi 
curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-py-project.sh

source build-py-project.sh



cd examples

for i in $(find . -name '*.py' -exec grep -q __main__ '{}' \; -print ); do

  echo "-----------------------------------------------------------------------"

  echo "RUNNING $i"

  echo "-----------------------------------------------------------------------"

  dn=$(dirname "$i")

  bn=$(basename "$i")

  (cd $dn; time ${PY_EXE} "$bn")

done
 
curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/run-examples.sh

source run-examples.sh

build-py-project-within-miniconda.sh

+8 −4
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ MINICONDA_VERSION=3 
MINICONDA_INSTALL_DIR=.miniconda${MINICONDA_VERSION}



MINICONDA_INSTALL_SH=Miniconda${MINICONDA_VERSION}-latest-${PLATFORM}-x86_64.sh

curl -O "https://repo.continuum.io/miniconda/$MINICONDA_INSTALL_SH"

curl -O "https://repo.anaconda.com/miniconda/$MINICONDA_INSTALL_SH"



rm -Rf "$MINICONDA_INSTALL_DIR"
@@ -74,7 +74,7 @@ PATH="$MINICONDA_INSTALL_DIR/bin/:$PATH" conda update conda --yes --quiet 


PATH="$MINICONDA_INSTALL_DIR/bin/:$PATH" conda update --all --yes --quiet



PATH="$MINICONDA_INSTALL_DIR/bin:$PATH" conda env create --quiet --file "$CONDA_ENVIRONMENT" --name testing

PATH="$MINICONDA_INSTALL_DIR/bin:$PATH" conda env create --file "$CONDA_ENVIRONMENT" --name testing



source "$MINICONDA_INSTALL_DIR/bin/activate" testing
@@ -88,6 +88,8 @@ export XDG_CACHE_HOME=$HOME/.cache/$CI_RUNNER_ID 


# }}}



conda list



PY_EXE=python



# {{{ install pytest
@@ -109,6 +111,8 @@ if test -f "$REQUIREMENTS_TXT"; then 
  pip install -r "$REQUIREMENTS_TXT"

fi



pip install $PROJECT_INSTALL_FLAGS .

if test -f .conda-ci-build-configure.sh; then

  source .conda-ci-build-configure.sh

fi



conda list
 
pip install $PROJECT_INSTALL_FLAGS .

build-py-project.sh

+11 −4
Original line number Diff line number Diff line
@@ -104,16 +104,23 @@ $PIP install pytest==3.0.4 pytest-warnings==0.2.0 


if test "$EXTRA_INSTALL" != ""; then

  for i in $EXTRA_INSTALL ; do

    if [ "$i" = "numpy" ] && [[ "${PY_EXE}" == pypy* ]]; then

      $PIP install git+https://bitbucket.org/pypy/numpy.git

    elif [[ "$i" = *pybind11* ]] && [[ "${PY_EXE}" == pypy* ]]; then

    # numpypy no longer recommended: https://doc.pypy.org/en/latest/faq.html#should-i-install-numpy-or-numpypy

    # 2020-03-12 AK

    #if [ "$i" = "numpy" ] && [[ "${PY_EXE}" == pypy* ]]; then

    #  $PIP install git+https://bitbucket.org/pypy/numpy.git

    if [[ "$i" = *pybind11* ]] && [[ "${PY_EXE}" == pypy* ]]; then

      # Work around https://github.com/pypa/virtualenv/issues/1198

      # (nominally fixed, but not really it appears. --Mar 28, 2020 AK)

      # Running virtualenv --always-copy or -m venv --copies should also do the trick.

      L=$(readlink .env/include)

      rm .env/include

      cp -R $L .env/include



      $PIP install $i

      # context:

      # https://github.com/conda-forge/pyopencl-feedstock/pull/45

      # https://github.com/pybind/pybind11/pull/2146

      $PIP install git+https://github.com/isuruf/pybind11@pypy3



    elif [ "$i" = "numpy" ] && [[ "${PY_EXE}" == python2.6* ]]; then

      $PIP install 'numpy==1.10.4'

    else