From b25108ac80cd9e126836a5df075aa1b40c39ac34 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon, 11 Sep 2023 07:19:41 +0000 Subject: [PATCH 1/6] updated v3.3.5 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1e808fb..fcd2c7b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "pycustomfocus" %} -{% set version = "2.3" %} +{% set version = "3.3.5" %} package: name: {{ name|lower }} @@ -7,7 +7,7 @@ package: source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/PyCustomFocus-{{ version }}.tar.gz - sha256: 6c9899fe342f6d3a4952e34ea71b9edfea71b93eb33901b9962f46c94205d6df + sha256: 720cd42cb84148a9b9af3e5727be53d61c68f993a615a3609e37830a4d2c4249 build: noarch: python From 7b6377df810d284b373b39861fab6f65431753a3 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon, 11 Sep 2023 07:20:47 +0000 Subject: [PATCH 2/6] MNT: Re-rendered with conda-build 3.26.1, conda-smithy 3.25.1, and conda-forge-pinning 2023.09.10.17.41.10 --- .azure-pipelines/azure-pipelines-linux.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 974e878..a20f315 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -15,11 +15,6 @@ jobs: timeoutInMinutes: 360 steps: - - script: | - rm -rf /opt/ghc - df -h - displayName: Manage disk space - # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | From d65c361c0a0f6f4ebf7381e9b2c3f983b047054a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Pe=C3=B1a-Castellanos?= Date: Thu, 14 Sep 2023 15:21:39 -0500 Subject: [PATCH 3/6] Update meta.yaml --- recipe/meta.yaml | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index fcd2c7b..7c40be4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -16,20 +16,21 @@ build: requirements: host: - - python >=3.6 - pip - run: - python >=3.6 - - numpy - - scipy - - qdarkstyle + run: - config - - tqdm + - configparser - matplotlib-base + - numpy + - pydantic - pyqt - - qtpy - pyqtgraph - - configparser + - python >=3.6 + - qdarkstyle + - qtpy + - scipy + - tqdm test: imports: @@ -42,10 +43,11 @@ test: - 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: From 405c1639144bc4cf155eec527ccf724d7bdb67c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Pe=C3=B1a-Castellanos?= Date: Thu, 14 Sep 2023 15:36:13 -0500 Subject: [PATCH 4/6] Update meta.yaml --- recipe/meta.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7c40be4..91257f5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -35,9 +35,15 @@ requirements: 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 From 6fef203800e475304bdff4c77ab6fccd8147558d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Pe=C3=B1a-Castellanos?= Date: Thu, 14 Sep 2023 15:45:00 -0500 Subject: [PATCH 5/6] Update meta.yaml --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 91257f5..f35eb74 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -24,7 +24,7 @@ requirements: - matplotlib-base - numpy - pydantic - - pyqt + # - pyqt - pyqtgraph - python >=3.6 - qdarkstyle From 0c04428776afe6bba1001029338d88db61711416 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Pe=C3=B1a-Castellanos?= Date: Thu, 14 Sep 2023 15:46:22 -0500 Subject: [PATCH 6/6] Add patch --- recipe/meta.yaml | 4 ++- recipe/qtpy.patch | 85 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 recipe/qtpy.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f35eb74..52a7368 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -8,6 +8,8 @@ package: source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/PyCustomFocus-{{ version }}.tar.gz sha256: 720cd42cb84148a9b9af3e5727be53d61c68f993a615a3609e37830a4d2c4249 + patches: + - qtpy.patch build: noarch: python @@ -24,7 +26,7 @@ requirements: - matplotlib-base - numpy - pydantic - # - pyqt + # - pyqt # Replaced by qtpy with patch - pyqtgraph - python >=3.6 - qdarkstyle diff --git a/recipe/qtpy.patch b/recipe/qtpy.patch new file mode 100644 index 0000000..dfa7997 --- /dev/null +++ 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