Commit graph

4892 commits

Author SHA1 Message Date
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
alekseisasin
103d79c89d
Merge pull request #4781 from Ultimaker/fix_legacy_profile_importer
Fix legacy profile importer
2018-11-14 13:00:39 +01:00
Remco Burema
5f4e3948d3 Merge branch 'master' into CURA-5840-make-plugin-sdk-use-semantic-versioning 2018-11-13 13:16:22 +01:00
Ghostkeeper
87cbc3907c
Convert to string before storing in configparser
Because configparser can only handle strings.

Contributes to issue CURA-5929.
2018-11-13 12:05:14 +01:00
Ghostkeeper
7bd55f5064
Add test for read() function
This is complex.
I don't want to get into the actual translations from the DoD here.

Contributes to issue CURA-5929.
2018-11-12 16:28:29 +01:00
Ghostkeeper
bfe5ae6f9c
Merge branch '3.6' 2018-11-12 15:48:22 +01:00
Ghostkeeper
7e87a303cb
Remove config_section parameter
Just always take 'profile'. We don't need to test with anything else. Just adjust the data to it.

Contributes to issue CURA-5929.
2018-11-12 13:49:13 +01:00
Ghostkeeper
e18ea4bca4
Expect a NoSectionError if testing with a section that is missing
We want to get that error in order to debug.

Contributes to issue CURA-5929.
2018-11-12 13:47:24 +01:00
Ghostkeeper
53c9cdc3fe
Add alternative scenarios for prepareLocals
Contributes to issue CURA-5929.
2018-11-12 13:42:14 +01:00
Ghostkeeper
91e8c177fe
Add test for prepareLocal
Contributes to issue CURA-5929.
2018-11-12 13:35:18 +01:00
Ghostkeeper
0bf7bf4cbe
Fix handling dictionaries without 'defaults' section
According to the test, this should return an empty dict then.

Contributes to issue CURA-5929.
2018-11-12 13:33:44 +01:00
Ghostkeeper
bbbb08c793
Add test for prepareDefaults
Contributes to issue CURA-5929.
2018-11-12 13:02:28 +01:00
Ghostkeeper
27aff4e5da
Fix typing issues
Because this function now has typing, it's raising a load of issues with it.

Contributes to issue CURA-5929.
2018-11-12 12:48:49 +01:00
Ghostkeeper
6022ed0f23
Update target version in DoD
There are no changes to these settings, luckily.
This target version is now only here for documentation (like source_version was). It is no longer actually used by the code.

Contributes to issue CURA-5929.
2018-11-12 12:06:00 +01:00
Ghostkeeper
6ad682b00d
Don't serialise legacy profile via Profile instance
That profile instance was being explicitly set to version 1 (but then serialised as version 4) and then deserialised with upgrade, so the upgrade was thinking it was upgrading from version 1 to 4, but it was actually upgrading a file which was already at version 4. We shouldn't use the Profile() instance at all but just perform the upgrade on simple string data generated by the configparser.
This also updates the format to the newest version (since that was easiest for me to reimplement) but we don't need to ever update this again because it gets passed through the version upgrade system, which upgrades it from version 4000005 to the latest version in the future.

Contributes to issue CURA-5929.
2018-11-12 12:02:49 +01:00
Ghostkeeper
9d94b0d63e
Rename input vs. output parsers
Technically you could re-use the variable name but that is confusing.

Contributes to issue CURA-5929.
2018-11-12 11:16:33 +01:00
Mark
3d1a9a6f5b Increase lines shown from 3 to 6 2018-11-12 09:28:48 +01:00
Remco Burema
8e05c2adcb Have translation instead of plain string for Safety Data Sheets and Printing Guidelines. [CURA-5922] 2018-11-09 15:27:02 +01:00
Remco Burema
9bc85fcda7 Merge branch 'CURA-5922_add_safety_data_sheet_links' of https://github.com/Ultimaker/Cura into master_CURA-5922_add_safety_data_sheet_links 2018-11-09 15:16:22 +01:00
Ghostkeeper
7f54cacd0f
Code style
Discovered during work on CURA-5840.
2018-11-09 14:11:38 +01:00
Remco Burema
c8d9ad37ff Add Printing Guidelines links to materials in Marketplace. [CURA-5922] 2018-11-09 13:49:14 +01:00
Remco Burema
21d4cd8f9f Add Safety Data Sheet links to materials in Marketplace. [CURA-5922] 2018-11-09 13:44:42 +01:00
Lipu Fei
c2e6bb8bc6 Merge remote-tracking branch 'origin/3.6' 2018-11-09 09:48:05 +01:00
Lipu Fei
80bf7bb989
Merge pull request #4757 from Ultimaker/CURA-5915_quality_profiles_upgrade
Add version upgrade for quality profiles
2018-11-09 09:20:45 +01:00
Jaime van Kessel
d3302938b2 Fix technical data sheet not showing if there is no support_configs 2018-11-08 16:38:38 +01:00
Diego Prado Gesto
94e27fbbdb Add the quality folder to the version upgrade in order to update quality
profiles.

Contributes to CURA-5915.
2018-11-08 15:42:39 +01:00
Lipu Fei
369747d106 Merge remote-tracking branch 'origin/3.6' 2018-11-08 15:28:42 +01:00
Lipu Fei
75f2f40534 Make API version configuration for Application
CURA-5840
2018-11-08 12:04:43 +01:00
Simon Edwards
69c9ffaf61
Merge pull request #4755 from Ultimaker/CL-1040_show_print_time_in_monitor
CL-1140 Show print time in monitor tab
2018-11-08 11:53:47 +01:00
Ian Paschal
aa6ec9e44b Make text black
Contributes to CL-1040
2018-11-08 11:48:22 +01:00
Lipu Fei
de6ab02422 Merge pull request #4678 from fieldOfView/fix_networkprinter_post
Fix type error in NetworkedPrinterOutputDevice.post
2018-11-08 11:05:47 +01:00
Lipu Fei
59b8bdec54
Merge pull request #4678 from fieldOfView/fix_networkprinter_post
Fix type error in NetworkedPrinterOutputDevice.post
2018-11-08 11:02:57 +01:00
Ian Paschal
35ed234991 Show print time in monitor tab
Contributes to CL-1040
2018-11-08 10:49:22 +01:00
Ghostkeeper
d8a1d458cf
Merge branch '3.6' 2018-11-08 09:49:15 +01:00
fieldOfView
f12efb7aa1 Fix LegacyUM3OutputDevice post() call 2018-11-07 16:07:45 +01:00
Jaime van Kessel
36a9642c90 Merge branch 'CURA-5887_fix_material_shown_in_print_job' of github.com:Ultimaker/Cura 2018-11-07 12:39:41 +01:00
Jaime van Kessel
68512a2184 Merge branch '3.6' of github.com:Ultimaker/Cura into 3.6 2018-11-07 12:35:25 +01:00
Jaime van Kessel
9a93f6866a Fix crash of toolbox when metadata got corrupted 2018-11-07 12:03:32 +01:00
Diego Prado Gesto
44ab6dee77
Merge pull request #4748 from Ultimaker/CURA-5900_rename_cc_red_06_to_cc_06
[3.6] [CURA-5900] Rename "CC Red 0.6" to "CC 0.6"
2018-11-07 11:21:09 +01:00