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

convert to GitHub Actions, fix Python 3.5.1 and add newer Pythons #108

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
69 changes: 69 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
name: Test

on: [push, pull_request]

jobs:
build:
name: Python ${{ matrix.python-version }}
runs-on: ${{ matrix.os }}
continue-on-error: ${{ matrix.experimental }}
strategy:
fail-fast: false
matrix:
python-version:
- '2.7'
- '3.5'
- '3.6'
- '3.7'
- '3.8'
- '3.9'
experimental:
- false
os: [ubuntu-latest]
include:
# Python 3.4 is not on ubuntu-latest
- python-version: '3.4'
os: ubuntu-18.04
experimental: false

# Python 3.10 is currently failing, but this may be OK
- python-version: '3.10.0-alpha - 3.10'
os: ubuntu-latest
experimental: true

steps:
- uses: actions/checkout@v2

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}

- uses: actions/cache@v2
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
restore-keys: |
${{ runner.os }}-pip-

- name: Install dependencies
id: install
run: |
set -x
pip install -r requirements.txt

# install mypy on Python 3.6+
if python -c \
'import sys; sys.exit(0 if sys.version_info >= (3, 6) else 1)'; then
pip install -U mypy
echo "::set-output name=mypy::true"
fi

- name: Run pytest
run: |
pytest

- name: Run mypy
if: ${{ steps.install.outputs.mypy }}
run: |
mypy pyannotate_*
28 changes: 0 additions & 28 deletions .travis.yml

This file was deleted.

6 changes: 5 additions & 1 deletion pyannotate_tools/fixes/tests/test_annotate_json_py3.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@
import tempfile
import unittest
import sys
from mock import patch

try:
from unittest.mock import patch
except ImportError:
from mock import patch # type: ignore

from lib2to3.tests.test_fixers import FixerTestCase

Expand Down
10 changes: 9 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
mock; python_version < '3.3'
mypy_extensions>=0.3.0
pytest>=3.3.0
pytest>=3.3.0; python_version > '3.5'
# pytest >5.3.0 uses typing.Type from Python 3.5.2
pytest>=3.3.0,<=5.3.0; python_version <= '3.5'
# importlib-metadata is needed for Python 3.5+, but pip does not seem to be
# pinning it to a correct version for Python 3.5 (possibly because it's a
# transitive dependency).
# Python 3.5 support was dropped in importlib-metadata 3.0.0
importlib-metadata>=0.12,<3.0.0; python_version == '3.5'
setuptools>=28.8.0
six>=1.11.0
typing>=3.6.2; python_version < '3.5'