Merge pull request #578 from Shopify/api_version_2022-04

Add version 2022-04, remove 2020-10-2021-04

Author: mllemango

.pre-commit-config.yaml

@@ -7,7 +7,7 @@ repos:
     -   id: end-of-file-fixer
     -   id: trailing-whitespace
 -   repo: https://github.com/psf/black
-    rev: 20.8b1
+    rev: 22.3.0
     hooks:
     -   id: black
 -   repo: https://github.com/PyCQA/pylint

CHANGELOG

@@ -1,4 +1,6 @@
 == Unreleased
+- Update API version with 2022-04 release
+- remove API version 2020-10, 2021-01, 2021-04 as they are all unsupported as of 2022-04
 
 == Version 10.0.0
 - Update API version with 2022-01 release, remove API version 2020-07

shopify/api_version.py

@@ -27,12 +27,10 @@ def define_version(cls, version):
     @classmethod
     def define_known_versions(cls):
         cls.define_version(Unstable())
-        cls.define_version(Release("2020-10"))
-        cls.define_version(Release("2021-01"))
-        cls.define_version(Release("2021-04"))
         cls.define_version(Release("2021-07"))
         cls.define_version(Release("2021-10"))
         cls.define_version(Release("2022-01"))
+        cls.define_version(Release("2022-04"))
 
     @classmethod
     def clear_defined_versions(cls):

shopify/yamlobjects.py

@@ -15,6 +15,5 @@ class YAMLHashWithIndifferentAccess(yaml.YAMLObject):
         def from_yaml(cls, loader, node):
             return loader.construct_mapping(node, cls)
 
-
 except ImportError:
     pass

test/base_test.py

@@ -107,7 +107,7 @@ def test_setting_with_user_and_pass_strips_them(self):
             url="https://this-is-my-test-show.myshopify.com/admin/shop.json",
             method="GET",
             body=self.load_fixture("shop"),
-            headers={"Authorization": u"Basic dXNlcjpwYXNz"},
+            headers={"Authorization": "Basic dXNlcjpwYXNz"},
         )
         API_KEY = "user"
         PASSWORD = "pass"