Update test build pipeline to 3.11

Update dependencies (faker,crytpography,pyperf,msal) fix test cases
cedric05 · Mar 16, 2024 · 04e921b · 04e921b
1 parent f805fac
commit 04e921b
Show file tree

Hide file tree

Showing 9 changed files with 178 additions and 188 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Install Python 3
         uses: actions/setup-python@v1
         with:
-          python-version: 3.8
+          python-version: 3.11
       - name: Install dependencies
         run: |
           sudo apt-get install tar

diff --git a/Pipfile b/Pipfile
@@ -8,17 +8,16 @@ jsonschema = "==4.21.1"
 jstyleson = "==0.0.2"
 requests = "==2.31.0"
 textx = "==4.0.1"
-js2py = "==0.74"
 requests-pkcs12 = "==1.24"
 parsys-requests-unixsocket = "==0.3.1"
 requests-aws4auth = "==1.2.3"
 requests-ntlm = "==1.2.0"
 restrictedpython = "==7.0"
-faker = "==23.1.0"
+faker = "==24.1.0"
 requests-hawk = "==1.2.1"
 pyyaml = "==6.0.1"
 toml = "==0.10.2"
-msal = "==1.26.0"
+msal = "==1.27.0"
 
 [dev-packages]
 python-magic = "*"

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/all_requirements.txt b/all_requirements.txt
@@ -1,4 +1,5 @@
 -r requirements.txt
 -r test_requirements.txt
 -r ./benchmarks/requirements.txt
-python-magic
+python-magic
+js2py==0.74
diff --git a/dothttp/__version__.py b/dothttp/__version__.py
@@ -1 +1 @@
-__version__ = "0.0.43a10"
+__version__ = "0.0.43a11"
diff --git a/dothttp/script/js3py.py b/dothttp/script/js3py.py
@@ -15,12 +15,9 @@
 from operator import getitem
 
 import cryptography
-import js2py
 import yaml
 from cryptography import *
 from faker import Faker
-from js2py.base import JsObjectWrapper
-from js2py.internals.simplex import JsException
 from requests import Response
 from RestrictedPython import compile_restricted, safe_globals
 from RestrictedPython.Eval import default_guarded_getiter
@@ -32,6 +29,13 @@
 from ..utils.common import get_real_file_path
 from ..utils.property_util import PropertyProvider
 
+try:
+    import js2py
+    from js2py.base import JsObjectWrapper
+    from js2py.internals.simplex import JsException
+except:
+    pass
+
 
 def write_guard(x):
     if isinstance(x, Client):

diff --git a/requirements.txt b/requirements.txt
@@ -1,15 +1,14 @@
 jsonschema==4.21.1
 jstyleson==0.0.2
 textx==4.0.1
-js2py==0.74
 requests_pkcs12==1.24
 parsys-requests-unixsocket==0.3.1
 requests-aws4auth==1.2.3
 requests_ntlm==1.2.0
 RestrictedPython==7.0
-Faker==23.1.0
+Faker==24.1.0
 requests-hawk==1.2.1
-msal==1.26.0
+msal==1.27.0
 PyYaml==6.0.1
 toml==0.10.2
 requests==2.31.0
diff --git a/setup.py b/setup.py
@@ -45,7 +45,9 @@ def requirements():
     options={"bdist_wheel": {"universal": False}},
     packages=find_packages(exclude=EXCLUDE),
     install_requires=requirements(),
-    extras_require={},
+    extras_require={
+        "js": ["js2py"]
+    },
     long_description=read("README.md"),
     long_description_content_type=("text/markdown"),
     classifiers=[

diff --git a/test/core/test_script_execution.py b/test/core/test_script_execution.py
@@ -24,9 +24,7 @@ def test_python(self):
                 "properties": {},
                 "tests": [
                     {
-                        "name": "test_hai (test_script.SampleTest)",
-                        # python3.11
-                        # "name": "test_hai (test_script.SampleTest.test_hai)",
+                        "name": "test_hai (test_script.SampleTest.test_hai)",
                         "success": True,
                         "result": None,
                         "error": None,
@@ -157,9 +155,7 @@ def test_status_code(self):
                 "stdout": "",
                 "tests": [
                     {
-                        "name": "test_status_code (test_script.SampleTestCase)",
-                        # python3.11
-                        # 'name': 'test_status_code (test_script.SampleTestCase.test_status_code)',
+                        'name': 'test_status_code (test_script.SampleTestCase.test_status_code)',
                         "success": True,
                         "result": None,
                         "error": None,
@@ -223,32 +219,25 @@ def test_hash(self):
                 "tests": [
                     {
                         "name": "test_date (test_script.SampleTestCase)",
-                        # python3.11
-                        # 'name': 'test_date (test_script.SampleTestCase.test_date)',
+                        'name': 'test_date (test_script.SampleTestCase.test_date)',
                         "success": True,
                         "result": None,
                         "error": None,
                     },
                     {
-                        "name": "test_hash (test_script.SampleTestCase)",
-                        # python3.11
-                        # 'name': 'test_hash (test_script.SampleTestCase.test_hash)',
+                        'name': 'test_hash (test_script.SampleTestCase.test_hash)',
                         "success": True,
                         "result": None,
                         "error": None,
                     },
                     {
-                        "name": "test_headers (test_script.SampleTestCase)",
-                        # python3.11
-                        # 'name': 'test_headers (test_script.SampleTestCase.test_headers)',
+                        'name': 'test_headers (test_script.SampleTestCase.test_headers)',
                         "success": True,
                         "result": None,
                         "error": None,
                     },
                     {
-                        "name": "test_math (test_script.SampleTestCase)",
-                        # python3.11
-                        # 'name': 'test_math (test_script.SampleTestCase.test_math)',
+                        'name': 'test_math (test_script.SampleTestCase.test_math)',
                         "success": True,
                         "result": None,
                         "error": None,
@@ -273,9 +262,7 @@ def test_status_code(self):
                 "properties": {},
                 "tests": [
                     {
-                        "name": "test_status_code (test_script.SampleTestCase)",
-                        # python3.11
-                        # 'test_status_code (test_script.SampleTestCase.test_status_code)',
+                        "name": 'test_status_code (test_script.SampleTestCase.test_status_code)',
                         "success": False,
                         "result": None,
                         "error": 'Traceback (most recent call last):\n  File "test_script.py", line 4, in test_status_code\nAssertionError: 401 != 200\n',
@@ -305,9 +292,7 @@ def test_raise(self):
                         "error": "Traceback (most recent call last):\n"
                         '  File "test_script.py", line 4, in test_raise\n'
                         "Exception\n",
-                        "name": "test_raise (test_script.SampleTestCase)",
-                        # python3.11
-                        # 'test_raise (test_script.SampleTestCase.test_raise)',
+                        "name": "test_raise (test_script.SampleTestCase.test_raise)",
                         "result": None,
                         "success": False,
                     }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		__version__ = "0.0.43a10"
		__version__ = "0.0.43a11"