GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 06:39:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use dev as development version

Browse Source 
Since we're no longer running from `master` branch
It is more fitting to rename it to either dev or
main. This version is only used when running from
source when the CURA_VERSION variable isn't set
while performing the `conan install`

Contributes to CURA-9365
This commit is contained in:
j.spijker@ultimaker.com 2022-06-13 08:40:48 +02:00 committed by Jelle Spijker
parent c04fdfef47
commit 04f16bfcad
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conandata.yml
View File

@ -1,4 +1,4 @@
"main": "dev":
git: git:
fdm_materials: fdm_materials:
url: "https://github.com/Ultimaker/fdm_materials.git" url: "https://github.com/Ultimaker/fdm_materials.git"

4
conanfile.py
View File

@ -52,7 +52,7 @@ class CuraConan(ConanFile):
if "CURA_VERSION" in os.environ: if "CURA_VERSION" in os.environ:
self.version = os.environ["CURA_VERSION"] self.version = os.environ["CURA_VERSION"]
else: else:
self.version = "main" self.version = "dev"
@property @property
def _staging(self): def _staging(self):
@ -93,7 +93,7 @@ class CuraConan(ConanFile):
def validate(self): def validate(self):
if self.version: if self.version:
if self.version != "main" and tools.Version(self.version) <= tools.Version("4"): if self.version != "dev" and tools.Version(self.version) <= tools.Version("4"):
raise ConanInvalidConfiguration("Only versions 5+ are support") raise ConanInvalidConfiguration("Only versions 5+ are support")
def requirements(self): def requirements(self):

2
cura/ApplicationMetadata.py
View File

@ -6,7 +6,7 @@
# --------- # ---------
DEFAULT_CURA_APP_NAME = "cura" DEFAULT_CURA_APP_NAME = "cura"
DEFAULT_CURA_DISPLAY_NAME = "Ultimaker Cura" DEFAULT_CURA_DISPLAY_NAME = "Ultimaker Cura"
DEFAULT_CURA_VERSION = "master" DEFAULT_CURA_VERSION = "dev"
DEFAULT_CURA_BUILD_TYPE = "" DEFAULT_CURA_BUILD_TYPE = ""
DEFAULT_CURA_DEBUG_MODE = False DEFAULT_CURA_DEBUG_MODE = False

2
cura/Backups/Backup.py
View File

@ -136,7 +136,7 @@ class Backup:
return False return False
current_version = Version(self._application.getVersion()) current_version = Version(self._application.getVersion())
version_to_restore = Version(self.meta_data.get("cura_release", "master")) version_to_restore = Version(self.meta_data.get("cura_release", "dev"))
if current_version < version_to_restore: if current_version < version_to_restore:
# Cannot restore version newer than current because settings might have changed. # Cannot restore version newer than current because settings might have changed.