Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: CI
on:
pull_request:
push:
branches:
- master
jobs:
test:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [2.7, 3.6, 3.7, pypy-2.7, pypy-3.7 ]
# 3.8+ fail
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}
- name: Run tox with tox-gh-actions
uses: ymyzk/run-tox-gh-actions@main
17 changes: 0 additions & 17 deletions .travis.yml

This file was deleted.

5 changes: 2 additions & 3 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,5 @@ Before you submit a pull request, check that it meets these guidelines:
2. If the pull request adds functionality, the docs should be updated.
Put your new functionality into a function with a docstring,
and add the feature to the list in README.rst.
3. The pull request should work for Python 2.7, 3.4, and for PyPy.
Check https://travis-ci.org/dealertrack/django-rest-framework-braces/pull_requests
and make sure that the tests pass for all supported Python versions.
3. The pull request should work for Python 2.7, 3.6, and for PyPy.
Make sure that the tests pass for all supported Python versions.
3 changes: 0 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ Django Rest Framework Braces
.. image:: https://badge.fury.io/py/django-rest-framework-braces.png
:target: http://badge.fury.io/py/django-rest-framework-braces

.. image:: https://travis-ci.org/dealertrack/django-rest-framework-braces.svg?branch=master
:target: https://travis-ci.org/dealertrack/django-rest-framework-braces

.. image:: https://coveralls.io/repos/dealertrack/django-rest-framework-braces/badge.svg
:target: https://coveralls.io/r/dealertrack/django-rest-framework-braces

Expand Down
1 change: 0 additions & 1 deletion tests/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
'drf_braces',
'tests',

'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.messages',
Expand Down
25 changes: 23 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,13 +1,28 @@
[tox]
envlist =
{py27,py36,pypy}-django{11}-drf{latest}
{py36,py37}-django{latest}-drf{latest}
{py27,py36,pypy}-django{11}-drf{2,latest} # latest djangorestframework = 3.9.4
{py36,py37,pypy3}-django{2,3}-drf{310,312,latest}
{py38,py39,py310}-django{3,latest}-drf{310,312}

[gh-actions]
python =
2.7: py27-django11-drflatest
3.6: py36-django2-drf312
3.7: py37-django2-drf312
3.8: py38
3.9: py39
3.10: py310
pypy-2: pypy-django11-drflatest
pypy-3: pypy3-django2-drf312

[testenv]
basepython =
py27: python2.7
py36: python3.6
py37: python3.7
py38: python3.8
py39: python3.9
py310: python3.10
pypy: pypy
pypy3: pypy3
setenv =
Expand All @@ -18,7 +33,13 @@ commands =
make check
deps =
django11: django<2.0
django2: django>=2,<3.0
django3: django>=3,<4.0
djangolatest: django
drf2: djangorestframework>=2,<3.0
drf310: djangorestframework>=3.10,<3.11
drf312: djangorestframework>=3.12,<3.13
drf312: djangorestframework>=3.12,<3.13
drflatest: djangorestframework
whitelist_externals =
make