Skip to content

Commit

Permalink
Some qt decoupling and bump timba ver (#17)
Browse files Browse the repository at this point in the history
* Some qt decoupling and bump timba ver

* Remove py2 testing

* fix test path
  • Loading branch information
bennahugo authored Jan 6, 2021
1 parent c65029c commit c1b15c1
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 43 deletions.
35 changes: 0 additions & 35 deletions .travis/py2.docker

This file was deleted.

6 changes: 3 additions & 3 deletions .travis/py3.docker
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,13 @@ RUN git clone -b v1.5.0 https://github.com/ska-sa/purr.git
RUN git clone -b v1.6.0 https://github.com/ska-sa/owlcat.git
RUN git clone -b v1.4.3 https://github.com/ska-sa/kittens.git
RUN git clone -b v1.6.0 https://github.com/ska-sa/tigger-lsm.git
RUN git clone -b v1.7.0 https://github.com/ska-sa/pyxis.git
RUN git clone -b v1.7.1 https://github.com/ska-sa/pyxis.git

RUN pip3 install ./meqtrees-cattery ./purr ./owlcat ./tigger-lsm
RUN pip3 install -e ./pyxis

WORKDIR /src
RUN git clone -b v1.7.0 https://github.com/ska-sa/meqtrees-timba.git
RUN git clone -b v1.8.0 https://github.com/ska-sa/meqtrees-timba.git
RUN mkdir /src/meqtrees-timba/build
WORKDIR /src/meqtrees-timba/build
RUN cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DENABLE_PYTHON_3=ON ..
Expand All @@ -105,7 +105,7 @@ RUN pyxis --help

# run test when built
RUN pip3 install nose
WORKDIR /src/pyxis/Pyxis/recipies/meqtrees-batch-test
WORKDIR /src/pyxis/Pyxis/recipes/meqtrees-batch-test
RUN python3 -m "nose"

ENTRYPOINT ["meqtree-pipeliner.py"]
Expand Down
1 change: 0 additions & 1 deletion Jenkinsfile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,4 @@ cd $PROJECTS_DIR/meqtrees-kittens
IMAGENAME="mtkittenspr"

# build and test
docker build -f .travis/py2.docker -t "${IMAGENAME}27:$BUILD_NUMBER" --no-cache=true .
docker build -f .travis/py3.docker -t "${IMAGENAME}36:$BUILD_NUMBER" --no-cache=true .
10 changes: 6 additions & 4 deletions Kittens/pixmaps.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,12 @@
# or write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#

from PyQt4.Qt import SIGNAL, QPixmap, QIcon

PYSIGNAL = SIGNAL
try:
from PyQt4.Qt import SIGNAL, QPixmap, QIcon
except ImportError:
class QPixmap:
def __init__(self, *args, **kwargs):
pass

from .utils import verbosity

Expand Down

0 comments on commit c1b15c1

Please sign in to comment.