From c250f7b629c6658db743c47e10326effd0371706 Mon Sep 17 00:00:00 2001 From: Paul Gierz Date: Wed, 13 Jul 2022 16:24:24 +0200 Subject: [PATCH 01/10] fix(setup.py): pin all dependencies to a specific number --- setup.py | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/setup.py b/setup.py index fc0f35d5c..b669592d1 100644 --- a/setup.py +++ b/setup.py @@ -12,34 +12,33 @@ history = history_file.read() requirements = [ - "Click>=7.0", - "PyGithub", - "colorama", - "coloredlogs", - "emoji", - "f90nml", - "gfw-creator", - "gitpython", - "loguru", - "numpy", - "packaging", - "pandas>=1.0", - "psutil", - "pyyaml", - "pyyaml>=5.1", - "questionary", - "semver", - "six", - "sqlalchemy", - "tabulate", - "tqdm", - "typing_extensions>=3.10.0.0", - "xdgenvpy", + "Click==8.1.3", + "PyGithub==1.55", + "colorama==0.4.5", + "coloredlogs==15.0.1", # NOTE(PG): Should be removed during cleanup for loguru instead + "emoji==1.7.0", + "f90nml==1.4.2", + "gfw-creator==0.2.2", + "gitpython==3.1.27", + "loguru==0.6.0", + "numpy==1.23.1", + "packaging==21.3", + "pandas==1.0", + "psutil==5.9.1", + "pyyaml==5.1", + "questionary==1.10.1", + "semver==2.13.0", + "six==1.16.0", # NOTE(PG): Should be removed during cleanup + "sqlalchemy==1.4.39", + "tabulate==0.8.10", + "tqdm==4.64.0", + "typing_extensions==4.3.0", + "xdgenvpy==2.3.5", ] setup_requirements = [] -test_requirements = ["pyfakefs"] +test_requirements = ["pyfakefs==4.6.0",] setup( author="Dirk Barbi", From ec2b8ccd4112651efff573d840a8173702f430d1 Mon Sep 17 00:00:00 2001 From: Paul Gierz Date: Wed, 13 Jul 2022 16:26:53 +0200 Subject: [PATCH 02/10] fix(setup.py): correct the wrong version number for questionary --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b669592d1..25cb41d0d 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,7 @@ "pandas==1.0", "psutil==5.9.1", "pyyaml==5.1", - "questionary==1.10.1", + "questionary==1.10.0", "semver==2.13.0", "six==1.16.0", # NOTE(PG): Should be removed during cleanup "sqlalchemy==1.4.39", From c48b357a1f71d219f13ce67f8757c7ec3060f427 Mon Sep 17 00:00:00 2001 From: Paul Gierz Date: Wed, 13 Jul 2022 16:29:38 +0200 Subject: [PATCH 03/10] fix(setup.py): correct the wrong version number for Click --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 25cb41d0d..365c42e30 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ history = history_file.read() requirements = [ - "Click==8.1.3", + "Click==8.0.4", # Maximum version for Python 3.6 support "PyGithub==1.55", "colorama==0.4.5", "coloredlogs==15.0.1", # NOTE(PG): Should be removed during cleanup for loguru instead From 25378e9f89be4628e9fcad770fcf89bc1f0a6418 Mon Sep 17 00:00:00 2001 From: Paul Gierz Date: Wed, 13 Jul 2022 16:31:06 +0200 Subject: [PATCH 04/10] fix(setup.py): correct the wrong version number for gitpython --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 365c42e30..25e01f0f0 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ "emoji==1.7.0", "f90nml==1.4.2", "gfw-creator==0.2.2", - "gitpython==3.1.27", + "gitpython==3.1.20", # Maximum version for Python 3.6 support "loguru==0.6.0", "numpy==1.23.1", "packaging==21.3", From 29ecfada700c1c84f0933d84fd43cd27cc730b13 Mon Sep 17 00:00:00 2001 From: Paul Gierz Date: Wed, 13 Jul 2022 16:32:19 +0200 Subject: [PATCH 05/10] fix(setup.py): correct the wrong version number for numpy --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 25e01f0f0..5dc9d7532 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ "gfw-creator==0.2.2", "gitpython==3.1.20", # Maximum version for Python 3.6 support "loguru==0.6.0", - "numpy==1.23.1", + "numpy==1.19.5", # Maximum version for Python 3.6 support "packaging==21.3", "pandas==1.0", "psutil==5.9.1", From e6fed22f9b15d9d209f27a844e2b063463922f44 Mon Sep 17 00:00:00 2001 From: Paul Gierz Date: Wed, 13 Jul 2022 16:34:10 +0200 Subject: [PATCH 06/10] fix(setup.py): correct the wrong version number for typingextensions --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 5dc9d7532..b62afbc40 100644 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ "sqlalchemy==1.4.39", "tabulate==0.8.10", "tqdm==4.64.0", - "typing_extensions==4.3.0", + "typing_extensions==4.1.1", # Maximum number for Python 3.6 support "xdgenvpy==2.3.5", ] From e8827939d25fb2423af8d7d6910d738118bdf7af Mon Sep 17 00:00:00 2001 From: Paul Gierz Date: Wed, 13 Jul 2022 16:40:29 +0200 Subject: [PATCH 07/10] fix(setup.py): correct the wrong version number for pandas --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b62afbc40..9a41c6c54 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ "loguru==0.6.0", "numpy==1.19.5", # Maximum version for Python 3.6 support "packaging==21.3", - "pandas==1.0", + "pandas==1.1.5", # Correct compatiability with xarray for Python 3.6 "psutil==5.9.1", "pyyaml==5.1", "questionary==1.10.0", From 7856d23d22bc82fc05838e702d5eef3ac4dade8f Mon Sep 17 00:00:00 2001 From: Paul Gierz Date: Fri, 18 Nov 2022 10:34:01 +0100 Subject: [PATCH 08/10] fix(setup.py) attempting to pin pandas version to something useful --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 731e934f5..226f5d9ff 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ "loguru==0.6.0", "numpy==1.19.5", # Maximum version for Python 3.6 support "packaging==21.3", - "pandas==1.1.5", # Correct compatiability with xarray for Python 3.6 + "pandas>=1.0.0", # Correct compatiability with xarray for Python 3.6 "psutil==5.9.1", "pyyaml==5.1", "questionary==1.10.0", From bae2f46f605f9ebdad2631b81821acf7a9c503a6 Mon Sep 17 00:00:00 2001 From: Paul Gierz Date: Fri, 18 Nov 2022 10:38:31 +0100 Subject: [PATCH 09/10] fix(setup.py): gets numpy version to play nicely with pandas --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 226f5d9ff..af3576aad 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ "gfw-creator==0.2.2", "gitpython==3.1.20", # Maximum version for Python 3.6 support "loguru==0.6.0", - "numpy==1.19.5", # Maximum version for Python 3.6 support + "numpy==1.20.3", # Maximum version for Python 3.6 support "packaging==21.3", "pandas>=1.0.0", # Correct compatiability with xarray for Python 3.6 "psutil==5.9.1", From cc521ef24843c44dad18358ae7395f8c5b205da1 Mon Sep 17 00:00:00 2001 From: Paul Gierz Date: Fri, 18 Nov 2022 10:51:02 +0100 Subject: [PATCH 10/10] fix(setup.py): version chaos continues (and an up to date author list) --- setup.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index af3576aad..8dd73a8dc 100644 --- a/setup.py +++ b/setup.py @@ -22,9 +22,9 @@ "gfw-creator==0.2.2", "gitpython==3.1.20", # Maximum version for Python 3.6 support "loguru==0.6.0", - "numpy==1.20.3", # Maximum version for Python 3.6 support + "numpy==1.19.5", # Maximum version for Python 3.6 support "packaging==21.3", - "pandas>=1.0.0", # Correct compatiability with xarray for Python 3.6 + "pandas==1.1.5", # Correct compatiability with xarray for Python 3.6 "psutil==5.9.1", "pyyaml==5.1", "questionary==1.10.0", @@ -38,11 +38,21 @@ setup_requirements = [] -test_requirements = ["pyfakefs==4.6.0",] +test_requirements = [ + "pyfakefs==4.6.0", +] setup( - author="Dirk Barbi", - author_email="dirk.barbi@awi.de", + author="The ESM Tools Team", + author_email=[ + "dirk.barbi@awi.de", + "paul.gierz@awi.de", + "miguel.andres-martinez@awi.de", + "deniz.ural@awi.de", + "jan.streffing@awi.de", + "sebastian.wahl@geomar.de", + "kai.himstedt@dkrz.de", + ], python_requires=">=3.6, <3.10", classifiers=[ "Development Status :: 3 - Alpha",