Commit graph

4979 commits

Author SHA1 Message Date
ChrisTerBeke
68a90ec510 Use simple models instead of namedtuples
Named tuples would throw a TypeError if an unknown attribute was set, but we just want to ignore those
2018-11-26 14:08:21 +01:00
Ghostkeeper
48c24b1034
Remove log entry for bonjour services added
For most networks that would not be a problematic log entry. But for our own debugging on Ultimaker's network this is a very spammy log entry and doesn't add much value anyway.
2018-11-23 10:50:16 +01:00
Marijn Deé
76542a82d5 Removed the asserts on internals 2018-11-23 10:33:57 +01:00
Ian Paschal
9f1ce72b9e Add Cura 4.0 printer cards
Contributes to CL-1150
2018-11-23 10:03:08 +01:00
Marijn Deé
294527f7fe Review changes 2018-11-23 09:21:09 +01:00
Marijn Deé
bb5c0326de Used duoble quotes iso single quotes 2018-11-23 09:20:19 +01:00
Simon Edwards
ee7355c2bb
Merge pull request #4841 from Ultimaker/CL-1148_restyling_monitor_queue_tiles
CL-1148 Re-styling monitor queue tiles
2018-11-22 15:08:42 +01:00
Ian Paschal
963b8aa974 Fix QML warnings
Contributes to CL-1148
2018-11-22 13:56:01 +01:00
Ian Paschal
55554c62a9 Use array for extruder configurations
Contributes to CL-1148
2018-11-22 13:55:43 +01:00
Ian Paschal
da834d6a1f Silence binding loop
Contributes to CL-1148
2018-11-22 13:55:22 +01:00
Ian Paschal
1de21c1d94 Remove unnecessary "else"
Contributes to CL-1148
2018-11-22 13:13:06 +01:00
Ian Paschal
3c3343a407 Use bool for expanded or collapsed state
Contributes to CL-1148
2018-11-22 13:11:59 +01:00
Aleksei S
088b2f6f28 Added an extra import module, did not pass coding style test
CURA-5936
2018-11-22 11:36:32 +01:00
Aleksei S
c765615f1a Merge branch 'master' into fix_version_upgrade_returning_none 2018-11-22 11:17:44 +01:00
Ian Paschal
ba7863c9d9 Fix type error for hovering manage queue link
Contributes to CL-1148
2018-11-22 11:09:35 +01:00
Marijn Deé
352427e460 Moved exception handling closer to the cause of error 2018-11-22 10:01:15 +01:00
Marijn Deé
7e3f86f091 Moved some of the mocks to class level because they are used in every test method 2018-11-22 09:37:47 +01:00
Marijn Deé
7b0f8882a2 Reverted models to namedtuples from collections because
NamedTuple is a Python3.6 feature
2018-11-21 11:01:26 +01:00
Marijn Deé
9e8be286af Used NamedTuple from typing iso namedtuple from collections so we can at least give type hints 2018-11-21 10:12:53 +01:00
Marijn Deé
f3338aa187 Fixed the failing tests 2018-11-20 16:53:01 +01:00
Marijn Deé
ca60744292 Made the tests work with the named tuples
Tests only use the _onGetRemoteMaterial
2018-11-20 16:34:11 +01:00
Marijn Deé
481ca8cd2f Fixed some bugs and added the color_code field to the named tuple 2018-11-20 16:33:52 +01:00
Ian Paschal
2f84339f5c Finalize queue
Contributes to CL-1148
2018-11-20 15:58:09 +01:00
Ian Paschal
fb3cb67da0 Add printer configuration components
Contributes to CL-1148
2018-11-20 13:46:41 +01:00
Ian Paschal
421a64c7b0 Replace queued print job cards with new design
Contributes to CL-1148
2018-11-19 16:42:36 +01:00
ChrisTerBeke
2497325d60 Test with named tuples, not working yet 2018-11-19 16:35:19 +01:00
ChrisTerBeke
c04ce7fce8 Use call_count on specific method to be more precise 2018-11-19 15:44:07 +01:00
ChrisTerBeke
60dd130393 Use logException where possible 2018-11-19 15:39:12 +01:00
ChrisTerBeke
66fbadf2de Convert all single quotes to double quotes 2018-11-19 15:37:56 +01:00
ChrisTerBeke
9d8583a3b6 Revert "Fix running tests in plugin using pytest"
This reverts commit f8f133d2ef.
2018-11-19 15:10:35 +01:00
ChrisTerBeke
d65114bd56 use call_count to assert device was not called 2018-11-19 15:08:58 +01:00
ChrisTerBeke
0b1ac87354 Fix some formatting, cleanup import 2018-11-19 15:03:43 +01:00
ChrisTerBeke
dc17bd8499 Fix the first tests 2018-11-19 13:54:45 +01:00
ChrisTerBeke
f8f133d2ef Fix running tests in plugin using pytest 2018-11-19 13:42:28 +01:00
ChrisTerBeke
951a21ead7 Merge branch 'master' into tests-for-um3networkplugin 2018-11-19 10:58:07 +01:00
ChrisTerBeke
ee9210d8d1 Rewrite tests 2018-11-19 10:57:47 +01:00
ChrisTerBeke
23e957e1c5 Some more refactoring, splitting up methods 2018-11-19 10:44:24 +01:00
Marijn Deé
22aac7b566 Renamed TestContainerRegistry to ContainerRegistryMock 2018-11-16 16:35:08 +01:00
Marijn Deé
565f009e9b Added comments 2018-11-16 16:34:44 +01:00
Marijn Deé
1000625d69 Added spaces around all = 2018-11-16 16:07:17 +01:00
Marijn Deé
0062250238 Moved the test to the plugin directory 2018-11-16 16:06:36 +01:00
Marijn Deé
695d45ffbe Initialize the models with None 2018-11-16 15:54:07 +01:00
Marijn Deé
e9e8c49b2d Added tests for SendMaterialJob and refactored SendMaterialJob for
better testability. This is part of a larger project to create tests
for the UM3NetworkPrinting plugin in preparation for printing from the
cloud
2018-11-16 14:16:45 +01:00
Ghostkeeper
e9216936d7
Compare SDK version as Version instances
This allows it to compare versions that are remote as integer and local as string, or vice-versa. Much more robust.

Contributes to issue CURA-5940.
2018-11-15 15:20:21 +01:00
Ghostkeeper
78e6494430
Read SDK version from new semver field
The sdk_version field should stay the ordinary plain number (the major version number of the semver field) so that older Cura versions don't break. Newly built packages will get built with both sdk_version_semver and the normal sdk_version, so that the packages can be read with any Cura version from 3.6 onwards.

Contributes to issue CURA-5940.
2018-11-15 15:13:36 +01:00
Ghostkeeper
163f102dda
Make extension menu items translatable
If these extension plug-ins don't set their menu names, the plug-in name is used as the menu name. The plug-in names are not translated, so this appears as an untranslated string then.
2018-11-15 09:38:14 +01:00
Ghostkeeper
8ec7d6dba3
Fix type issues in old version upgrade plug-ins
The one actual change was this: To give a KeyError when stuff can't be found in a dictionary, rather than returning None there and then getting a TypeError later.

Contributes to issue CURA-5936.
2018-11-14 13:56:46 +01:00
Ghostkeeper
b67d8d4103
Fix type of fallback variable
These have to be strings because the configparser getter can only return strings.

Contributes to issue CURA-5936.
2018-11-14 13:46:13 +01:00
Ghostkeeper
ae2b312472
Add typing for all version upgrade plug-ins
Hopefully we'll take this typing along when we next copy-paste the stuffs.

Contributes to issue CURA-5936.
2018-11-14 13:41:23 +01:00
alekseisasin
103d79c89d
Merge pull request #4781 from Ultimaker/fix_legacy_profile_importer
Fix legacy profile importer
2018-11-14 13:00:39 +01:00