diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 69279e12..6666f0fe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -174,13 +174,13 @@ unittest: - job: set-version artifacts: true script: - - python3 -m venv venv + - python3.12 -m venv venv - . venv/bin/activate - pip3 install -U pip - pip3 install -r ./full-requirements.txt - pip3 install -U -r ./full-requirements.txt - cd src - - python3 -m unittest discover -t . + - python3.12 -m unittest discover -t . test-pep8: stage: test @@ -192,7 +192,7 @@ test-pep8: - job: unittest script: # Setup virtual env - - python3 -m venv venv + - python3.12 -m venv venv - . venv/bin/activate - pip3 install -U pip - pip3 install -r ./requirements.txt @@ -270,7 +270,7 @@ build-developers-doc: - ./build.sh # Create html documentation - cd ../../src - - python3 -m venv doc-venv + - python3.12 -m venv doc-venv - . doc-venv/bin/activate - pip3 install -U pip - pip3 install -r ../full-requirements.txt @@ -320,13 +320,13 @@ build-linux: - mkdir -p linux - cd linux # Setup virtual env - - python3 -m venv linux-venv + - python3.12 -m venv linux-venv - . linux-venv/bin/activate - pip3 install -U pip - pip3 install -r ../requirements.txt - pip3 install -U -r ../requirements.txt # Run Pyinstaller - - pyinstaller -y --paths linux-venv/lib/python3.8/site-packages ../src/pamhyr.py + - pyinstaller -y --paths linux-venv/lib/python3.12/site-packages ../src/pamhyr.py # Create directory - mkdir -p pamhyr - mkdir -p pamhyr/_internal diff --git a/full-requirements.txt b/full-requirements.txt index 48890cfe..aa4197f5 100644 --- a/full-requirements.txt +++ b/full-requirements.txt @@ -1,10 +1,10 @@ -PyQt5==5.15.4 +PyQt5==5.15.11 PyQt5-Qt5==5.15.2 -PyQt5-sip==12.12.2 +PyQt5-sip==12.18.0 PyQtWebEngine==5.15.6 QScintilla>=2.14.1 pyqtgraph>=0.12.1 -matplotlib>=3.7.1 +matplotlib==3.8.3 numpy>=1.24.2 colorama>=0.4.3 pyinstaller>=5.11.0 diff --git a/requirements.txt b/requirements.txt index 4a747d38..ebe3523f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,10 @@ -PyQt5==5.15.4 +PyQt5==5.15.11 PyQt5-Qt5==5.15.2 -PyQt5-sip==12.12.2 +PyQt5-sip==12.18.0 #PyQtWebEngine==5.15.6 QScintilla>=2.14.1 pyqtgraph>=0.12.1 -matplotlib>=3.7.1 +matplotlib==3.8.3 numpy>=1.24.2 colorama>=0.4.3 pyinstaller>=5.11.0 @@ -14,3 +14,4 @@ platformdirs>=4.2.0 pyshp>=2.3.1 rasterio==1.3.11 #fortranformat==2.0.3 +