From 84b0fb8b9461bbc4b3a1cfd650d0834317db8ba5 Mon Sep 17 00:00:00 2001
From: kienle <kienle@passcal.nmt.edu>
Date: Fri, 7 Mar 2025 14:36:46 -0700
Subject: [PATCH 1/2] Fix flake8 pipeline
---
.gitlab-ci.yml | 2 +-
conda.recipe/meta.yaml | 2 +-
setup.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ac7e72c2..a534028b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,7 +23,7 @@ before_script:
- apt-get update && apt install -y libgl1-mesa-glx libxkbcommon-x11-0 libegl1 libdbus-1-3
flake8:
- image: python:3.8
+ image: python:3.11
tags:
- passoft
stage: Build Env and Test
diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
index ee34f63f..df607c38 100644
--- a/conda.recipe/meta.yaml
+++ b/conda.recipe/meta.yaml
@@ -20,7 +20,7 @@ requirements:
- python >=3.9
- numpy >=1.23.0,<2.0
- obspy >=1.3.0
- - PySide6>=6.5.2
+ - PySide6>=6.7
- matplotlib>=3.6.2
test:
diff --git a/setup.py b/setup.py
index ebcae8b7..94235532 100644
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@ setup(
install_requires=[
'numpy >=1.23.0,<2.0',
'obspy>=1.3.0',
- 'PySide6>=6.5.2',
+ 'PySide6>=6.7',
'matplotlib>=3.6.2',
],
setup_requires=[],
--
GitLab
From 6fc92a9c74e592166d48e7ff7e3eb38eee06556b Mon Sep 17 00:00:00 2001
From: kienle <kienle@passcal.nmt.edu>
Date: Fri, 7 Mar 2025 14:43:18 -0700
Subject: [PATCH 2/2] Revert PySide version requirement
The updated PySide constraint is only for testing purpose in the
previous commit. The constraint will be updated in other MRs when
needed.
---
conda.recipe/meta.yaml | 2 +-
setup.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
index df607c38..ee34f63f 100644
--- a/conda.recipe/meta.yaml
+++ b/conda.recipe/meta.yaml
@@ -20,7 +20,7 @@ requirements:
- python >=3.9
- numpy >=1.23.0,<2.0
- obspy >=1.3.0
- - PySide6>=6.7
+ - PySide6>=6.5.2
- matplotlib>=3.6.2
test:
diff --git a/setup.py b/setup.py
index 94235532..ebcae8b7 100644
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@ setup(
install_requires=[
'numpy >=1.23.0,<2.0',
'obspy>=1.3.0',
- 'PySide6>=6.7',
+ 'PySide6>=6.5.2',
'matplotlib>=3.6.2',
],
setup_requires=[],
--
GitLab