Skip to content

Commit

Permalink
Change CI to Github Actions (#67)
Browse files Browse the repository at this point in the history
* Add Github Actions as CI

* Removed travis file, cleaned setup.py, edited readme badge

* Fixed CI start conditions
  • Loading branch information
AngelOnFira authored Jul 9, 2021
1 parent cfc3d20 commit 6886a59
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 56 deletions.
32 changes: 32 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Test

on:
push:
branches: [master]
pull_request:
branches: [master]

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
django-version: [2.2, 3.1, 3.2]

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 dependencies
run: |
pip install -q Django==${{ matrix.django-version }}
pip install -r requirements.txt
pip install tox-gh-actions
- name: Run tests
run: |
tox
30 changes: 0 additions & 30 deletions .travis.yml

This file was deleted.

6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# django-service-objects [![Latest Version][latest-version-image]][latest-version-link]
[![Build Status][build-status-image]][build-status-link]
[![Build Status][build-status-image]][build-status-link]
[![Python Support][python-support-image]][python-support-link]
[![PyPI - Django Version][django-version-image]][django-link]
[![License][license-image]][license-link]
Expand Down Expand Up @@ -159,8 +159,8 @@ If you have any questions about service objects, you can tweet me [@mixxorz](htt

[latest-version-image]: https://img.shields.io/pypi/v/django-service-objects.svg
[latest-version-link]: https://pypi.org/project/django-service-objects/
[build-status-image]: https://img.shields.io/travis/mixxorz/django-service-objects/master.svg
[build-status-link]: https://travis-ci.org/mixxorz/django-service-objects
[build-status-image]: https://github.com/mixxorz/django-service-objects/workflows/Test/badge.svg
[build-status-link]: https://github.com/mixxorz/django-service-objects/actions
[python-support-image]: https://img.shields.io/pypi/pyversions/django-service-objects.svg
[python-support-link]: https://pypi.org/project/django-service-objects/
[django-version-image]: https://img.shields.io/pypi/djversions/django_service_objects.svg
Expand Down
10 changes: 3 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,18 +46,14 @@
'License :: OSI Approved :: MIT License',
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Framework :: Django :: 1.11',
'Framework :: Django :: 2.0',
'Framework :: Django :: 2.1',
'Programming Language :: Python :: 3.9',
'Framework :: Django :: 2.2',
'Framework :: Django :: 3.0',
'Framework :: Django :: 3.1',
'Framework :: Django :: 3.2',
'Topic :: Internet :: WWW/HTTP',
'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
],
Expand Down
25 changes: 9 additions & 16 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,19 @@
[tox]
envlist =
flake8
py{27,35,36,37,38}-django111
py{35,36,37,38}-django20
py{35,36,37,38}-django21
py{35,36,37,38}-django22
py{36,37,38}-django30
py{36,37,38,39}-django22
py{36,37,38,39}-django31
py{36,37,38,39}-django32
celery
docs
skip_missing_interpreters = true

[testenv]
deps =
celery
django111: Django>=1.11,<2.0
django20: Django>=2.0,<2.1
django21: Django>=2.1,<2.2
django22: Django>=2.2,<2.3
django30: Django>=3.0,<3.1
py27: mock
django31: Django>=3.1,<3.2
django32: Django>=3.2,<3.3
commands =
python runtests.py

Expand All @@ -40,13 +35,11 @@ commands = make html
deps = flake8
commands = flake8

[travis:env]
[gh-actions:env]
DJANGO =
1.11: django111
2.0: django20
2.1: django21
2.1: django22
3.0: django30
2.2: django22
3.1: django31
3.2: django32

[flake8]
exclude =
Expand Down

0 comments on commit 6886a59

Please sign in to comment.