From 17462d274bf1cd1ea904625513db481e11c0d9b3 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 28 Sep 2022 16:15:32 +0200 Subject: [PATCH 1/3] Upgrade SciPy to 1.9.1 This _should_ fix a bug where Cura crashes due to a username with non-latin characters in Windows. This is due to the creation and removal of temporary files by SciPy, which on Windows, happens in the users' folder. CURA-8416 --- requirements.txt | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/requirements.txt b/requirements.txt index 60dcb77bea..70a91f9a0e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -66,16 +66,30 @@ pyclipper==1.3.0.post2; \ --hash=sha256:5175ee50772a7dcc0feaab19ccf5b979b6066f4753edb330700231cf70d0c918 \ --hash=sha256:19a6809d9cbd535d0fe922e9315babb8d70b5c7dcd43e0f89740d09c406b40f8 \ --hash=sha256:5c5d50498e335d7f969ca5ad5886e77c40088521dcabab4feb2f93727140251e -scipy==1.8.1; \ - --hash=sha256:9e3fb1b0e896f14a85aa9a28d5f755daaeeb54c897b746df7a55ccb02b340f33 \ - --hash=sha256:4e53a55f6a4f22de01ffe1d2f016e30adedb67a699a310cdcac312806807ca81 \ - --hash=sha256:a0aa8220b89b2e3748a2836fbfa116194378910f1a6e78e4675a095bcd2c762d \ - --hash=sha256:02b567e722d62bddd4ac253dafb01ce7ed8742cf8031aea030a41414b86c1125 \ - --hash=sha256:65b77f20202599c51eb2771d11a6b899b97989159b7975e9b5259594f1d35ef4 \ - --hash=sha256:9dd4012ac599a1e7eb63c114d1eee1bcfc6dc75a29b589ff0ad0bb3d9412034f \ - --hash=sha256:70de2f11bf64ca9921fda018864c78af7147025e467ce9f4a11bc877266900a6 \ - --hash=sha256:83606129247e7610b58d0e1e93d2c5133959e9cf93555d3c27e536892f1ba1f2 \ - --hash=sha256:f3e7a8867f307e3359cc0ed2c63b61a1e33a19080f92fe377bc7d49f646f2ec1 +scipy==1.9.1 \ + --hash=sha256:c61b4a91a702e8e04aeb0bfc40460e1f17a640977c04dda8757efb0199c75332 \ + --hash=sha256:d79da472015d0120ba9b357b28a99146cd6c17b9609403164b1a8ed149b4dfc8 \ + --hash=sha256:825951b88f56765aeb6e5e38ac9d7d47407cfaaeb008d40aa1b45a2d7ea2731e \ + --hash=sha256:f950a04b33e17b38ff561d5a0951caf3f5b47caa841edd772ffb7959f20a6af0 \ + --hash=sha256:8cc81ac25659fec73599ccc52c989670e5ccd8974cf34bacd7b54a8d809aff1a \ + --hash=sha256:8d3faa40ac16c6357aaf7ea50394ea6f1e8e99d75e927a51102b1943b311b4d9 \ + --hash=sha256:7a412c476a91b080e456229e413792bbb5d6202865dae963d1e6e28c2bb58691 \ + --hash=sha256:eb954f5aca4d26f468bbebcdc5448348eb287f7bea536c6306f62ea062f63d9a \ + --hash=sha256:3c6f5d1d4b9a5e4fe5e14f26ffc9444fc59473bbf8d45dc4a9a15283b7063a72 \ + --hash=sha256:bc4e2c77d4cd015d739e75e74ebbafed59ba8497a7ed0fd400231ed7683497c4 \ + --hash=sha256:0419485dbcd0ed78c0d5bf234c5dd63e86065b39b4d669e45810d42199d49521 \ + --hash=sha256:34441dfbee5b002f9e15285014fd56e5e3372493c3e64ae297bae2c4b9659f5a \ + --hash=sha256:b97b479f39c7e4aaf807efd0424dec74bbb379108f7d22cf09323086afcd312c \ + --hash=sha256:e8fe305d9d67a81255e06203454729405706907dccbdfcc330b7b3482a6c371d \ + --hash=sha256:39ab9240cd215a9349c85ab908dda6d732f7d3b4b192fa05780812495536acc4 \ + --hash=sha256:71487c503e036740635f18324f62a11f283a632ace9d35933b2b0a04fd898c98 \ + --hash=sha256:3bc1ab68b9a096f368ba06c3a5e1d1d50957a86665fc929c4332d21355e7e8f4 \ + --hash=sha256:f7c39f7dbb57cce00c108d06d731f3b0e2a4d3a95c66d96bce697684876ce4d4 \ + --hash=sha256:47d1a95bd9d37302afcfe1b84c8011377c4f81e33649c5a5785db9ab827a6ade \ + --hash=sha256:96d7cf7b25c9f23c59a766385f6370dab0659741699ecc7a451f9b94604938ce \ + --hash=sha256:09412eb7fb60b8f00b328037fd814d25d261066ebc43a1e339cdce4f7502877e \ + --hash=sha256:90c805f30c46cf60f1e76e947574f02954d25e3bb1e97aa8a07bc53aa31cf7d1 \ + --hash=sha256:26d28c468900e6d5fdb37d2812ab46db0ccd22c63baa095057871faa3a498bc9 trimesh==3.9.36 \ --hash=sha256:f01e8edab14d1999700c980c21a1546f37417216ad915a53be649d263130181e \ --hash=sha256:8ac8bea693b3ee119f11b022fc9b9481c9f1af06cb38bc859bf5d16bbbe49b23 From f1250514ef6ddb74014313567641e847423dd79e Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 28 Sep 2022 17:21:31 +0200 Subject: [PATCH 2/3] Prevent building with prerelease-string if none present. --- conanfile.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 327a571e54..29cb38502a 100644 --- a/conanfile.py +++ b/conanfile.py @@ -157,7 +157,10 @@ class CuraConan(ConanFile): version.prerelease = self.options.extra_build_version if self.options.internal: version.prerelease = version.prerelease.replace('+', '+internal_') - cura_version = f"{version.major}.{version.minor}.{version.patch}-{version.prerelease}" + if version.prerelease and version.prerelease != "": + cura_version = f"{version.major}.{version.minor}.{version.patch}-{version.prerelease}" + else: + cura_version = f"{version.major}.{version.minor}.{version.patch}" with open(Path(location, "CuraVersion.py"), "w") as f: f.write(cura_version_py.render( From 91c6f17bb31175d8654f94ee46f125d2642b6d8c Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 28 Sep 2022 17:40:47 +0200 Subject: [PATCH 3/3] Not building with prerelease-string if none present. --- conanfile.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/conanfile.py b/conanfile.py index 29cb38502a..c032d6d83f 100644 --- a/conanfile.py +++ b/conanfile.py @@ -153,12 +153,13 @@ class CuraConan(ConanFile): cura_version = self.conf_info.get("user.cura:version", default = self.version, check_type = str) version = Version(cura_version) + prerelease = "" if self.options.extra_build_version != "": - version.prerelease = self.options.extra_build_version + prerelease = self.options.extra_build_version if self.options.internal: - version.prerelease = version.prerelease.replace('+', '+internal_') - if version.prerelease and version.prerelease != "": - cura_version = f"{version.major}.{version.minor}.{version.patch}-{version.prerelease}" + prerelease = version.prerelease.replace('+', '+internal_') + if prerelease != "": + cura_version = f"{version.major}.{version.minor}.{version.patch}-{prerelease}" else: cura_version = f"{version.major}.{version.minor}.{version.patch}"