Merge pull request #4 from regro-cf-autotick-bot/3.3.5_h3426ef

conda-forge · Sep 14, 2023 · 6427c0e · 6427c0e
2 parents 90f0d31 + 0c04428
commit 6427c0e
Show file tree

Hide file tree

Showing 3 changed files with 109 additions and 19 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,13 +1,15 @@
 {% set name = "pycustomfocus" %}
-{% set version = "2.3" %}
+{% set version = "3.3.5" %}
 
 package:
   name: {{ name|lower }}
   version: {{ version }}
 
 source:
   url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/PyCustomFocus-{{ version }}.tar.gz
-  sha256: 6c9899fe342f6d3a4952e34ea71b9edfea71b93eb33901b9962f46c94205d6df
+  sha256: 720cd42cb84148a9b9af3e5727be53d61c68f993a615a3609e37830a4d2c4249
+  patches:
+    - qtpy.patch
 
 build:
   noarch: python
@@ -16,36 +18,44 @@ build:
 
 requirements:
   host:
-    - python >=3.6
     - pip
-  run:
     - python >=3.6
-    - numpy
-    - scipy
-    - qdarkstyle
+  run:
     - config
-    - tqdm
+    - configparser
     - matplotlib-base
-    - pyqt
-    - qtpy
+    - numpy
+    - pydantic
+    # - pyqt  # Replaced by qtpy with patch
     - pyqtgraph
-    - configparser
+    - python >=3.6
+    - qdarkstyle
+    - qtpy
+    - scipy
+    - tqdm
 
 test:
   imports:
     - PyFocus
-    - PyFocus.sim
-    - PyFocus.VP_functions
+    - PyFocus.custom_dataclasses
+    - PyFocus.custom_typing
+    - PyFocus.equations
+    - PyFocus.model
+    - PyFocus.napari_adapter
+    - PyFocus.plot_functions
+    - PyFocus.user_interface
   commands:
+    - pip list
     - pip check
   requires:
     - pip
 
 about:
-  home: https://github.com/fcaprile/PyFocus
+  home: https://pypi.org/project/PyCustomFocus
   summary: Full vectorial calculation of focused electromagnetic fields moduled by a custom phase mask
   license: MIT
   license_file: LICENCE.txt
+  dev_url: https://github.com/fcaprile/PyFocus
 
 extra:
   recipe-maintainers:

diff --git a/recipe/qtpy.patch b/recipe/qtpy.patch
@@ -0,0 +1,85 @@
+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 @@
+
+ # Form implementation generated from reading ui file 'front_end.ui'
+ #
+-# Created by: PyQt5 UI code generator 5.9.2
++# Created by: qtpy UI code generator 5.9.2
+ #
+ # WARNING! All changes made in this file will be lost!
+
+-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 @@
+
+ # Form implementation generated from reading ui file 'mask_selection2.ui'
+ #
+-# Created by: PyQt5 UI code generator 5.9.2
++# Created by: qtpy UI code generator 5.9.2
+ #
+ # WARNING! All changes made in this file will be lost!
+
+-from PyQt5 import QtCore, QtGui, QtWidgets
++from qtpy import QtCore, QtGui, QtWidgets
+ 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 @@
+
+ # Form implementation generated from reading ui file 'mask_selection2.ui'
+ #
+-# Created by: PyQt5 UI code generator 5.9.2
++# Created by: qtpy UI code generator 5.9.2
+ #
+ # WARNING! All changes made in this file will be lost!
+
+-from PyQt5 import QtCore, QtGui, QtWidgets
++from qtpy import QtCore, QtGui, QtWidgets
+
+ 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 @@
+
+ # Form implementation generated from reading ui file 'mask_selection2.ui'
+ #
+-# Created by: PyQt5 UI code generator 5.9.2
++# Created by: qtpy UI code generator 5.9.2
+ #
+ # WARNING! All changes made in this file will be lost!
+
+-from PyQt5 import QtCore, QtGui, QtWidgets
++from qtpy import QtCore, QtGui, QtWidgets
+ 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
+ import time
+ import configparser
+ import config
+-from PyQt5.QtWidgets import QFileDialog
++from qtpy.QtWidgets import QFileDialog
+ from qtpy import QtWidgets
+ from pyqtgraph.Qt import QtGui
+ import qdarkstyle