Merge pull request #6 from regro-cf-autotick-bot/3.4.0_hbe6ef4

conda-forge · Oct 23, 2023 · d14c378 · d14c378
2 parents 37d68d9 + 68a8ad4
commit d14c378
Show file tree

Hide file tree

Showing 4 changed files with 81 additions and 40 deletions.
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,13 +1,13 @@
 {% set name = "pycustomfocus" %}
-{% set version = "3.3.6" %}
+{% set version = "3.4.0" %}
 
 package:
  name: {{ name|lower }}
  version: {{ version }}
 
 source:
  url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/PyCustomFocus-{{ version }}.tar.gz
- sha256: c2d729a2a2d33cb381e3257b45e5575d50d89b0e04a16d7b47c560bdb7b77fd6
+ sha256: 3d4d6131f23d4baf3b9ffa7ba93512de7a7334a379e19bb6848d441ac69cd5e9
  patches:
  - qtpy.patch
 

diff --git a/recipe/qtpy.patch b/recipe/qtpy.patch
@@ -1,26 +1,28 @@
-diff --git a/src/PyFocus/user_interface/front_end_ui.py b/src/PyFocus/user_interface/front_end_ui.py
-index f29512b..ed42cbd 100644
---- a/src/PyFocus/user_interface/front_end_ui.py
-+++ b/src/PyFocus/user_interface/front_end_ui.py
-@@ -2,11 +2,11 @@
+diff --git a/src/PyFocus/user_interface/front_end_ui.py b/src/PyFocus/user_interface/front_end_ui.py
+index cb30f14..e0970aa 100644
+--- a/src/PyFocus/user_interface/front_end_ui.py
++++ b/src/PyFocus/user_interface/front_end_ui.py
+@@ -2,13 +2,13 @@
 
- # Form implementation generated from reading ui file 'front_end.ui'
+ # Form implementation generated from reading ui file 'c:\Users\fernando\Documents\GitHub\napari-psf-simulator\src\napari_psf_simulator\PyFocus\src\PyFocus\user_interface\front_end.ui'
  #
--# Created by: PyQt5 UI code generator 5.9.2
-+# Created by: qtpy UI code generator 5.9.2
+-# Created by: PyQt5 UI code generator 5.15.9
++# Created by: qtpy UI code generator 5.15.9
  #
- # WARNING! All changes made in this file will be lost!
+ # WARNING: Any manual changes made to this file will be lost when pyuic5 is
+ # run again. Do not edit this file unless you know what you are doing.
+
 
 -from PyQt5 import QtCore, QtGui, QtWidgets
 +from qtpy import QtCore, QtGui, QtWidgets
 
- #Scaling based on the screen resolution
- import ctypes
-diff --git a/src/PyFocus/user_interface/mask_selection/mask_selection.py b/src/PyFocus/user_interface/mask_selection/mask_selection.py
-index c138c5f..867553c 100644
---- a/src/PyFocus/user_interface/mask_selection/mask_selection.py
-+++ b/src/PyFocus/user_interface/mask_selection/mask_selection.py
-@@ -2,11 +2,11 @@
+
+ class Ui_MainWindow(object):
+diff --git a/src/PyFocus/user_interface/mask_selection/mask_selection.py b/src/PyFocus/user_interface/mask_selection/mask_selection.py
+index c138c5f..867553c 100644
+--- a/src/PyFocus/user_interface/mask_selection/mask_selection.py
++++ b/src/PyFocus/user_interface/mask_selection/mask_selection.py
+@@ -2,11 +2,11 @@
 
  # Form implementation generated from reading ui file 'mask_selection2.ui'
  #
@@ -34,11 +36,11 @@ index c138c5f..867553c 100644
  import config
  import numpy as np
 
-diff --git a/src/PyFocus/user_interface/mask_selection/mask_selection2.py b/src/PyFocus/user_interface/mask_selection/mask_selection2.py
-index e6a8666..74be1ee 100644
---- a/src/PyFocus/user_interface/mask_selection/mask_selection2.py
-+++ b/src/PyFocus/user_interface/mask_selection/mask_selection2.py
-@@ -2,11 +2,11 @@
+diff --git a/src/PyFocus/user_interface/mask_selection/mask_selection2.py b/src/PyFocus/user_interface/mask_selection/mask_selection2.py
+index e6a8666..74be1ee 100644
+--- a/src/PyFocus/user_interface/mask_selection/mask_selection2.py
++++ b/src/PyFocus/user_interface/mask_selection/mask_selection2.py
+@@ -2,11 +2,11 @@
 
  # Form implementation generated from reading ui file 'mask_selection2.ui'
  #
@@ -52,11 +54,31 @@ index e6a8666..74be1ee 100644
 
  class Ui_MaskWindow(object):
  def setupUi(self, MaskWindow):
-diff --git a/src/PyFocus/user_interface/mask_selection/mask_selection_modified.py b/src/PyFocus/user_interface/mask_selection/mask_selection_modified.py
-index a1d5311..ad18aee 100644
---- a/src/PyFocus/user_interface/mask_selection/mask_selection_modified.py
-+++ b/src/PyFocus/user_interface/mask_selection/mask_selection_modified.py
-@@ -2,11 +2,11 @@
+diff --git a/src/PyFocus/user_interface/mask_selection/mask_selection2_ui.py b/src/PyFocus/user_interface/mask_selection/mask_selection2_ui.py
+index 1019fd0..45c5315 100644
+--- a/src/PyFocus/user_interface/mask_selection/mask_selection2_ui.py
++++ b/src/PyFocus/user_interface/mask_selection/mask_selection2_ui.py
+@@ -2,13 +2,13 @@
+
+ # Form implementation generated from reading ui file 'c:\Users\fernando\Documents\GitHub\napari-psf-simulator\src\napari_psf_simulator\PyFocus\src\PyFocus\user_interface\mask_selection\mask_selection2.ui'
+ #
+-# Created by: PyQt5 UI code generator 5.15.9
++# Created by: qtpy UI code generator 5.15.9
+ #
+ # WARNING: Any manual changes made to this file will be lost when pyuic5 is
+ # run again. Do not edit this file unless you know what you are doing.
+
+
+-from PyQt5 import QtCore, QtGui, QtWidgets
++from qtpy import QtCore, QtGui, QtWidgets
+
+
+ class Ui_MaskWindow(object):
+diff --git a/src/PyFocus/user_interface/mask_selection/mask_selection_modified.py b/src/PyFocus/user_interface/mask_selection/mask_selection_modified.py
+index a1d5311..ad18aee 100644
+--- a/src/PyFocus/user_interface/mask_selection/mask_selection_modified.py
++++ b/src/PyFocus/user_interface/mask_selection/mask_selection_modified.py
+@@ -2,11 +2,11 @@
 
  # Form implementation generated from reading ui file 'mask_selection2.ui'
  #
@@ -70,11 +92,31 @@ index a1d5311..ad18aee 100644
  import config
  import numpy as np
 
-diff --git a/src/PyFocus/user_interface/user_interface.py b/src/PyFocus/user_interface/user_interface.py
-index cd864cd..32bdc2d 100644
---- a/src/PyFocus/user_interface/user_interface.py
-+++ b/src/PyFocus/user_interface/user_interface.py
-@@ -4,7 +4,7 @@ from matplotlib import pyplot as plt
+diff --git a/src/PyFocus/user_interface/mask_selection/mask_selection_ui.py b/src/PyFocus/user_interface/mask_selection/mask_selection_ui.py
+index 0a5624b..eaccb94 100644
+--- a/src/PyFocus/user_interface/mask_selection/mask_selection_ui.py
++++ b/src/PyFocus/user_interface/mask_selection/mask_selection_ui.py
+@@ -2,13 +2,13 @@
+
+ # Form implementation generated from reading ui file 'c:\Users\fernando\Documents\GitHub\napari-psf-simulator\src\napari_psf_simulator\PyFocus\src\PyFocus\user_interface\mask_selection\mask_selection.ui'
+ #
+-# Created by: PyQt5 UI code generator 5.15.9
++# Created by: qtpy UI code generator 5.15.9
+ #
+ # WARNING: Any manual changes made to this file will be lost when pyuic5 is
+ # run again. Do not edit this file unless you know what you are doing.
+
+
+-from PyQt5 import QtCore, QtGui, QtWidgets
++from qtpy import QtCore, QtGui, QtWidgets
+
+
+ class Ui_Dialog(object):
+diff --git a/src/PyFocus/user_interface/user_interface.py b/src/PyFocus/user_interface/user_interface.py
+index cd864cd..32bdc2d 100644
+--- a/src/PyFocus/user_interface/user_interface.py
++++ b/src/PyFocus/user_interface/user_interface.py
+@@ -4,7 +4,7 @@ from matplotlib import pyplot as plt
  import time
  import configparser
  import config