From f57f045ee9c796ccab3d601d6879dc772180a143 Mon Sep 17 00:00:00 2001 From: dbeltran Date: Fri, 3 May 2024 15:20:31 +0200 Subject: [PATCH 1/4] fix %% in additional templates --- autosubmit/job/job.py | 2 ++ requeriments.txt | 58 ++++++++++++++++------------------------ setup.py | 61 ++++++++++++++++--------------------------- 3 files changed, 46 insertions(+), 75 deletions(-) diff --git a/autosubmit/job/job.py b/autosubmit/job/job.py index c76ecf5e1..fa61fd9eb 100644 --- a/autosubmit/job/job.py +++ b/autosubmit/job/job.py @@ -2076,6 +2076,8 @@ class Job(object): # append to a list all names don't matter the location, inside additional_template_content that starts with % and ends with % placeholders_inside_additional_template = re.findall('%(? "3.7"] -zipp>=3.1.0 -cython -autosubmitconfigparser==1.0.61 -paramiko>=3.4 -bcrypt>=3.2 -PyNaCl>=1.5.0 -configobj>=5.0.6 -python-dateutil>=2.8.2 -matplotlib<=3.8.3 -py3dotplus>=1.1.0 -pyparsing>=3.0.7 -mock>=4.0.3 -portalocker>=2.3.2,<=2.7.0 -networkx==2.6.3 -requests>=2.27.1 -bscearth.utils>=0.5.2 -cryptography>=36.0.1 -xlib>=0.21 -pip>=22.0.3 -ruamel.yaml==0.17.21 -pythondialog -pytest -nose -coverage -six>=1.10.0 -Pygments -wheel -psutil -rocrate==0.* -packaging==23 -setuptools>=69 -typing_extensions>=4.9 +xlib==0.21, +setuptools<=68.2.2, +bscearth.utils<=0.5.2, +requests<=2.31.0, +networkx<=2.6.3, +portalocker<=2.7.0, +mock<=5.1.0, +paramiko<=3.4, +pyparsing==3.1.1, +matplotlib<=3.8.3, +argparse<=1.4.0, +packaging<=23.2, +ruamel.yaml.clib<=0.2.8, +typing_extensions<=4.9.0, +typing<=3.7.4.3, +psutil<=5.6.1, +networkx<=2.6.3, +py3dotplus==1.1.0, +matplotlib<=3.8.3, +numpy<2, +ruamel.yaml==0.17.21, +rocrate==0.*, [:python_version <= "3.7"] PyNaCl==1.5.0 @@ -44,15 +33,12 @@ networkx==2.6.3 portalocker==2.7.0 mock==5.1.0 paramiko==3.3.1 -pyparsing==3.1.1 -py3dotplus==1.1.0 matplotlib==3.5.3 python_dateutil==2.8.2 argparse==1.4.0 configobj==5.0.8 packaging==23.2 bcrypt==4.0.1 -ruamel.yaml==0.17.21 charset_normalizer==3.3.1 kiwisolver==1.4.5 fonttools==4.43.1 diff --git a/setup.py b/setup.py index 094930227..dd3637761 100644 --- a/setup.py +++ b/setup.py @@ -40,6 +40,28 @@ setup( download_url='https://earth.bsc.es/wiki/doku.php?id=tools:autosubmit', keywords=['climate', 'weather', 'workflow', 'HPC'], install_requires=[ + 'xlib==0.21', + 'setuptools<=68.2.2', + 'bscearth.utils<=0.5.2', + 'requests<=2.31.0', + 'networkx<=2.6.3', + 'portalocker<=2.7.0', + 'mock<=5.1.0', + 'paramiko<=3.4', + 'pyparsing==3.1.1', + 'matplotlib<=3.8.3', + 'argparse<=1.4.0', + 'packaging<=23.2', + 'ruamel.yaml.clib<=0.2.8', + 'typing_extensions<=4.9.0', + 'typing<=3.7.4.3', + 'psutil<=5.6.1', + 'networkx<=2.6.3', + 'py3dotplus==1.1.0', + 'matplotlib<=3.8.3', + 'numpy<2', + 'ruamel.yaml==0.17.21', + 'rocrate==0.*', ], extras_require={ ':python_version <= "3.7"': @@ -55,20 +77,16 @@ setup( 'portalocker==2.7.0', 'mock==5.1.0', 'paramiko==3.3.1', - 'pyparsing==3.1.1', - 'py3dotplus==1.1.0', 'matplotlib==3.5.3', 'python_dateutil==2.8.2', 'argparse==1.4.0', 'configobj==5.0.8', 'packaging==23.2', 'bcrypt==4.0.1', - 'ruamel.yaml==0.17.21', 'charset_normalizer==3.3.1', 'kiwisolver==1.4.5', 'fonttools==4.43.1', 'cycler==0.12.1', - 'ruamel.yaml.clib==0.2.8', 'typing_extensions==4.8.0', 'psutil==5.6.1', 'Pygments==2.3.1', @@ -86,41 +104,6 @@ setup( 'Pillow==6.2.1', 'numpy==1.17.4', ], - ':python_version > "3.7"': - [ - 'zipp>=3.1.0', - 'cython', - 'autosubmitconfigparser==1.0.61', - 'paramiko>=3.4', - 'bcrypt>=3.2', - 'PyNaCl>=1.5.0', - 'configobj>=5.0.6', - 'python-dateutil>=2.8.2', - 'matplotlib<=3.8.3', - 'py3dotplus>=1.1.0', - 'pyparsing>=3.0.7', - 'mock>=4.0.3', - 'portalocker>=2.3.2,<=2.7.0', - 'networkx==2.6.3', - 'requests>=2.27.1', - 'bscearth.utils>=0.5.2', - 'cryptography>=36.0.1', - 'xlib>=0.21', - 'pip>=22.0.3', - 'ruamel.yaml==0.17.21', - 'pythondialog', - 'pytest', - 'nose', - 'coverage', - 'six>=1.10.0', - 'Pygments', - 'wheel', - 'psutil', - 'rocrate==0.*', - 'packaging==23', - 'setuptools>=69', - 'typing_extensions>=4.9' - ], }, classifiers=[ "Programming Language :: Python :: 3.7", -- GitLab From 630ad8eb7805da96d421bc3ea08830c23896015f Mon Sep 17 00:00:00 2001 From: dbeltran Date: Fri, 3 May 2024 15:22:59 +0200 Subject: [PATCH 2/4] update version --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index b673f6ac1..00abb799c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.1.5 \ No newline at end of file +4.1.6 \ No newline at end of file -- GitLab From 328be647403762676cbabb47d0df39d549e71b90 Mon Sep 17 00:00:00 2001 From: dbeltran Date: Fri, 3 May 2024 15:56:46 +0200 Subject: [PATCH 3/4] missing requeriments --- requeriments.txt | 3 +++ setup.py | 3 +++ 2 files changed, 6 insertions(+) diff --git a/requeriments.txt b/requeriments.txt index 501202254..ca46cd93a 100644 --- a/requeriments.txt +++ b/requeriments.txt @@ -20,6 +20,9 @@ matplotlib<=3.8.3, numpy<2, ruamel.yaml==0.17.21, rocrate==0.*, +autosubmitconfigparser +pathlib +configparser [:python_version <= "3.7"] PyNaCl==1.5.0 diff --git a/setup.py b/setup.py index dd3637761..ce93cdd31 100644 --- a/setup.py +++ b/setup.py @@ -62,6 +62,9 @@ setup( 'numpy<2', 'ruamel.yaml==0.17.21', 'rocrate==0.*', + 'autosubmitconfigparser>=1.61', + 'configparser', + 'pathlib' ], extras_require={ ':python_version <= "3.7"': -- GitLab From cab060df9f0eefa4d464f1819604d6c7442bba71 Mon Sep 17 00:00:00 2001 From: dbeltran Date: Mon, 13 May 2024 10:28:41 +0200 Subject: [PATCH 4/4] fix test --- test/unit/test_job.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/unit/test_job.py b/test/unit/test_job.py index fe41cc439..3a986afa7 100644 --- a/test/unit/test_job.py +++ b/test/unit/test_job.py @@ -196,6 +196,8 @@ class TestJob(TestCase): write_mock = Mock().write = Mock() open_mock = Mock(return_value=write_mock) + self.job.default_parameters = MagicMock() + self.job.default_parameters.get = MagicMock(return_value=[]) with patch.object(builtins, "open", open_mock): # act self.job.create_script(config) -- GitLab