datamodel_code_generator/__main__.py

@@ -399,9 +399,9 @@ def main(args: Optional[Sequence[str]] = None) -> Exit:
     arg_parser.parse_args(args, namespace=namespace)
 
     if namespace.version:
-        from datamodel_code_generator.version import version
+        from datamodel_code_generator import get_version
 
-        print(version)
+        print(get_version())
         exit(0)
 
     pyproject_config = _get_pyproject_toml_config(Path().resolve())

pyproject.toml

@@ -37,7 +37,7 @@ dependencies = [
   "graphql-core>=3.2.3",
   "httpx>=0.24.1",
   "inflect>=4.1,<6",
-  "isort>=4.3.21,<6",
+  "isort>=4.3.21,<7",
   "jinja2>=2.10.1,<4",
   "openapi-spec-validator>=0.2.8,<0.7",
   "packaging",

tests/main/graphql/test_main_graphql.py

@@ -218,15 +218,15 @@ def test_main_graphql_additional_imports_isort_4():
 
 
 @pytest.mark.skipif(
-    not isort.__version__.startswith('5.'),
+    isort.__version__.startswith('4.'),
     reason='See https://github.com/PyCQA/isort/issues/1600 for example',
 )
 @freeze_time('2019-07-26')
 @pytest.mark.skipif(
     black.__version__.split('.')[0] == '19',
     reason="Installed black doesn't support the old style",
 )
-def test_main_graphql_additional_imports_isort_5():
+def test_main_graphql_additional_imports_isort_5_or_6():
     with TemporaryDirectory() as output_dir:
         output_file: Path = Path(output_dir) / 'output.py'
         return_code: Exit = main(

tests/main/jsonschema/test_main_jsonschema.py

@@ -2458,7 +2458,7 @@ def test_version(capsys):
         main(['--version'])
     assert e.value.code == Exit.OK
     captured = capsys.readouterr()
-    assert captured.out == '0.0.0\n'
+    assert captured.out != '0.0.0\n'
     assert captured.err == ''