Merge branch 'master' into klenotiw/add-reason-to-stale-close

Author: mkevinosullivan

.github/workflows/build.yml

@@ -1,12 +1,12 @@
 name: CI
-on: [push]
+on: [push, pull_request]
 jobs:
   build:
     runs-on: ubuntu-latest
     name: Python ${{ matrix.version }}
     strategy:
       matrix:
-        version: [3.7, 3.10.0]
+        version: ["3.7", "3.10"]
 
     steps:
       - name: Checkout

.pre-commit-config.yaml

@@ -1,16 +1,16 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
--   repo: https://github.com/pre-commit/pre-commit-hooks
+  - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v3.4.0
     hooks:
-    -   id: end-of-file-fixer
-    -   id: trailing-whitespace
--   repo: https://github.com/psf/black
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+  - repo: https://github.com/psf/black
     rev: 22.3.0
     hooks:
-    -   id: black
--   repo: https://github.com/PyCQA/pylint
-    rev: pylint-2.15.8
+      - id: black
+  - repo: https://github.com/PyCQA/pylint
+    rev: v2.15.8
     hooks:
-    -   id: pylint
+      - id: pylint

CHANGELOG

@@ -1,5 +1,8 @@
 == Unreleased
 
+== Version 12.1.0
+- Add API version with 2022-10 release
+
 == Version 12.0.1
 - Allow up to 10 seconds clock skew to avoid `ImmatureSignatureError`
 ([#609](https://github.com/Shopify/shopify_python_api/pull/609))

shopify/api_version.py

@@ -31,6 +31,7 @@ def define_known_versions(cls):
         cls.define_version(Release("2022-01"))
         cls.define_version(Release("2022-04"))
         cls.define_version(Release("2022-07"))
+        cls.define_version(Release("2022-10"))
 
     @classmethod
     def clear_defined_versions(cls):

shopify/base.py

@@ -17,9 +17,6 @@
 class ShopifyConnection(pyactiveresource.connection.Connection):
     response = None
 
-    def __init__(self, site, user=None, password=None, timeout=None, format=formats.JSONFormat):
-        super(ShopifyConnection, self).__init__(site, user, password, timeout, format)
-
     def _open(self, *args, **kwargs):
         self.response = None
         try:

shopify/version.py

@@ -1 +1 @@
-VERSION = "12.0.1"
+VERSION = "12.1.0"

test/base_test.py

@@ -17,9 +17,6 @@ def setUpClass(self):
     def tearDownClass(self):
         shopify.ApiVersion.clear_defined_versions()
 
-    def setUp(self):
-        super(BaseTest, self).setUp()
-
     def tearDown(self):
         shopify.ShopifyResource.clear_session()
 

test/marketing_event_test.py

@@ -4,9 +4,6 @@
 
 
 class MarketingEventTest(TestCase):
-    def setUp(self):
-        super(MarketingEventTest, self).setUp()
-
     def test_get_marketing_event(self):
         self.fake("marketing_events/1", method="GET", body=self.load_fixture("marketing_event"))
         marketing_event = shopify.MarketingEvent.find(1)