Skip to content

Commit 6bc592a

Browse files
authored
Merge pull request #880 from mendix/deprecations
Sort out supported / maintained versions
2 parents bb3bf81 + 6d193c3 commit 6bc592a

File tree

4 files changed

+38
-22
lines changed

4 files changed

+38
-22
lines changed

buildpack/core/runtime.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,25 +33,26 @@ def is_version_implemented(version):
3333
return bool(version.major >= 6)
3434

3535

36+
def is_version_extended_supported(version):
37+
# See https://docs.mendix.com/support/#extended-support
38+
return bool(version.major == 8 and version.minor == 24)
39+
40+
3641
def is_version_supported(version):
3742
# Support for the latest three major versions:
3843
# https://docs.mendix.com/releasenotes/studio-pro/lts-mts
39-
return bool(version.major >= 7)
44+
return bool(version.major >= 9)
4045

4146

4247
def is_version_maintained(version):
4348
# LTS / MTS versions: https://docs.mendix.com/releasenotes/studio-pro/lts-mts
44-
if version.major == 8 and version.minor == 18:
49+
if version.major == 8 and version.minor == 24:
4550
return True
4651
if version.major == 9 and version.minor == 24:
4752
return True
48-
if version.major == 10 and version.minor == 6:
49-
return True
50-
if version.major == 10 and version.minor == 12:
51-
return True
52-
if version.major == 10 and version.minor == 18:
53+
if version.major == 10 and version.minor == 24:
5354
return True
54-
if version.major == 10 and version.minor == 21:
55+
if version.major == 11:
5556
return True
5657
return False
5758

buildpack/stage.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,15 @@ def preflight_check(version):
7474
raise NotImplementedError(
7575
"Mendix [{version.major}] is not supported by this buildpack"
7676
)
77-
if not runtime.is_version_supported(version):
77+
if runtime.is_version_extended_supported(version):
78+
logging.warning(
79+
"Mendix [%s] is in Extended Support "
80+
"(https://docs.mendix.com/support/#extended-support)."
81+
"Please use a supported Mendix version "
82+
"(https://docs.mendix.com/releasenotes/studio-pro/lts-mts).",
83+
version.major,
84+
)
85+
elif not runtime.is_version_supported(version):
7886
logging.warning(
7987
"Mendix [%s] is end-of-support. Please use a supported Mendix version "
8088
"(https://docs.mendix.com/releasenotes/studio-pro/lts-mts).",

lib/m2ee/config.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,8 @@ def get_default_dotm2ee_directory(self):
465465

466466
logger.debug(traceback.format_exc())
467467
logger.critical(
468-
"Directory %s does not exist, and cannot be " "created!"
468+
"Directory %s does not exist, and cannot be " "created!",
469+
dotm2ee
469470
)
470471
logger.critical(
471472
"If you do not want to use .m2ee in your home "

tests/unit/test_deprecations.py

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55

66
# Current supported / maintained versions
77
# (https://docs.mendix.com/releasenotes/studio-pro/lts-mts):
8-
# - Mendix 7: 7.23.x (LTS)
9-
# - Mendix 8: 8.18.x (LTS)
10-
# - Mendix 9: 9.6.x (MTS), 9.12.x (MTS), 9.18.x (MTS), 9.24.x (LTS)
8+
# - Mendix 8: 8.18.x (Extended Support until July 2026)
9+
# - Mendix 9: 9.24.x (LTS)
10+
# - Mendix 10: 10.24.x (LTS)
11+
# - Mendix 11: 11.x until 11.6 (MTS) is released (December 2025)
1112

1213

1314
class TestCaseMxImplemented(TestCase):
@@ -22,18 +23,23 @@ class TestCaseMxSupported(TestCase):
2223
def test_mx6_not_supported(self):
2324
assert not runtime.is_version_supported(MXVersion("6.2"))
2425

25-
def test_mx7_supported(self):
26-
assert runtime.is_version_supported(MXVersion("7.16"))
26+
def test_mx11_supported(self):
27+
assert runtime.is_version_supported(MXVersion("11.6"))
28+
29+
30+
class TestCaseMxExtendedSupported(TestCase):
31+
def test_mx7_not_extended_supported(self):
32+
assert not runtime.is_version_extended_supported(MXVersion("7.2"))
33+
34+
def test_mx8_extended_supported(self):
35+
assert runtime.is_version_extended_supported(MXVersion("8.24"))
2736

2837

2938
class TestCaseMxMaintained(TestCase):
3039
def test_mx7_not_maintained(self):
3140
assert not runtime.is_version_maintained(MXVersion("7.23.1"))
3241
assert not runtime.is_version_maintained(MXVersion("7.16"))
3342

34-
def test_mx8_maintained(self):
35-
assert runtime.is_version_maintained(MXVersion("8.18.1"))
36-
3743
def test_mx8_not_maintained(self):
3844
assert not runtime.is_version_maintained(MXVersion("8.17"))
3945

@@ -46,10 +52,10 @@ def test_mx9_not_maintained(self):
4652
assert not runtime.is_version_maintained(MXVersion("9.12.1"))
4753

4854
def test_mx10_maintained(self):
49-
assert runtime.is_version_maintained(MXVersion("10.6.1"))
50-
assert runtime.is_version_maintained(MXVersion("10.12.1"))
51-
assert runtime.is_version_maintained(MXVersion("10.18.1"))
52-
assert runtime.is_version_maintained(MXVersion("10.21.1"))
55+
assert runtime.is_version_maintained(MXVersion("10.24.1"))
5356

5457
def test_mx10_not_maintained(self):
5558
assert not runtime.is_version_maintained(MXVersion("10.5.1"))
59+
60+
def test_mx11_maintained(self):
61+
assert runtime.is_version_maintained(MXVersion("11.5.1"))

0 commit comments

Comments
 (0)