TEST-modin-project#2616: remove DEFAULT_NPARTITIONS values assigning

Signed-off-by: Alexander Myskov <[email protected]>
amyskov · Jan 15, 2021 · 81d2454 · 81d2454
1 parent 01fbe9f
commit 81d2454
Show file tree

Hide file tree

Showing 18 changed files with 9 additions and 26 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -159,6 +159,8 @@ jobs:
   test-internals:
     needs: [lint-commit, lint-flake8, lint-black, test-api, test-headers]
     runs-on: ubuntu-latest
+    env:
+      MODIN_CPUS: 4
     name: test-internals
     steps:
       - uses: actions/checkout@v2
@@ -197,6 +199,7 @@ jobs:
     env:
       MODIN_MEMORY: 1000000000
       MODIN_TEST_DATASET_SIZE: "small"
+      MODIN_CPUS: 4
     name: Test ${{ matrix.backend }} backend, Python 3.6
     steps:
       - uses: actions/checkout@v2
@@ -345,6 +348,7 @@ jobs:
     env:
       MODIN_ENGINE: ${{matrix.engine}}
       MODIN_MEMORY: 1000000000
+      MODIN_CPUS: 4
     name: test-ubuntu (engine ${{matrix.engine}}, python ${{matrix.python-version}})
     steps:
       - uses: actions/checkout@v2
@@ -408,6 +412,7 @@ jobs:
       MODIN_ENGINE: "python"
       MODIN_EXPERIMENTAL: "True"
       MODIN_MEMORY: 1000000000
+      MODIN_CPUS: 4
     name: test experimental
     steps:
       - uses: actions/checkout@v2
@@ -474,6 +479,7 @@ jobs:
     env:
       MODIN_ENGINE: ${{matrix.engine}}
       MODIN_MEMORY: 1000000000
+      MODIN_CPUS: 4
     name: test-windows
     steps:
       - uses: actions/checkout@v2

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -38,6 +38,7 @@ jobs:
     env:
       MODIN_MEMORY: 1000000000
       MODIN_TEST_DATASET_SIZE: "small"
+      MODIN_CPUS: 4
     name: Test ${{ matrix.backend }} backend, Python 3.6
     steps:
       - uses: actions/checkout@v2
@@ -131,6 +132,7 @@ jobs:
     env:
       MODIN_ENGINE: ${{matrix.engine}}
       MODIN_MEMORY: 1000000000
+      MODIN_CPUS: 4
     name: test-ubuntu (engine ${{matrix.engine}}, python ${{matrix.python-version}})
     steps:
       - uses: actions/checkout@v2
@@ -197,6 +199,7 @@ jobs:
     env:
       MODIN_ENGINE: ${{matrix.engine}}
       MODIN_MEMORY: 1000000000
+      MODIN_CPUS: 4
     name: test-windows
     steps:
       - uses: actions/checkout@v2

diff --git a/modin/pandas/test/dataframe/test_binary.py b/modin/pandas/test/dataframe/test_binary.py
@@ -25,7 +25,6 @@
     create_test_dfs,
 )
 
-pd.DEFAULT_NPARTITIONS = 4
 
 # Force matplotlib to not use any Xwindows backend.
 matplotlib.use("Agg")

diff --git a/modin/pandas/test/dataframe/test_default.py b/modin/pandas/test/dataframe/test_default.py
@@ -39,7 +39,6 @@
     modin_df_almost_equals_pandas,
 )
 
-pd.DEFAULT_NPARTITIONS = 4
 
 # Force matplotlib to not use any Xwindows backend.
 matplotlib.use("Agg")

diff --git a/modin/pandas/test/dataframe/test_indexing.py b/modin/pandas/test/dataframe/test_indexing.py
@@ -37,7 +37,6 @@
     eval_general,
 )
 
-pd.DEFAULT_NPARTITIONS = 4
 
 # Force matplotlib to not use any Xwindows backend.
 matplotlib.use("Agg")

diff --git a/modin/pandas/test/dataframe/test_iter.py b/modin/pandas/test/dataframe/test_iter.py
@@ -30,8 +30,6 @@
     test_data,
 )
 
-pd.DEFAULT_NPARTITIONS = 4
-
 # Force matplotlib to not use any Xwindows backend.
 matplotlib.use("Agg")
 

diff --git a/modin/pandas/test/dataframe/test_join_sort.py b/modin/pandas/test/dataframe/test_join_sort.py
@@ -35,7 +35,6 @@
     eval_general,
 )
 
-pd.DEFAULT_NPARTITIONS = 4
 
 # Force matplotlib to not use any Xwindows backend.
 matplotlib.use("Agg")

diff --git a/modin/pandas/test/dataframe/test_map_metadata.py b/modin/pandas/test/dataframe/test_map_metadata.py
@@ -47,7 +47,6 @@
     create_test_dfs,
 )
 
-pd.DEFAULT_NPARTITIONS = 4
 
 # Force matplotlib to not use any Xwindows backend.
 matplotlib.use("Agg")

diff --git a/modin/pandas/test/dataframe/test_reduction.py b/modin/pandas/test/dataframe/test_reduction.py
@@ -36,8 +36,6 @@
     test_data_diff_dtype,
 )
 
-pd.DEFAULT_NPARTITIONS = 4
-
 # Force matplotlib to not use any Xwindows backend.
 matplotlib.use("Agg")
 

diff --git a/modin/pandas/test/dataframe/test_udf.py b/modin/pandas/test/dataframe/test_udf.py
@@ -35,7 +35,6 @@
     test_data,
 )
 
-pd.DEFAULT_NPARTITIONS = 4
 
 # Force matplotlib to not use any Xwindows backend.
 matplotlib.use("Agg")

diff --git a/modin/pandas/test/dataframe/test_window.py b/modin/pandas/test/dataframe/test_window.py
@@ -41,8 +41,6 @@
     test_data_diff_dtype,
 )
 
-pd.DEFAULT_NPARTITIONS = 4
-
 # Force matplotlib to not use any Xwindows backend.
 matplotlib.use("Agg")
 

diff --git a/modin/pandas/test/test_concat.py b/modin/pandas/test/test_concat.py
@@ -25,8 +25,6 @@
     create_test_dfs,
 )
 
-pd.DEFAULT_NPARTITIONS = 4
-
 
 def test_df_concat():
     df, df2 = generate_dfs()

diff --git a/modin/pandas/test/test_groupby.py b/modin/pandas/test/test_groupby.py
@@ -28,8 +28,6 @@
     generate_multiindex,
 )
 
-pd.DEFAULT_NPARTITIONS = 4
-
 
 def modin_groupby_equals_pandas(modin_groupby, pandas_groupby):
     for g1, g2 in zip(modin_groupby, pandas_groupby):

diff --git a/modin/pandas/test/test_io.py b/modin/pandas/test/test_io.py
@@ -53,7 +53,6 @@
 else:
     import modin.experimental.pandas as pd
 
-pd.DEFAULT_NPARTITIONS = 4
 
 DATASET_SIZE_DICT = {
     "Small": 64,

diff --git a/modin/pandas/test/test_rolling.py b/modin/pandas/test/test_rolling.py
@@ -18,8 +18,6 @@
 
 from .utils import df_equals, test_data_values, test_data_keys
 
-pd.DEFAULT_NPARTITIONS = 4
-
 
 def create_test_series(vals):
     if isinstance(vals, dict):

diff --git a/modin/pandas/test/test_series.py b/modin/pandas/test/test_series.py
@@ -68,7 +68,6 @@
     test_data_diff_dtype,
 )
 
-pd.DEFAULT_NPARTITIONS = 4
 
 # Force matplotlib to not use any Xwindows backend.
 matplotlib.use("Agg")

diff --git a/modin/test/backends/base/test_internals.py b/modin/test/backends/base/test_internals.py
@@ -11,8 +11,6 @@
 # ANY KIND, either express or implied. See the License for the specific language
 # governing permissions and limitations under the License.
 
-import modin.pandas as pd
-
 import pandas
 import pytest
 
@@ -22,8 +20,6 @@
     df_equals,
 )
 
-pd.DEFAULT_NPARTITIONS = 4
-
 
 @pytest.mark.parametrize("axis", [0, 1])
 @pytest.mark.parametrize("item_length", [0, 1, 2])

diff --git a/modin/test/backends/pandas/test_internals.py b/modin/test/backends/pandas/test_internals.py
@@ -14,8 +14,6 @@
 import modin.pandas as pd
 from modin.pandas.test.utils import create_test_dfs
 
-pd.DEFAULT_NPARTITIONS = 4
-
 
 def test_aligning_blocks():
     # Test problem when modin frames have the same number of rows, but different