Merge branch 'master' into NabeelAhsen-add-sample-django-app-to-readme

Author: andyw8

.github/dependabot.yml

@@ -0,0 +1,14 @@
+version: 2
+updates:
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "daily"
+      time: "00:00"
+      timezone: "UTC"
+    reviewers:
+        - Shopify/core-build-learn
+    labels:
+      - "Pip upgrades"
+    open-pull-requests-limit: 100
+    registries: '*'

.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
@@ -26,6 +26,5 @@ jobs:
       - name: upload coverage to Codecov
         uses: codecov/codecov-action@v1
         with:
-          token: ${{ secrets.CODECOV_TOKEN }}
           name: codecov-umbrella
           fail_ci_if_error: true

CHANGELOG

@@ -1,5 +1,10 @@
 == Unreleased
 
+- Drop Python 2 support ([#549](https://github.com/Shopify/shopify_python_api/pull/549))
+
+== 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))
+
 == Version 8.4.1
 - Bug fix: `sanitize_shop_domain` now returns `None` rather than `'none.myshopify.com'` if no `shop_domain` arg is passed in ([#499](https://github.com/Shopify/shopify_python_api/pull/499))
 

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)

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",

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-01"))
         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"))
 
     @classmethod
     def clear_defined_versions(cls):

shopify/version.py

@@ -1 +1 @@
-VERSION = "8.4.1"
+VERSION = "8.4.2"