Merge pull request #54 from contentstack/next

Next

Author: sunil-lakshman

.github/workflows/sast-scan.yml

@@ -8,7 +8,7 @@ jobs:
     steps:
       - uses: actions/checkout@master
       - name: Run Snyk to check for vulnerabilities
-        uses: snyk/actions/python@master
+        uses: snyk/actions/python-3.10@master
         env:
           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
         with:

.github/workflows/sca-scan.yml

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## _v1.8.1_
+
+### **Date: 06-NOVEMBER-2023**
+
+- SNYK issues fixed 
+- General code improvement clean up
+
+---
+
 ## _v1.8.0_
 
 ### **Date: 26-MAY-2023**

.github/workflows/secrets-scan.yml

@@ -2,6 +2,15 @@
 **CHANGELOG**
 ================
 
+*v1.8.1*
+============
+
+**Date: 06-NOVEMBER-2023**
+
+- SNYK issues fixed 
+- General code improvement clean up
+
+
 *v1.8.0*
 ============
 

CHANGELOG.md

@@ -10,10 +10,20 @@
 from contentstack.stack import Stack
 from .utility import Utils
 
-__title__ = 'contentstack-python'
+__all__ = (
+"Entry",
+"Asset",
+"ContentType",
+"HTTPSConnection",
+"Stack",
+"Utils"
+)
+
+__title__ = 'contentstack-delivery-python'
 __author__ = 'contentstack'
 __status__ = 'debug'
-__version__ = 'v1.8.0'
+__version__ = 'v1.8.1'
 __endpoint__ = 'cdn.contentstack.io'
 __email__ = '[email protected]'
 __developer_email__ = '[email protected]'
+__license__ = "MIT"

README.rst

@@ -9,10 +9,6 @@
 from contentstack.https_connection import HTTPSConnection
 from contentstack.image_transform import ImageTransform
 
-__author__ = "ishaileshmishra ([email protected])"
-__license__ = "MIT"
-__version__ = '1.8.0'
-
 log = logging.getLogger(__name__)
 DEFAULT_HOST = 'cdn.contentstack.io'
 
@@ -44,6 +40,7 @@ def __init__(self, api_key: str, delivery_token: str, environment: str,
                      total=5, backoff_factor=0, status_forcelist=[408, 429]),
                  live_preview=None,
                  branch=None,
+                 early_access =  None,
                  ):
         """
         # Class that wraps the credentials of the authenticated user. Think of
@@ -96,6 +93,7 @@ def __init__(self, api_key: str, delivery_token: str, environment: str,
         self.branch = branch
         self.retry_strategy = retry_strategy
         self.live_preview = live_preview
+        self.early_access = early_access
         self._validate_stack()
 
     def _validate_stack(self):
@@ -127,6 +125,9 @@ def _validate_stack(self):
             'access_token': self.delivery_token,
             'environment': self.environment
         }
+        if self.early_access is not None:
+            early_access_str = ', '.join(self.early_access)
+            self.headers['x-header-ea'] = early_access_str
 
         if self.branch is not None:
             self.headers['branch'] = self.branch
@@ -145,6 +146,13 @@ def get_api_key(self):
         :return: api_key of the stack
         """
         return self.api_key
+    
+    @property
+    def get_early_access(self):
+        """
+        :return: early access
+        """
+        return self.early_access
 
     @property
     def get_delivery_token(self):

changelog.rst

@@ -8,7 +8,7 @@ tox==4.5.1
 virtualenv==20.23.0
 Sphinx==7.0.1
 sphinxcontrib-websupport==1.2.4
-pip==23.1.2
+pip==23.3.1
 build==0.10.0
 wheel==0.40.0
 lxml==4.9.2
@@ -33,7 +33,7 @@ pytz==2023.3
 Babel==2.12.1
 pep517==0.13.0
 tomli~=2.0.1
-Werkzeug==2.3.4
+Werkzeug==3.0.1
 Flask~=2.3.2
 click~=8.1.3
 MarkupSafe==2.1.2
@@ -49,7 +49,7 @@ imagesize==1.4.1
 snowballstemmer~=2.2.0
 Pygments~=2.15.1
 wrapt==1.15.0
-certifi==2023.5.7
+certifi==2023.7.22
 oauthlib==3.2.2
 idna==3.4
 chardet~=5.1.0
@@ -59,6 +59,6 @@ distlib~=0.3.6
 Empty~=0.4.4
 cachetools~=5.3.0
 tomlkit~=0.11.8
-urllib3==2.0.2
+urllib3==2.0.7
 exceptiongroup~=1.1.1
 iniconfig~=2.0.0

contentstack/__init__.py

@@ -4,12 +4,25 @@
 # as the name and version) as well as which code files to include
 
 import os
+import re
+import sys
 
 try:
-    from setuptools import setup
+    from setuptools import setup, find_packages
 except ImportError:
     from distutils.core import setup
 
+package = "contentstack"
+
+def get_version(package):
+    """
+    Return package version as listed in `__version__` in `init.py`.
+    """
+    init_py = open(os.path.join(package, '__init__.py')).read()
+    return re.search("^__version__ = ['\"]([^'\"]+)['\"]",
+                     init_py, re.MULTILINE).group(1)
+
+
 with open(os.path.join(os.path.dirname(__file__), 'README.md')) as readme:
     long_description = readme.read()
 
@@ -25,9 +38,9 @@
     type="process",
     created="09 Jun 2020",
     keywords="contentstack-python",
-    version="1.8.0",
+    version=get_version(package),
     author="Contentstack",
-    author_email="[email protected]",
+    author_email="[email protected], [email protected]" ,
     description="Contentstack is a headless CMS with an API-first approach.",
     long_description=long_description,
     long_description_content_type="text/markdown",

contentstack/stack.py

@@ -23,14 +23,14 @@ def setUp(self):
     def test_011_setting_timeout(self):
         excepted = 13  # setting a custom timeout
         self.stack = contentstack.Stack(
-            API_KEY, DELIVERY_TOKEN, ENVIRONMENT, host=config.host, timeout=excepted)
+            API_KEY, DELIVERY_TOKEN, ENVIRONMENT, host=config.HOST, timeout=excepted)
         self.assertEqual(excepted, self.stack.timeout)
 
     def test_12_setting_timeout_failure(self):
         try:
             excepted = 1.00  # setting a custom timeout
             self.stack = contentstack.Stack(
-                API_KEY, DELIVERY_TOKEN, ENVIRONMENT, host=config.host, timeout=excepted)
+                API_KEY, DELIVERY_TOKEN, ENVIRONMENT, host=config.HOST, timeout=excepted)
             self.stack.asset_query().find()
         except TimeoutError:
             self.assertEqual('Timeout expired.', TimeoutError.__doc__)