Update Pharmpy and use Python 3.11 instead of 3.9 in CI

UUPharmacometrics · Jan 2, 2024 · 8edab16 · 8edab16
1 parent 5701587
commit 8edab16
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 23 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,10 +8,10 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: recursive
-      - name: Set up Python 3.9
+      - name: Set up Python 3.11
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: 3.11
       - name: Install build dependencies
         run: |
           sudo apt update
@@ -281,7 +281,7 @@ jobs:
         - name: Download Python
           uses: suisei-cn/actions-download-file@v1
           with:
-            url: https://github.com/winpython/winpython/releases/download/4.6.20220116/Winpython64-3.9.10.0dot.exe
+            url: https://github.com/winpython/winpython/releases/download/7.0.20231126final/Winpython64-3.11.6.0dot.exe
             target: downloads/
         - name: Download Pandoc
           uses: suisei-cn/actions-download-file@v1
@@ -297,23 +297,23 @@ jobs:
              md -Name installer\strawberry
         - name: Extract winpython
           run: |
-            copy downloads\Winpython64-3.9.10.0dot.exe installer
+            copy downloads\Winpython64-3.11.6.0dot.exe installer
             cd installer
-            Winpython64-3.9.10.0dot.exe -y
-            del Winpython64-3.9.10.0dot.exe
-            rename WPy64-39100 python
+            Winpython64-3.11.6.0dot.exe -y
+            del Winpython64-3.11.6.0dot.exe
+            rename WPy64-31160 python
           shell: cmd
         - name: Install Pharmpy dependencies
           run:
-              installer\python\python-3.9.10.amd64\python.exe -m pip install -r PsN-Source\requirements.txt
+              installer\python\python-3.11.6.amd64\python.exe -m pip install -r PsN-Source\requirements.txt
           shell: cmd
         - name: Install Pharmpy
-          run: installer/python/python-3.9.10.amd64/python.exe -m pip install PsN-Source/pharmpy-core*.zip
+          run: installer/python/python-3.11.6.amd64/python.exe -m pip install PsN-Source/pharmpy-core*.zip
           shell: bash
         - name: Move phampy executables
           run: |
-            mv installer/python/python-3.9.10.amd64/Scripts/psn-pharmpy-wrapper.exe installer/python/python-3.9.10.amd64/
-            mv installer/python/python-3.9.10.amd64/Scripts/pharmpy.exe installer/python/python-3.9.10.amd64/
+            mv installer/python/python-3.11.6.amd64/Scripts/psn-pharmpy-wrapper.exe installer/python/python-3.11.6.amd64/
+            mv installer/python/python-3.11.6.amd64/Scripts/pharmpy.exe installer/python/python-3.11.6.amd64/
           shell: bash
         - name: Extract Strawberry Perl
           run: tar -xf downloads/strawberry-perl-5.22.3.1-64bit-portable.zip -C installer\strawberry
@@ -421,7 +421,7 @@ jobs:
         - name: Update psn.conf
           run: |
             export PSNPATH=$(find installer/strawberry/perl/site/lib/ -type d -name 'PsN_[0-9]*')
-            echo PYTHON_PATH=../../../../../python/python-3.9.10.amd64 >tempfile
+            echo PYTHON_PATH=../../../../../python/python-3.11.6.amd64 >tempfile
             echo R=../../../../../R/bin/R.exe >>tempfile
             echo R_LIB_PATH=../../../../../Rlib >>tempfile
             cat ${PSNPATH}/psn.conf >>tempfile
@@ -440,7 +440,7 @@ jobs:
               echo '        path = package / subdir' >>clean.py
               echo '        if path.exists():' >>clean.py
               echo '            shutil.rmtree(str(path))' >>clean.py
-              installer/python/python-3.9.10.amd64/python.exe clean.py
+              installer/python/python-3.11.6.amd64/python.exe clean.py
           shell: bash
         - name: Remove unnecessary files
           run: |
@@ -470,14 +470,14 @@ jobs:
               del python\*.exe
               rmdir python\notebooks /s /q
               rmdir python\scripts /s /q
-              rmdir python\python-3.9.10.amd64\tcl /s /q
-              rmdir python\python-3.9.10.amd64\share /s /q
-              rmdir python\python-3.9.10.amd64\Tools /s /q
-              rmdir python\python-3.9.10.amd64\Doc /s /q
-              rmdir python\python-3.9.10.amd64\Scripts /s /q
-              del python\python-3.9.10.amd64\NEWS.txt
-              rmdir python\python-3.9.10.amd64\libs /s /q
-              rmdir python\python-3.9.10.amd64\include /s /q
+              rmdir python\python-3.11.6.amd64\tcl /s /q
+              rmdir python\python-3.11.6.amd64\share /s /q
+              rmdir python\python-3.11.6.amd64\Tools /s /q
+              rmdir python\python-3.11.6.amd64\Doc /s /q
+              rmdir python\python-3.11.6.amd64\Scripts /s /q
+              del python\python-3.11.6.amd64\NEWS.txt
+              rmdir python\python-3.11.6.amd64\libs /s /q
+              rmdir python\python-3.11.6.amd64\include /s /q
           shell: cmd
         - name: Show installer directory
           run: dir installer
@@ -571,7 +571,7 @@ jobs:
           echo '                found_path = True' >>edit.py
           echo '            else:' >>edit.py
           echo '                dh.write(line)' >>edit.py
-          ../../../../../python/python-3.9.10.amd64/python.exe edit.py
+          ../../../../../python/python-3.11.6.amd64/python.exe edit.py
           rm includes.pm
           mv tempy includes.pm
           cat edit.py

diff --git a/pharmpy b/pharmpy