diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..cf459a8 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,41 @@ +name: CI + +on: + push: + branches-ignore: + - "dependabot/**" + pull_request: + +jobs: + build_and_test_pinned: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest] + python-version: ['3.7', '3.8', '3.9', '3.10'] # 'pypy-3.7' + steps: + - uses: actions/checkout@v3 + - name: Setup Python + uses: actions/setup-python@v3 + with: + python-version: ${{ matrix.python-version }} + cache: 'pip' + cache-dependency-path: 'requirements-dev.txt' + - run: pip install . -r requirements-dev.txt + - run: make test + - run: make lint + + build_and_test_latest: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest] + python-version: ['3.11'] + steps: + - uses: actions/checkout@v3 + - name: Setup Python + uses: actions/setup-python@v3 + with: + python-version: ${{ matrix.python-version }} + - run: pip install . -r requirements-dev.in + - run: make test diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 223881f..0000000 --- a/.travis.yml +++ /dev/null @@ -1,34 +0,0 @@ -language: python -dist: focal - -git: - depth: 1 - -env: - global: - - REQUIREMENTS=requirements-dev.txt - - LINT="make lint" - -jobs: - include: - - python: 3.6 - - python: 3.7 - - python: 3.8 - - python: 3.9 - - python: pypy3 - env: REQUIREMENTS=requirements-min.txt LINT="" - - name: "latest deps" - python: 3.9 - env: UPGRADE="pip install --upgrade trio wsproto" - -install: - - pip install -r $REQUIREMENTS - - $UPGRADE - - pip install -e . - -script: - - make test - - $LINT - -after_success: - - make coverage diff --git a/Makefile b/Makefile index b496fff..5991028 100644 --- a/Makefile +++ b/Makefile @@ -4,9 +4,6 @@ PYTHON = python # product: .PHONY: docs -coverage: - $(PYTHON) -m coveralls -v - docs: $(MAKE) -C docs html diff --git a/README.md b/README.md index 9695948..2098c1e 100644 --- a/README.md +++ b/README.md @@ -15,9 +15,7 @@ available here](https://trio-websocket.readthedocs.io). [![PyPI](https://img.shields.io/pypi/v/trio-websocket.svg?style=flat-square)](https://pypi.org/project/trio-websocket/) ![Python Versions](https://img.shields.io/pypi/pyversions/trio-websocket.svg?style=flat-square) -![MIT License](https://img.shields.io/github/license/HyperionGray/trio-websocket.svg?style=flat-square) -[![Build Status](https://img.shields.io/travis/com/HyperionGray/trio-websocket.svg?style=flat-square&branch=master)](https://travis-ci.com/HyperionGray/trio-websocket) -[![Coverage](https://img.shields.io/coveralls/github/HyperionGray/trio-websocket.svg?style=flat-square)](https://coveralls.io/github/HyperionGray/trio-websocket?branch=master) +[![Build Status](https://img.shields.io/github/actions/workflow/status/HyperionGray/trio-websocket/ci.yml)](https://github.com/HyperionGray/trio-websocket/actions/workflows/ci.yml) [![Read the Docs](https://img.shields.io/readthedocs/trio-websocket.svg)](https://trio-websocket.readthedocs.io) ## Alternatives diff --git a/requirements-dev.in b/requirements-dev.in index 6a288ca..db2eb92 100644 --- a/requirements-dev.in +++ b/requirements-dev.in @@ -1,5 +1,4 @@ attrs>=19.2.0 -coveralls pip-tools>=5.5.0 pylint pytest>=4.6 diff --git a/requirements-dev.txt b/requirements-dev.txt index 52a4dc3..11b2559 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -34,16 +34,11 @@ click==8.1.3 # via pip-tools coverage[toml]==6.5.0 # via - # coveralls # pytest-cov -coveralls==3.3.1 - # via -r requirements-dev.in cryptography==39.0.2 # via trustme dill==0.3.6 # via pylint -docopt==0.6.2 - # via coveralls docutils==0.18.1 # via # readme-renderer @@ -138,7 +133,6 @@ readme-renderer==37.3 # via twine requests==2.28.2 # via - # coveralls # requests-toolbelt # sphinx # twine diff --git a/requirements-min.txt b/requirements-min.txt index 2b42b21..85db5b2 100644 --- a/requirements-min.txt +++ b/requirements-min.txt @@ -29,16 +29,11 @@ contextvars==2.4 # trio coverage[toml]==6.2 # via - # coveralls # pytest-cov -coveralls==3.3.1 - # via -r requirements-dev.in cryptography==3.3.2 # via trustme dataclasses==0.8 # via wsproto -docopt==0.6.2 - # via coveralls h11==0.12.0 # via wsproto idna==3.3 @@ -83,8 +78,6 @@ pytest-cov==3.0.0 # via -r requirements-dev.in pytest-trio==0.7.0 # via -r requirements-dev.in -requests==2.27.1 - # via coveralls sniffio==1.2.0 # via trio sortedcontainers==2.4.0 diff --git a/setup.py b/setup.py index ab84d41..ac8a1f6 100644 --- a/setup.py +++ b/setup.py @@ -32,6 +32,8 @@ 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', 'Programming Language :: Python :: Implementation :: CPython', 'Programming Language :: Python :: Implementation :: PyPy', ],