From 363e6672fbc6a050499be7707b22c4dfbc5c9cca Mon Sep 17 00:00:00 2001 From: biozz Date: Thu, 6 Aug 2020 19:32:08 +0300 Subject: [PATCH 1/2] Add windows-curses dependency for Windows Closes #1100. --- setup.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index db7319816..47b45d4e4 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,12 @@ raise SystemExit("Circus requires Python 3.5 or higher.") -install_requires = ['psutil', 'pyzmq>=17.0', 'tornado>=5.0.2'] +install_requires = [ + 'psutil', + 'pyzmq>=17.0', + 'tornado>=5.0.2', + 'windows-curses>=2.10;platform_system=="Windows"', +] try: import argparse # NOQA From 2bd1ab18375f2d83b1cd091c2fbd332d2f030471 Mon Sep 17 00:00:00 2001 From: Leopold Talirz Date: Thu, 6 Aug 2020 20:36:30 +0200 Subject: [PATCH 2/2] move CI to github actions This enables testing on windows and macos. Also: * Update MANIFEST.in --- .github/workflows/ci.yml | 81 ++++++++++++++++++++++++++++++++++++++++ .travis.yml | 47 ----------------------- MANIFEST.in | 3 +- README.md | 6 ++- setup.py | 2 +- 5 files changed, 87 insertions(+), 52 deletions(-) create mode 100644 .github/workflows/ci.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 000000000..1814100b7 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,81 @@ +name: ci + +on: [push, pull_request] + +jobs: + + ubuntu: + runs-on: ubuntu-18.04 + timeout-minutes: 5 + + strategy: + matrix: + python-version: [3.5, 3.6, 3.7, 3.8] + include: + - python-version: 3.5 + tox-env: py35 + - python-version: 3.6 + tox-env: py36 + - python-version: 3.7 + tox-env: py37 + - python-version: 3.8 + tox-env: py38 + + steps: + - uses: actions/checkout@v2 + + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + + - name: Install system dependencies + run: | + sudo rm -f /etc/apt/sources.list.d/dotnetdev.list /etc/apt/sources.list.d/microsoft-prod.list + sudo apt update + sudo apt install libev-dev libevent-dev + + - name: Install test dependencies + run: | + pip install tox coveralls + + - name: Run test suite + run: tox -v -e $TOX_ENV + env: + TOX_ENV: ${{ matrix.tox-env }} + + + multi-os: + # Run tests for one python version on different operating systems + + runs-on: ${{ matrix.os }} + timeout-minutes: 5 + + strategy: + matrix: + os: ['macos-10.15', 'windows-2019'] + + steps: + - uses: actions/checkout@v2 + + - name: Set up Python 3.8 + uses: actions/setup-python@v2 + with: + python-version: 3.8 + + #- name: Install system dependencies + # shell: bash -l {0} + # run: | + # conda install -y -c anaconda postgresql + # initdb -D test_db + # pg_ctl -D test_db start + + - name: Install test dependencies + run: | + pip install tox coveralls + + - name: Run test suite + shell: bash -l {0} + run: tox -v -e $TOX_ENV + env: + TOX_ENV: py38 diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 848409301..000000000 --- a/.travis.yml +++ /dev/null @@ -1,47 +0,0 @@ -dist: xenial -sudo: required - -language: python - -addons: - apt: - packages: - - libev-dev - - libevent-dev - -before_script: - # Add an IPv6 config - see the corresponding Travis issue - # https://github.com/travis-ci/travis-ci/issues/8361 - # Taken from https://github.com/travis-ci/travis-ci/issues/8361#issuecomment-350497804 - - if [ "${TRAVIS_OS_NAME}" == "linux" ]; then - sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'; - fi - -jobs: - include: - - python: 3.8 - env: TOX_ENV=py38 - - python: 3.7 - env: TOX_ENV=py37 - - python: 3.6 - env: TOX_ENV=docs - - python: 3.6 - env: TOX_ENV=flake8 - - python: 3.6 - env: TOX_ENV=py36 - - python: 3.5 - env: TOX_ENV=py35 - -script: - - tox -v -e $TOX_ENV - -install: - - pip install tox coveralls - -after_success: - - coveralls - -notifications: - email: tarek@mozilla.com - irc: "irc.freenode.org#mozilla-circus" - on_success: change diff --git a/MANIFEST.in b/MANIFEST.in index 8999e6614..ab18e3463 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,3 @@ include CONTRIBUTORS.txt -include README.rst +include README.md include LICENSE -include pip-requirements.txt diff --git a/README.md b/README.md index cbc8f71d7..390deb196 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,12 @@ +![Build Status](https://github.com/circus-tent/circus/workflows/ci/badge.svg)](https://github.com/circus-tent/circus/actions) +[![Coverage Status](https://coveralls.io/repos/github/circus-tent/circus/badge.svg?branch=master)](https://coveralls.io/github/circus-tent/circus?branch=master) +![PyPI](https://img.shields.io/pypi/v/circus) +![PyPI - Downloads](https://img.shields.io/pypi/dm/circus) # Circus Circus is a program that runs and watches processes and sockets. Circus can be used as a library or through the command line. -![Build Status](https://secure.travis-ci.org/circus-tent/circus.svg?branch=master) [![Coverage Status](https://coveralls.io/repos/github/circus-tent/circus/badge.svg?branch=master)](https://coveralls.io/github/circus-tent/circus?branch=master) ![PyPI](https://img.shields.io/pypi/v/circus) ![PyPI - Downloads](https://img.shields.io/pypi/dm/circus) - ## Links - [Full Documentation](https://circus.readthedocs.io) diff --git a/setup.py b/setup.py index 47b45d4e4..9fe293a40 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ 'psutil', 'pyzmq>=17.0', 'tornado>=5.0.2', - 'windows-curses>=2.10;platform_system=="Windows"', + 'windows-curses>=2.1.0;platform_system=="Windows"', ] try: