Merge branch 'master' into dependencies_update_20231113

playframework · Feb 28, 2024 · 1b56237 · 1b56237
2 parents 613aef1 + 55ca839
commit 1b56237
Show file tree

Hide file tree

Showing 4 changed files with 134 additions and 123 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -24,13 +24,13 @@ jobs:
     name: Check / Tests -> JDK-${{ matrix.jdk }}/${{ matrix.os }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           # we don't know what commit the last tag was it's safer to get entire repo so previousStableVersion resolves
           fetch-depth: 0
 
       - name: Set up python 3
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v4
         with:
           python-version: '3.x'
           architecture: 'x64'
@@ -39,7 +39,7 @@ jobs:
       - run: pip install -r python/requirements.txt
 
       - name: Set up JDK ${{ matrix.jdk }}
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.jdk }}
           distribution: 'adopt'
@@ -55,19 +55,19 @@ jobs:
     name: BUILD ${{ github.sha }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           # we don't know what commit the last tag was it's safer to get entire repo so previousStableVersion resolves
           fetch-depth: 0
 
       - name: Set up python 3
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v4
         with:
           python-version: '3.x'
           architecture: 'x64'
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: 17
           distribution: 'adopt'
@@ -77,7 +77,7 @@ jobs:
         run: ant artifact
 
       - name: ziping artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: play-${{ github.sha }}
           if-no-files-found: error

diff --git a/framework/pym/play/cmdloader.py b/framework/pym/play/cmdloader.py
@@ -24,7 +24,7 @@ def load_core(self):
             if filename != "__init__.py" and filename.endswith(".py"):
                 try:
                     module_name = filename.replace(".py", "")
-                    module_path = os.path.join(self.path,filename)
+                    module_path = os.path.join(self.path, filename)
                     mod = load_python_module(module_name, module_path)
                     self._load_cmd_from(mod)
                 except Exception as e:

diff --git a/samples-and-tests/i-am-a-developer/test_jvm_version_flag.py b/samples-and-tests/i-am-a-developer/test_jvm_version_flag.py
@@ -33,7 +33,7 @@ def testWithFlag(self, mock):
         play_app.java_cmd([])
 
         step('Assert getJavaVersion was not called')
-        self.assert_(not mock.called)
+        mock.assert_(not mock.called)
 
     @mock.patch('play.application.getJavaVersion', return_value='')
     def testWithoutFlag(self, mock):
@@ -43,7 +43,7 @@ def testWithoutFlag(self, mock):
         play_app.java_cmd([])
 
         step('Assert getJavaVersion was called once')
-        self.assert_(mock.called)
+        mock.assert_(mock.called)
 
 
 if __name__ == '__main__':