<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d56589d7c0a62f099d2729e82f829426ea4f3e6a">https://github.com/macports/macports-ports/commit/d56589d7c0a62f099d2729e82f829426ea4f3e6a</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new d56589d7c0a py-coolprop: new port, version 6.4.3
</span>d56589d7c0a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d56589d7c0a62f099d2729e82f829426ea4f3e6a
</span>Author: Julien Salort <jsalort@users.noreply.github.com>
AuthorDate: Thu Dec 29 02:50:44 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> py-coolprop: new port, version 6.4.3
</span>---
python/py-coolprop/Portfile | 56 ++++++++++++++++++++++
python/py-coolprop/files/patch-CPstrings.diff | 13 +++++
python/py-coolprop/files/patch-CoolPropFluid.diff | 11 +++++
python/py-coolprop/files/patch-HumidAirProp.diff | 11 +++++
python/py-coolprop/files/patch-IF97.diff | 11 +++++
.../files/patch-REFPROPMixtureBackend.diff | 11 +++++
python/py-coolprop/files/patch-gui.diff | 11 +++++
python/py-coolprop/files/patch-psy.diff | 49 +++++++++++++++++++
python/py-coolprop/files/patch-rapidjson.diff | 21 ++++++++
python/py-coolprop/files/patch-setup.diff | 11 +++++
10 files changed, 205 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-coolprop/Portfile b/python/py-coolprop/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2cc0955f4f2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-coolprop/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,56 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup python 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup CoolProp CoolProp 6.4.3 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name py-coolprop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license MIT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 d4b2af6f609fdce11621caf6cddce304fdbbdb78 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c981b26e7f9ae602599f527df73c7b62129b5d7104037a641f1b012397767b01 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 8021549
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 38 39 310 311
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {juliensalort.org:mp @jsalort} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories-append science
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Open-source thermodynamic and transport properties database
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description CoolProp implements: Pure and pseudo-pure fluid equations \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ of state and transport properties for 122 components, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mixture properties using high-accuracy Helmholtz energy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ formulations, correlations of properties of incompressible \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fluids and brines, computationally efficient tabular \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ interpolation, highest accuracy psychrometric routines, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ user-friendly interface around the full capabilities of NIST \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ REFPROP, fast IAPWS-IF97 (Industrial Formulation) for \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Water/Steam, and Cubic equations of state (SRK, PR).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://www.coolprop.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${name} ne ${subport}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/cmake:cmake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-setuptools \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-cython
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libfmt4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:coolprop-if97 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:coolprop-refprop-headers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:rapidjson-devel \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:eigen3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:msgpack-cpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:boost176
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append "CPPFLAGS=-I${prefix}/include/libfmt4 -I${prefix}/include/eigen3 -I${prefix}/libexec/boost/1.76/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append "CPPFLAGS=-I${prefix}/include/libfmt4 -I${prefix}/include/eigen3 -I${prefix}/libexec/boost/1.76/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-psy.diff patch-gui.diff patch-setup.diff patch-IF97.diff patch-rapidjson.diff patch-CoolPropFluid.diff patch-CPstrings.diff patch-REFPROPMixtureBackend.diff patch-HumidAirProp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.dir ${worksrcpath}/wrappers/Python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-coolprop/files/patch-CPstrings.diff b/python/py-coolprop/files/patch-CPstrings.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..084992b4a13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-coolprop/files/patch-CPstrings.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/CPstrings.orig.h 2022-12-22 21:55:01.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/CPstrings.h 2022-12-22 21:55:19.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11,8 +11,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ifndef FMT_HEADER_ONLY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define FMT_HEADER_ONLY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# include "fmt/format.h" // For addition of the string formatting functions and macros from fmtlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# include "fmt/printf.h" // For sprintf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <fmt/format.h> // For addition of the string formatting functions and macros from fmtlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <fmt/printf.h> // For sprintf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # undef FMT_HEADER_ONLY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <vector>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-coolprop/files/patch-CoolPropFluid.diff b/python/py-coolprop/files/patch-CoolPropFluid.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..cc4099e8c96
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-coolprop/files/patch-CoolPropFluid.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/CoolPropFluid.orig.h 2022-12-22 21:53:00.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/CoolPropFluid.h 2022-12-22 21:53:19.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18,7 +18,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <map>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <cassert>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <iterator>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "Eigen/Core"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <Eigen/Core>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "PolyMath.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "Ancillaries.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-coolprop/files/patch-HumidAirProp.diff b/python/py-coolprop/files/patch-HumidAirProp.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0754d1f888d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-coolprop/files/patch-HumidAirProp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/HumidAirProp.orig.cpp 2022-12-22 22:34:28.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/HumidAirProp.cpp 2022-12-22 22:35:18.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,7 +24,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <iostream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <list>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "externals/IF97/IF97.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <IF97.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// This is a stub overload to help with all the strcmp calls below and avoid needing to rewrite all of them
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::size_t strcmp(const std::string& s, const std::string& e) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-coolprop/files/patch-IF97.diff b/python/py-coolprop/files/patch-IF97.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4cb8aeeacc6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-coolprop/files/patch-IF97.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Backends/IF97/IF97Backend.orig.h 2022-12-22 15:23:06.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Backends/IF97/IF97Backend.h 2022-12-22 15:23:22.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,7 +3,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define IF97BACKEND_H_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "DataStructures.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "externals/IF97/IF97.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <IF97.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "AbstractState.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "Exceptions.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <vector>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-coolprop/files/patch-REFPROPMixtureBackend.diff b/python/py-coolprop/files/patch-REFPROPMixtureBackend.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7f0fdb50f73
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-coolprop/files/patch-REFPROPMixtureBackend.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Backends/REFPROP/REFPROPMixtureBackend.orig.cpp 2022-12-22 22:24:56.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Backends/REFPROP/REFPROPMixtureBackend.cpp 2022-12-22 22:25:18.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,7 +21,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define REFPROP_IMPLEMENTATION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define REFPROP_CSTYLE_REFERENCES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "externals/REFPROP-headers/REFPROP_lib.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <REFPROP-headers/REFPROP_lib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef REFPROP_IMPLEMENTATION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef REFPROP_CSTYLE_REFERENCES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-coolprop/files/patch-gui.diff b/python/py-coolprop/files/patch-gui.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7e5a7cf7d67
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-coolprop/files/patch-gui.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./wrappers/Python/CoolProp/GUI/CoolPropGUI.py.orig 2022-05-13 22:04:00.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./wrappers/Python/CoolProp/GUI/CoolPropGUI.py 2022-05-13 22:04:32.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import wx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import wx.grid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as WXCanvas
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-from matplotlib.backends.backend_wxagg import NavigationToolbar2Wx as WXToolbar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++from matplotlib.backends.backend_wxagg import NavigationToolbar2WxAgg as WXToolbar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import matplotlib as mpl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import CoolProp as CP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from CoolProp.Plots.Plots import Ph, Ts
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-coolprop/files/patch-psy.diff b/python/py-coolprop/files/patch-psy.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..266d380699f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-coolprop/files/patch-psy.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,49 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./wrappers/Python/CoolProp/Plots/psy.py.orig 2022-05-06 08:58:46.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./wrappers/Python/CoolProp/Plots/psy.py 2022-05-13 21:41:27.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2,18 +2,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -*- coding: utf-8 -*-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import os
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-import cPickle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-from ConfigParser import ConfigParser
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++import pickle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++from configparser import ConfigParser
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import numpy as np
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from pylab import Figure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from CoolProp.HumidAirProp import HAProps, HAProps_Aux
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-from PyQt4.QtGui import (QDialog, QGridLayout, QProgressBar, QLabel,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QDialogButtonBox, QPushButton, QFileDialog, QApplication)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ from PyQt4.QtGui import (QDialog, QGridLayout, QProgressBar, QLabel,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QDialogButtonBox, QPushButton, QFileDialog, QApplication)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++except ImportError:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ from PyQt5.QtWidgets import (QDialog, QGridLayout, QProgressBar, QLabel,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QDialogButtonBox, QPushButton, QFileDialog, QApplication)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Preferences = ConfigParser()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config_path = os.path.join(os.path.dirname(__file__), "psyrc")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -402,7 +407,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ filename = "%i.pkl" % P
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if os.path.isfile(filename):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ with open(filename, "r") as archivo:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- data = cPickle.load(archivo)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ data = pickle.load(archivo)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.status.setText("Loading cached data...")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QApplication.processEvents()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -410,7 +415,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.status.setText("Calculating data, be patient...")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QApplication.processEvents()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ data = PsyCoolprop.calculatePlot(self)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cPickle.dump(data, open(filename, "w"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pickle.dump(data, open(filename, "w"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.progressBar.setVisible(False)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.status.setText("Plotting...")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QApplication.processEvents()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-coolprop/files/patch-rapidjson.diff b/python/py-coolprop/files/patch-rapidjson.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0f8a052b9c7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-coolprop/files/patch-rapidjson.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/rapidjson_include.orig.h 2022-12-22 15:28:15.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/rapidjson_include.h 2022-12-22 15:28:47.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11,12 +11,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "Exceptions.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "CoolPropTools.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "externals/rapidjson/include/rapidjson/rapidjson.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "externals/rapidjson/include/rapidjson/document.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "externals/rapidjson/include/rapidjson/filewritestream.h" // wrapper of C stream for prettywriter as output
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "externals/rapidjson/include/rapidjson/prettywriter.h" // for stringify JSON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "externals/rapidjson/include/rapidjson/stringbuffer.h" // for string buffer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "externals/rapidjson/include/rapidjson/schema.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <rapidjson/rapidjson.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <rapidjson/document.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <rapidjson/filewritestream.h> // wrapper of C stream for prettywriter as output
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <rapidjson/prettywriter.h> // for stringify JSON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <rapidjson/stringbuffer.h> // for string buffer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <rapidjson/schema.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <cassert>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-coolprop/files/patch-setup.diff b/python/py-coolprop/files/patch-setup.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4df49f4fb06
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-coolprop/files/patch-setup.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- wrappers/Python/setup.orig.py 2022-12-21 14:38:05.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ wrappers/Python/setup.py 2022-12-21 14:38:23.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,7 +21,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for jsonfile in glob.glob(os.path.join('CoolProp', 'include', '*_JSON.h')):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print('removing', jsonfile)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os.remove(jsonfile)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- copytree(os.path.join(CProot, 'externals/fmtlib/fmt'), os.path.join('CoolProp', 'include', 'fmt')) # Should be deprecated
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #copytree(os.path.join(CProot, 'externals/fmtlib/fmt'), os.path.join('CoolProp', 'include', 'fmt')) # Should be deprecated
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #copytree(os.path.join(CProot, 'externals/fmtlib/include/fmt'), os.path.join('CoolProp','include','fmt'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy2(os.path.join(CProot, 'CoolPropBibTeXLibrary.bib'), os.path.join('CoolProp', 'CoolPropBibTeXLibrary.bib'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print('files copied.')
</span></pre><pre style='margin:0'>
</pre>