Merge pull request #464 from Shopify/paulinakhew-add-trailing-whitespace-hook

Paulinakhew · web-flow · commit ab102c670578 · 2021-02-19T13:44:13.000-05:00
Add trailing-whitespace hook and run on all files
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,19 +4,19 @@ jobs:
   build:
     runs-on: ubuntu-latest
     name: Python ${{ matrix.version }}
-    strategy: 
+    strategy:
       matrix:
         version: [2.7, 3.6, 3.8, 3.9]
 
-    steps: 
+    steps:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.version }}
       - name: Install Dependencies
-        run: | 
+        run: |
           python -m pip install --upgrade pip
           pip install pytest mock pytest-cov
           python setup.py install
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -9,8 +9,9 @@ jobs:
   pre-commit:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2
-    - uses: pre-commit/action@v2.0.0
-      with:
-        extra_args: end-of-file-fixer --all-files
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Setup
+      uses: actions/setup-python@v2
+    - name: Pre-commit
+      uses: pre-commit/action@v2.0.0
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -5,3 +5,4 @@ repos:
     rev: v3.4.0
     hooks:
     -   id: end-of-file-fixer
+    -   id: trailing-whitespace
diff --git a/CHANGELOG b/CHANGELOG
@@ -4,7 +4,7 @@
 - Add ApplicationCredit resource ([#457](https://github.com/Shopify/shopify_python_api/pull/457))
 
 == Version 8.2.0
-- [Feature] Add support for Dynamic API Versioning. When the library is initialized, it will now make a request to 
+- [Feature] Add support for Dynamic API Versioning. When the library is initialized, it will now make a request to
 Shopify to fetch a list of the available API versions. ([#441](https://github.com/Shopify/shopify_python_api/pull/441))
 
 == Version 8.1.0
diff --git a/README.md b/README.md
@@ -214,4 +214,4 @@ Currently there is no support for:
 * [Partners Dashboard](https://partners.shopify.com)
 * [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) 
+* [Ask questions on the Shopify forums](http://ecommerce.shopify.com/c/shopify-apis-and-technology)
diff --git a/shopify/resources/fulfillment.py b/shopify/resources/fulfillment.py
@@ -26,7 +26,7 @@ class FulfillmentOrders(ShopifyResource):
 class FulfillmentV2(ShopifyResource):
     _singular = 'fulfillment'
     _plural = 'fulfillments'
-    
+
     def update_tracking(self, tracking_info, notify_customer):
         body = {
             "fulfillment": {
diff --git a/test/blog_test.py b/test/blog_test.py
@@ -2,7 +2,7 @@
 from test.test_helper import TestCase
 
 class BlogTest(TestCase):
-    
+
     def test_blog_creation(self):
         self.fake('blogs', method='POST', code=202, body=self.load_fixture('blog'), headers={'Content-type': 'application/json'})
         blog = shopify.Blog.create({'title': "Test Blog"})
diff --git a/test/cart_test.py b/test/cart_test.py
@@ -2,7 +2,7 @@
 from test.test_helper import TestCase
 
 class CartTest(TestCase):
-  
+
   def test_all_should_return_all_carts(self):
     self.fake('carts')
     carts = shopify.Cart.find()
diff --git a/test/checkout_test.py b/test/checkout_test.py
@@ -2,7 +2,7 @@
 from test.test_helper import TestCase
 
 class CheckoutTest(TestCase):
-  
+
   def test_all_should_return_all_checkouts(self):
     self.fake('checkouts')
     checkouts = shopify.Checkout.find()
diff --git a/test/customer_saved_search_test.py b/test/customer_saved_search_test.py
@@ -2,7 +2,7 @@
 from test.test_helper import TestCase
 
 class CustomerSavedSearchTest(TestCase):
-    
+
     def setUp(self):
         super(CustomerSavedSearchTest, self).setUp()
         self.load_customer_saved_search()
diff --git a/test/fixtures/carts.json b/test/fixtures/carts.json
@@ -5,7 +5,7 @@
       "note": null,
       "token": "3eed8183d4281db6ea82ee2b8f23e9cc",
       "updated_at": "2012-02-13T14:39:37-05:00",
-      "line_items": 
+      "line_items":
       [
         {
           "id": 1,
diff --git a/test/fixtures/price_rules.json b/test/fixtures/price_rules.json
@@ -15,7 +15,7 @@
       "prerequisite_shipping_price_range": null,
       "starts_at": "2017-05-30T04:13:56Z",
       "ends_at": null
-    },    
+    },
     {
       "id": 1213132,
       "title": "TENOFF",
diff --git a/test/fulfillment_test.py b/test/fulfillment_test.py
@@ -29,7 +29,7 @@ def test_able_to_complete_fulfillment(self):
         self.assertEqual('pending', fulfillment.status)
         fulfillment.complete()
         self.assertEqual('success', fulfillment.status)
-    
+
     def test_able_to_cancel_fulfillment(self):
         fulfillment = shopify.Fulfillment.find(255858046, order_id=450789469)
 
diff --git a/test/graphql_test.py b/test/graphql_test.py
@@ -11,12 +11,12 @@ def setUp(self):
         shopify.ShopifyResource.activate_session(shopify_session)
         client = shopify.GraphQL()
         self.fake(
-            'graphql', 
-            method='POST', 
-            code=201, 
+            'graphql',
+            method='POST',
+            code=201,
             headers={
                 'X-Shopify-Access-Token': 'token',
-                'Accept': 'application/json', 
+                'Accept': 'application/json',
                 'Content-Type': 'application/json'
                 })
         query = '''
diff --git a/test/shipping_zone_test.py b/test/shipping_zone_test.py
@@ -6,6 +6,5 @@ def test_get_shipping_zones(self):
         self.fake("shipping_zones", method='GET', body=self.load_fixture('shipping_zones'))
         shipping_zones = shopify.ShippingZone.find()
         self.assertEqual(1,len(shipping_zones))
-        self.assertEqual(shipping_zones[0].name,"Some zone")	
+        self.assertEqual(shipping_zones[0].name,"Some zone")
         self.assertEqual(3,len(shipping_zones[0].countries))
-	
diff --git a/test/variant_test.py b/test/variant_test.py
@@ -28,7 +28,7 @@ def test_create_variant_then_add_parent_id(self):
         v = shopify.Variant()
         v.product_id = 632910392
         v.save()
-        
+
     def test_get_variant(self):
         self.fake("variants/808950810", method='GET', body=self.load_fixture('variant'))
         v = shopify.Variant.find(808950810)
