Skip to content

Commit 3b54105

Browse files
Merge pull request #1256 from allmightyspiff/master
Adding more github action tests, removing travis CI tests
2 parents c3dfc35 + 37eb878 commit 3b54105

File tree

6 files changed

+63
-33
lines changed

6 files changed

+63
-33
lines changed

.github/workflows/documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: softlayer
1+
name: documentation
22

33
on:
44
push:

.github/workflows/tests.yml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
name: Tests
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
pull_request:
7+
branches: [ master ]
8+
jobs:
9+
test:
10+
runs-on: ubuntu-latest
11+
strategy:
12+
matrix:
13+
python-version: [3.5,3.6,3.7,3.8]
14+
15+
steps:
16+
- uses: actions/checkout@v2
17+
- name: Set up Python ${{ matrix.python-version }}
18+
uses: actions/setup-python@v1
19+
with:
20+
python-version: ${{ matrix.python-version }}
21+
- name: Install dependencies
22+
run: |
23+
python -m pip install --upgrade pip
24+
pip install -r tools/test-requirements.txt
25+
- name: Tox Test
26+
run: tox -e py
27+
coverage:
28+
runs-on: ubuntu-latest
29+
steps:
30+
- uses: actions/checkout@v2
31+
- name: Set up Python
32+
uses: actions/setup-python@v1
33+
with:
34+
python-version: 3.8
35+
- name: Install dependencies
36+
run: |
37+
python -m pip install --upgrade pip
38+
pip install -r tools/test-requirements.txt
39+
- name: Tox Coverage
40+
run: tox -e coverage
41+
analysis:
42+
runs-on: ubuntu-latest
43+
steps:
44+
- uses: actions/checkout@v2
45+
- name: Set up Python
46+
uses: actions/setup-python@v1
47+
with:
48+
python-version: 3.8
49+
- name: Install dependencies
50+
run: |
51+
python -m pip install --upgrade pip
52+
pip install -r tools/test-requirements.txt
53+
- name: Tox Analysis
54+
run: tox -e analysis

.travis.yml

Lines changed: 0 additions & 27 deletions
This file was deleted.

README.rst

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
SoftLayer API Python Client
22
===========================
3-
.. image:: https://travis-ci.org/softlayer/softlayer-python.svg?branch=master
4-
:target: https://travis-ci.org/softlayer/softlayer-python
3+
.. image:: https://github.com/softlayer/softlayer-python/workflows/Tests/badge.svg
4+
:target: https://github.com/softlayer/softlayer-python/actions?query=workflow%3ATests
5+
6+
.. image:: https://github.com/softlayer/softlayer-python/workflows/documentation/badge.svg
7+
:target: https://github.com/softlayer/softlayer-python/actions?query=workflow%3Adocumentation
58

69
.. image:: https://landscape.io/github/softlayer/softlayer-python/master/landscape.svg
710
:target: https://landscape.io/github/softlayer/softlayer-python/master

SoftLayer/CLI/ticket/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""Support tickets."""
2+
import re
23

34
import click
4-
import re
55

66
from SoftLayer.CLI import formatting
77

@@ -17,7 +17,7 @@
1717
]
1818

1919

20-
def get_ticket_results(mgr, ticket_id, is_json = False, update_count=1):
20+
def get_ticket_results(mgr, ticket_id, is_json=False, update_count=1):
2121
"""Get output about a ticket.
2222
2323
:param integer id: the ticket ID

SoftLayer/CLI/ticket/detail.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def cli(env, identifier, count):
2121
"""Get details for a ticket."""
2222

2323
is_json = False
24-
if (env.format == 'json'):
24+
if env.format == 'json':
2525
is_json = True
2626
mgr = SoftLayer.TicketManager(env.client)
2727

0 commit comments

Comments
 (0)