From bfcbbf98cafa45df9dab233f4ebfa90e3eba6b2d Mon Sep 17 00:00:00 2001 From: chenyangkang Date: Sun, 12 May 2024 11:22:02 +0800 Subject: [PATCH 1/7] fixing github action RAM/CPU use problem --- .github/workflows/run_pytest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_pytest.yml b/.github/workflows/run_pytest.yml index c96f8c6..b822e09 100644 --- a/.github/workflows/run_pytest.yml +++ b/.github/workflows/run_pytest.yml @@ -33,7 +33,7 @@ jobs: - name: Run pytest run: | - pytest -n auto --cov --no-cov-on-fail --cov-report=term-missing:skip-covered --cov-report xml:coverage.xml + pytest -n 1 --cov --no-cov-on-fail --cov-report=term-missing:skip-covered --cov-report xml:coverage.xml timeout-minutes: 300 # Set the timeout to 1.5 hours for this step - name: Upload coverage reports to Codecov From 620169990f4007d26f924a673f7bf98a038d75cd Mon Sep 17 00:00:00 2001 From: chenyangkang Date: Sun, 12 May 2024 12:14:40 +0800 Subject: [PATCH 2/7] try just one versioin --- .github/workflows/run_pytest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_pytest.yml b/.github/workflows/run_pytest.yml index b822e09..dc80933 100644 --- a/.github/workflows/run_pytest.yml +++ b/.github/workflows/run_pytest.yml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: true matrix: - python-version: ["3.8", "3.9", "3.10"] + python-version: ["3.8"] steps: - name: Set Swap Space uses: pierotofy/set-swap-space@master From 9ad65e8116d4aad5da4fd580075f93f1c320c095 Mon Sep 17 00:00:00 2001 From: chenyangkang Date: Sun, 12 May 2024 13:06:39 +0800 Subject: [PATCH 3/7] no making gif? --- tests/test_makegif.py | 98 +++++++++++++++++++++---------------------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/tests/test_makegif.py b/tests/test_makegif.py index 99e5c2d..d05b031 100644 --- a/tests/test_makegif.py +++ b/tests/test_makegif.py @@ -17,59 +17,59 @@ ) -def test_make_gif(): - tmp_dir = "./stemflow_test_make_gif" - if not os.path.exists(tmp_dir): - os.mkdir(tmp_dir) +# def test_make_gif(): +# tmp_dir = "./stemflow_test_make_gif" +# if not os.path.exists(tmp_dir): +# os.mkdir(tmp_dir) - make_sample_gif( - fake_data, - os.path.join(tmp_dir, "FTR_IPT_dat.gif"), - col="dat", - log_scale=False, - Spatio1="x", - Spatio2="y", - Temporal1="DOY", - figsize=(18, 9), - xlims=(fake_data["x"].min() - 10, fake_data["x"].max() + 10), - ylims=(fake_data["y"].min() - 10, fake_data["y"].max() + 10), - grid=True, - xtick_interval=(fake_data["x"].max() - fake_data["x"].min()) / 8, - ytick_interval=(fake_data["x"].max() - fake_data["x"].min()) / 8, - lng_size=360, - lat_size=180, - dpi=100, - fps=10, - ) +# make_sample_gif( +# fake_data, +# os.path.join(tmp_dir, "FTR_IPT_dat.gif"), +# col="dat", +# log_scale=False, +# Spatio1="x", +# Spatio2="y", +# Temporal1="DOY", +# figsize=(18, 9), +# xlims=(fake_data["x"].min() - 10, fake_data["x"].max() + 10), +# ylims=(fake_data["y"].min() - 10, fake_data["y"].max() + 10), +# grid=True, +# xtick_interval=(fake_data["x"].max() - fake_data["x"].min()) / 8, +# ytick_interval=(fake_data["x"].max() - fake_data["x"].min()) / 8, +# lng_size=360, +# lat_size=180, +# dpi=100, +# fps=10, +# ) - shutil.rmtree(tmp_dir) +# shutil.rmtree(tmp_dir) -def test_make_gif_changing_ranges(): - fake_data_ = fake_data[(fake_data["x"] >= 0) & (fake_data["y"] >= 10) & (fake_data["DOY"] >= 20)].copy() +# def test_make_gif_changing_ranges(): +# fake_data_ = fake_data[(fake_data["x"] >= 0) & (fake_data["y"] >= 10) & (fake_data["DOY"] >= 20)].copy() - tmp_dir = "./stemflow_test_make_gif" - if not os.path.exists(tmp_dir): - os.mkdir(tmp_dir) +# tmp_dir = "./stemflow_test_make_gif" +# if not os.path.exists(tmp_dir): +# os.mkdir(tmp_dir) - make_sample_gif( - fake_data_, - os.path.join(tmp_dir, "FTR_IPT_dat_changing_ranges.gif"), - col="dat", - log_scale=False, - Spatio1="x", - Spatio2="y", - Temporal1="DOY", - figsize=(18, 9), - xlims=None, - ylims=None, - grid=True, - xtick_interval=None, - ytick_interval=None, - lng_size=10, - lat_size=10, - dpi=100, - fps=10, - ) +# make_sample_gif( +# fake_data_, +# os.path.join(tmp_dir, "FTR_IPT_dat_changing_ranges.gif"), +# col="dat", +# log_scale=False, +# Spatio1="x", +# Spatio2="y", +# Temporal1="DOY", +# figsize=(18, 9), +# xlims=None, +# ylims=None, +# grid=True, +# xtick_interval=None, +# ytick_interval=None, +# lng_size=10, +# lat_size=10, +# dpi=100, +# fps=10, +# ) - shutil.rmtree(tmp_dir) +# shutil.rmtree(tmp_dir) From de518285f0ac038abd5ee85c53075ce8d25bf7ff Mon Sep 17 00:00:00 2001 From: chenyangkang Date: Sun, 12 May 2024 13:20:03 +0800 Subject: [PATCH 4/7] making gif but not test_make_gif_changing_ranges? --- tests/test_makegif.py | 48 +++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/tests/test_makegif.py b/tests/test_makegif.py index d05b031..cdddec5 100644 --- a/tests/test_makegif.py +++ b/tests/test_makegif.py @@ -17,32 +17,32 @@ ) -# def test_make_gif(): -# tmp_dir = "./stemflow_test_make_gif" -# if not os.path.exists(tmp_dir): -# os.mkdir(tmp_dir) +def test_make_gif(): + tmp_dir = "./stemflow_test_make_gif" + if not os.path.exists(tmp_dir): + os.mkdir(tmp_dir) -# make_sample_gif( -# fake_data, -# os.path.join(tmp_dir, "FTR_IPT_dat.gif"), -# col="dat", -# log_scale=False, -# Spatio1="x", -# Spatio2="y", -# Temporal1="DOY", -# figsize=(18, 9), -# xlims=(fake_data["x"].min() - 10, fake_data["x"].max() + 10), -# ylims=(fake_data["y"].min() - 10, fake_data["y"].max() + 10), -# grid=True, -# xtick_interval=(fake_data["x"].max() - fake_data["x"].min()) / 8, -# ytick_interval=(fake_data["x"].max() - fake_data["x"].min()) / 8, -# lng_size=360, -# lat_size=180, -# dpi=100, -# fps=10, -# ) + make_sample_gif( + fake_data, + os.path.join(tmp_dir, "FTR_IPT_dat.gif"), + col="dat", + log_scale=False, + Spatio1="x", + Spatio2="y", + Temporal1="DOY", + figsize=(18, 9), + xlims=(fake_data["x"].min() - 10, fake_data["x"].max() + 10), + ylims=(fake_data["y"].min() - 10, fake_data["y"].max() + 10), + grid=True, + xtick_interval=(fake_data["x"].max() - fake_data["x"].min()) / 8, + ytick_interval=(fake_data["x"].max() - fake_data["x"].min()) / 8, + lng_size=360, + lat_size=180, + dpi=100, + fps=10, + ) -# shutil.rmtree(tmp_dir) + shutil.rmtree(tmp_dir) # def test_make_gif_changing_ranges(): From caacc26ac13b98c699fcada506533dde2d4977d9 Mon Sep 17 00:00:00 2001 From: chenyangkang Date: Sun, 12 May 2024 14:15:21 +0800 Subject: [PATCH 5/7] fix make gif test data bugs --- tests/test_makegif.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/test_makegif.py b/tests/test_makegif.py index cdddec5..5ca80eb 100644 --- a/tests/test_makegif.py +++ b/tests/test_makegif.py @@ -11,7 +11,7 @@ { "x": np.random.uniform(low=-180, high=180, size=size), "y": np.random.uniform(low=-90, high=90, size=size), - "DOY": np.random.uniform(low=1, high=366, size=size), + "DOY": [int(i) for i in np.random.uniform(low=1, high=366, size=size)], "dat": np.random.uniform(low=1, high=1000, size=size), } ) @@ -21,7 +21,6 @@ def test_make_gif(): tmp_dir = "./stemflow_test_make_gif" if not os.path.exists(tmp_dir): os.mkdir(tmp_dir) - make_sample_gif( fake_data, os.path.join(tmp_dir, "FTR_IPT_dat.gif"), @@ -41,7 +40,6 @@ def test_make_gif(): dpi=100, fps=10, ) - shutil.rmtree(tmp_dir) From cd5d07bc668d5e83d1ff184b09273fe4b0f3e03f Mon Sep 17 00:00:00 2001 From: chenyangkang Date: Sun, 12 May 2024 14:37:38 +0800 Subject: [PATCH 6/7] fix make gif test data bugs --- tests/test_makegif.py | 50 +++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/tests/test_makegif.py b/tests/test_makegif.py index 5ca80eb..a3c0ccb 100644 --- a/tests/test_makegif.py +++ b/tests/test_makegif.py @@ -43,31 +43,31 @@ def test_make_gif(): shutil.rmtree(tmp_dir) -# def test_make_gif_changing_ranges(): -# fake_data_ = fake_data[(fake_data["x"] >= 0) & (fake_data["y"] >= 10) & (fake_data["DOY"] >= 20)].copy() +def test_make_gif_changing_ranges(): + fake_data_ = fake_data[(fake_data["x"] >= 0) & (fake_data["y"] >= 10) & (fake_data["DOY"] >= 20)].copy() -# tmp_dir = "./stemflow_test_make_gif" -# if not os.path.exists(tmp_dir): -# os.mkdir(tmp_dir) + tmp_dir = "./stemflow_test_make_gif" + if not os.path.exists(tmp_dir): + os.mkdir(tmp_dir) -# make_sample_gif( -# fake_data_, -# os.path.join(tmp_dir, "FTR_IPT_dat_changing_ranges.gif"), -# col="dat", -# log_scale=False, -# Spatio1="x", -# Spatio2="y", -# Temporal1="DOY", -# figsize=(18, 9), -# xlims=None, -# ylims=None, -# grid=True, -# xtick_interval=None, -# ytick_interval=None, -# lng_size=10, -# lat_size=10, -# dpi=100, -# fps=10, -# ) + make_sample_gif( + fake_data_, + os.path.join(tmp_dir, "FTR_IPT_dat_changing_ranges.gif"), + col="dat", + log_scale=False, + Spatio1="x", + Spatio2="y", + Temporal1="DOY", + figsize=(18, 9), + xlims=None, + ylims=None, + grid=True, + xtick_interval=None, + ytick_interval=None, + lng_size=10, + lat_size=10, + dpi=100, + fps=10, + ) -# shutil.rmtree(tmp_dir) + shutil.rmtree(tmp_dir) From 94df0a128545ee24e764487a3b6a5cf8e7d138c5 Mon Sep 17 00:00:00 2001 From: chenyangkang Date: Sun, 12 May 2024 14:38:12 +0800 Subject: [PATCH 7/7] fix make gif test data bugs --- .github/workflows/run_pytest.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run_pytest.yml b/.github/workflows/run_pytest.yml index dc80933..c96f8c6 100644 --- a/.github/workflows/run_pytest.yml +++ b/.github/workflows/run_pytest.yml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: true matrix: - python-version: ["3.8"] + python-version: ["3.8", "3.9", "3.10"] steps: - name: Set Swap Space uses: pierotofy/set-swap-space@master @@ -33,7 +33,7 @@ jobs: - name: Run pytest run: | - pytest -n 1 --cov --no-cov-on-fail --cov-report=term-missing:skip-covered --cov-report xml:coverage.xml + pytest -n auto --cov --no-cov-on-fail --cov-report=term-missing:skip-covered --cov-report xml:coverage.xml timeout-minutes: 300 # Set the timeout to 1.5 hours for this step - name: Upload coverage reports to Codecov