Repository: incubator-senssoft-userale-pyqt5 Updated Branches: refs/heads/master 0e8d0798a -> 2485e8016
Incorporated docker test build Project: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-userale-pyqt5/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-userale-pyqt5/commit/2485e801 Tree: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-userale-pyqt5/tree/2485e801 Diff: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-userale-pyqt5/diff/2485e801 Branch: refs/heads/master Commit: 2485e801621139daff03d08c46d5ca083ee71ba3 Parents: 0e8d079 Author: mooshu1x2 <mbe...@draper.com> Authored: Thu Oct 20 09:15:13 2016 -0400 Committer: mooshu1x2 <mbe...@draper.com> Committed: Thu Oct 20 09:15:13 2016 -0400 ---------------------------------------------------------------------- Dockerfile | 33 --------------------------------- docker-compose.yml | 29 +++++++++++++++++++++++++++++ docker/dev/Dockerfile | 30 ++++++++++++++++++++++++++++++ docker/test/Dockerfile | 35 +++++++++++++++++++++++++++++++++++ requirements.txt | 2 +- setup.py | 2 +- 6 files changed, 96 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-senssoft-userale-pyqt5/blob/2485e801/Dockerfile ---------------------------------------------------------------------- diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 96fa80a..0000000 --- a/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Ubuntu Xenial 16.04 [LTS] -FROM ubuntu:16.04 - -# Install Deps -RUN apt-get update -yqq && \ - apt-get install -yqq python3-dev python3-pip qt5-default && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -COPY requirements.txt /opt/userale - -WORKDIR /opt - -# Install requirements -RUN pip3 install -r requirements.txt - -#CMD ["python", "./setup.py", "develop"] - http://git-wip-us.apache.org/repos/asf/incubator-senssoft-userale-pyqt5/blob/2485e801/docker-compose.yml ---------------------------------------------------------------------- diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..d2592ed --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,29 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Apache UserALE.PyQt5 Docker build + +version: "2" +services: + dev: + build: + context: . + dockerfile: ./docker/dev/Dockerfile + container_name: dev + test: + build: + context: . + dockerfile: ./docker/test/Dockerfile + container_name: test \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-senssoft-userale-pyqt5/blob/2485e801/docker/dev/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile new file mode 100644 index 0000000..af7f463 --- /dev/null +++ b/docker/dev/Dockerfile @@ -0,0 +1,30 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Python 3.5 Base Image +FROM python:3.5 +MAINTAINER Michelle Beard <msbe...@apache.org> + +RUN mkdir /code +WORKDIR /code + +ADD requirements.txt /code + +# Install requirements +RUN pip3 install -r requirements.txt + +ADD . /code/ + +RUN python3 setup.py develop || exit 0 http://git-wip-us.apache.org/repos/asf/incubator-senssoft-userale-pyqt5/blob/2485e801/docker/test/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/test/Dockerfile b/docker/test/Dockerfile new file mode 100644 index 0000000..9adb6fa --- /dev/null +++ b/docker/test/Dockerfile @@ -0,0 +1,35 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Python 3.5 Base Image +FROM python:3.5 +MAINTAINER Michelle Beard <msbe...@apache.org> + +RUN mkdir /code +WORKDIR /code + +ADD requirements.txt /code +ADD test_requirements.txt /code +ADD docker/test/run_tests.sh /code/run_tests.sh +RUN chmod +x /code/run_tests.sh + +# Install requirements +RUN pip3 install -r requirements.txt +RUN pip3 install -r test_requirements.txt + +ADD . /code/ + +RUN python3 setup.py test || exit 0 +RUN pylint userale/ --msg-template="{path}:{line}: [{msg_id}({symbol}), {obj}] {msg}" > /code/pylint.log || exit 0 http://git-wip-us.apache.org/repos/asf/incubator-senssoft-userale-pyqt5/blob/2485e801/requirements.txt ---------------------------------------------------------------------- diff --git a/requirements.txt b/requirements.txt index 969c527..d9b94db 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,4 +14,4 @@ # limitations under the License. requests>=2.0.0 -pyqt5==5.6 \ No newline at end of file +PyQt5==5.7 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-senssoft-userale-pyqt5/blob/2485e801/setup.py ---------------------------------------------------------------------- diff --git a/setup.py b/setup.py index 10b4290..ecb6120 100644 --- a/setup.py +++ b/setup.py @@ -65,7 +65,7 @@ setup( include_package_data=True, zip_safe=False, tests_require=['pytest>=3.0.0', 'pytest-pylint', 'coverage'], - install_requires=['pyqt5==5.6', 'requests>=2.0.0'], + install_requires=['pyqt5==5.7', 'requests>=2.0.0'], entry_points={ 'console_scripts': [ 'mouse = userale.examples.testapp:test_app',
