Skip to content

Commit 8f686b4

Browse files
authored
Merge pull request #624 from Shopify/trigger-ci-on-pr-open
Fix triggering CI for open source PRs
2 parents e02f080 + 8d248d6 commit 8f686b4

File tree

5 files changed

+10
-19
lines changed

5 files changed

+10
-19
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
name: CI
2-
on: [push]
2+
on: [push, pull_request]
33
jobs:
44
build:
55
runs-on: ubuntu-latest
66
name: Python ${{ matrix.version }}
77
strategy:
88
matrix:
9-
version: [3.7, 3.10.0]
9+
version: ["3.7", "3.10"]
1010

1111
steps:
1212
- name: Checkout

.pre-commit-config.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# See https://pre-commit.com for more information
22
# See https://pre-commit.com/hooks.html for more hooks
33
repos:
4-
- repo: https://github.com/pre-commit/pre-commit-hooks
4+
- repo: https://github.com/pre-commit/pre-commit-hooks
55
rev: v3.4.0
66
hooks:
7-
- id: end-of-file-fixer
8-
- id: trailing-whitespace
9-
- repo: https://github.com/psf/black
7+
- id: end-of-file-fixer
8+
- id: trailing-whitespace
9+
- repo: https://github.com/psf/black
1010
rev: 22.3.0
1111
hooks:
12-
- id: black
13-
- repo: https://github.com/PyCQA/pylint
14-
rev: pylint-2.7.2
12+
- id: black
13+
- repo: https://github.com/PyCQA/pylint
14+
rev: v2.15.8
1515
hooks:
16-
- id: pylint
16+
- id: pylint

shopify/base.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
class ShopifyConnection(pyactiveresource.connection.Connection):
1818
response = None
1919

20-
def __init__(self, site, user=None, password=None, timeout=None, format=formats.JSONFormat):
21-
super(ShopifyConnection, self).__init__(site, user, password, timeout, format)
22-
2320
def _open(self, *args, **kwargs):
2421
self.response = None
2522
try:

test/base_test.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ def setUpClass(self):
1717
def tearDownClass(self):
1818
shopify.ApiVersion.clear_defined_versions()
1919

20-
def setUp(self):
21-
super(BaseTest, self).setUp()
22-
2320
def tearDown(self):
2421
shopify.ShopifyResource.clear_session()
2522

test/marketing_event_test.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44

55

66
class MarketingEventTest(TestCase):
7-
def setUp(self):
8-
super(MarketingEventTest, self).setUp()
9-
107
def test_get_marketing_event(self):
118
self.fake("marketing_events/1", method="GET", body=self.load_fixture("marketing_event"))
129
marketing_event = shopify.MarketingEvent.find(1)

0 commit comments

Comments
 (0)