Merge branch 'i444_IDD' into develop

santoshphilip · Oct 19, 2024 · f8783c5 · f8783c5
2 parents 91c4809 + 0a858a8
commit f8783c5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -5,7 +5,7 @@ name: eppy package
 
 on:
   push:
-    branches: ["master", "develop" ] 
+    branches: ["master", "develop" ,] 
     inputs:
       energyplus-version:
         description: 'EnergyPlus major.minor.patch version'
@@ -39,7 +39,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        python -m pip install pytest
+        python -m pip install pytest==7.1.3
         if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
     - run: echo Installing EnergyPlusV${{ inputs.energyplus-version }}...
       shell: bash

diff --git a/requirements_dev.txt b/requirements_dev.txt
@@ -8,8 +8,8 @@ coverage
 Sphinx
 twine
 
-pytest
-pytest-runner
+pytest==7.1.3
+pytest-runner==6.0.0
 black
 nbsphinx