Merge branch 'master' into bugfix_typos

timgates42 · web-flow · commit a141825f0fb8 · 2021-10-17T09:49:36.000+11:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -6,7 +6,7 @@ jobs:
     name: Python ${{ matrix.version }}
     strategy:
       matrix:
-        version: [2.7, 3.6, 3.8, 3.9]
+        version: [3.6, 3.10.0]
 
     steps:
       - name: Checkout
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,10 @@
 == Unreleased
 
+== Version 9.0.0
+
+- Drop Python 2 support ([#549](https://github.com/Shopify/shopify_python_api/pull/549))
+- Update API version with 2021-10 release, remove API version 2020-04 ([#548](https://github.com/Shopify/shopify_python_api/pull/548))
+
 == Version 8.4.2
 - Update API version with 2021-07 release, remove API version 2020-01 ([#521](https://github.com/Shopify/shopify_python_api/pull/521))
 
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ pip install --upgrade ShopifyAPI
   - [Public and Custom Apps](#public-and-custom-apps)
   - [Private Apps](#private-apps)
 - [Billing](#billing)
-- [Session Tokens](docs/session-tokens)
+- [Session Tokens](docs/session-tokens.md)
 - [Handling Access Scope Operations](docs/api-access.md)
 - [Advanced Usage](#advanced-usage)
 - [Prefix Options](#prefix-options)
@@ -234,3 +234,6 @@ Currently there is no support for:
 * [developers.shopify.com](https://developers.shopify.com)
 * [Shopify.dev](https://shopify.dev)
 * [Ask questions on the Shopify forums](http://ecommerce.shopify.com/c/shopify-apis-and-technology)
+
+### Sample apps built using this library
+* [Sample Django app](https://github.com/shopify/sample-django-app)
diff --git a/setup.py b/setup.py
@@ -23,8 +23,7 @@
     license="MIT License",
     install_requires=[
         "pyactiveresource>=2.2.2",
-        "PyJWT <= 1.7.1; python_version == '2.7'",
-        "PyJWT >= 2.0.0; python_version >= '3.6'",
+        "PyJWT >= 2.0.0",
         "PyYAML",
         "six",
     ],
@@ -39,8 +38,6 @@
         "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.4",
         "Programming Language :: Python :: 3.5",
diff --git a/shopify/api_version.py b/shopify/api_version.py
@@ -27,12 +27,12 @@ def define_version(cls, version):
     @classmethod
     def define_known_versions(cls):
         cls.define_version(Unstable())
-        cls.define_version(Release("2020-04"))
         cls.define_version(Release("2020-07"))
         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"))
 
     @classmethod
     def clear_defined_versions(cls):
diff --git a/shopify/version.py b/shopify/version.py
@@ -1 +1 @@
-VERSION = "8.4.2"
+VERSION = "9.0.0"
