Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use ZMQ sockets to communicate results of pytest run #114

Merged
merged 6 commits into from
Mar 3, 2018
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ env:
- TEST_CI="True"
- TEST_CI_APP="True"
# Environment variables used by astropy helpers
- CONDA_DEPENDENCIES="lxml mock nose pytest spyder"
- CONDA_DEPENDENCIES="lxml mock nose pytest spyder zmq"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pyzmq

- PIP_DEPENDENCIES="coveralls pytest-qt"

matrix:
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ matrix:

branches:
only:
- master
- master

environment:
global:
Expand All @@ -18,7 +18,7 @@ environment:
PYTHON_ARCH: "64" # needs to be set for CMD_IN_ENV to succeed. If a mix
# of 32 bit and 64 bit builds are needed, move this
# to the matrix section.
CONDA_DEPENDENCIES: "lxml mock nose pytest spyder"
CONDA_DEPENDENCIES: "lxml mock nose pytest spyder zmq"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pyzmq

PIP_DEPENDENCIES_2: "coveralls pytest-qt" # Fix when fixed upstream

matrix:
Expand Down
4 changes: 2 additions & 2 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ machine:
COVERALLS_REPO_TOKEN: c5Qt1n27dLFCAIESYVkuCmVpUU8doney1
# Environment variables used by astropy helpers
TRAVIS_OS_NAME: "linux"
CONDA_DEPENDENCIES: "lxml mock nose pytest"
CONDA_DEPENDENCIES: "lxml mock nose pytest zmq"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pyzmq

PIP_DEPENDENCIES: "coveralls pytest-qt"

dependencies:
override:
# First convert PY_VERSIONS to an array and then select the python version based on the CIRCLE_NODE_INDEX
- export PY_VERSIONS=($PY_VERSIONS) &&
export TRAVIS_PYTHON_VERSION=${PY_VERSIONS[$CIRCLE_NODE_INDEX]} &&
export TRAVIS_PYTHON_VERSION=${PY_VERSIONS[$CIRCLE_NODE_INDEX]} &&
echo -e "PYTHON = $TRAVIS_PYTHON_VERSION \n============" &&
git clone git://github.com/astropy/ci-helpers.git &&
source ci-helpers/travis/setup_conda_$TRAVIS_OS_NAME.sh &&
Expand Down
1 change: 1 addition & 0 deletions conda.recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ requirements:
- lxml
- python
- spyder >=3
- zmq
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pyzmq


test:
imports:
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def get_package_data(name, extlist):


# Requirements
REQUIREMENTS = ['lxml', 'spyder>=3']
REQUIREMENTS = ['lxml', 'spyder>=3', 'zmq']
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Python package is called pyzmq, not zmq

EXTLIST = ['.jpg', '.png', '.json', '.mo', '.ini']
LIBNAME = 'spyder_unittest'

Expand Down
2 changes: 2 additions & 0 deletions spyder_unittest/backend/zmqstream.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
process can then use the stream to send its result to the reader.
"""

from __future__ import print_function

# Standard library imports
import sys

Expand Down