diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2ffc54cbad7..36748fc072e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -234,7 +234,7 @@ jobs: miniforge-version: latest use-mamba: true - name: ASV installation - run: pip install asv==0.5.1 + run: pip install asv==0.6.0 - name: Running benchmarks run: | git remote add upstream https://github.com/modin-project/modin.git @@ -261,15 +261,9 @@ jobs: sed -i 's/def time_groupby_agg_nunique(self, \*args, \*\*kwargs):/# def time_groupby_agg_nunique(self, *args, **kwargs):/g' benchmarks/hdk/benchmarks.py sed -i 's/execute(self.df.groupby(by=self.groupby_columns).agg("nunique"))/# execute(self.df.groupby(by=self.groupby_columns).agg("nunique"))/g' benchmarks/hdk/benchmarks.py - # TODO: Remove manual environment creation after fix https://github.com/airspeed-velocity/asv/issues/1310 - mamba env create -f ../requirements/env_hdk.yml - conda activate modin_on_hdk - pip install asv==0.5.1 - pip install .. - # check Modin on HDK MODIN_ENGINE=native MODIN_STORAGE_FORMAT=hdk MODIN_EXPERIMENTAL=true asv run --quick --strict --show-stderr \ - --launch-method=forkserver --python=same --config asv.conf.hdk.json \ + --launch-method=forkserver --config asv.conf.hdk.json \ -b ^hdk | tee benchmarks.log else echo "Benchmarks did not run, no changes detected" diff --git a/asv_bench/asv.conf.dask.json b/asv_bench/asv.conf.dask.json index 5bde368e95d..6a2db5d9a3e 100644 --- a/asv_bench/asv.conf.dask.json +++ b/asv_bench/asv.conf.dask.json @@ -22,7 +22,7 @@ // If missing or the empty string, the tool will be automatically // determined by looking for tools on the PATH environment // variable. - "environment_type": "conda", + "environment_type": "mamba", // timeout in seconds for installing any dependencies in environment // defaults to 10 min diff --git a/asv_bench/asv.conf.hdk.json b/asv_bench/asv.conf.hdk.json index 527c195771b..1a6b5b5a5e1 100644 --- a/asv_bench/asv.conf.hdk.json +++ b/asv_bench/asv.conf.hdk.json @@ -23,7 +23,7 @@ // If missing or the empty string, the tool will be automatically // determined by looking for tools on the PATH environment // variable. - "environment_type": "conda", + "environment_type": "mamba", // timeout in seconds for installing any dependencies in environment // defaults to 10 min diff --git a/asv_bench/asv.conf.json b/asv_bench/asv.conf.json index 01a82ef15c4..7b8f4283ab1 100644 --- a/asv_bench/asv.conf.json +++ b/asv_bench/asv.conf.json @@ -22,7 +22,7 @@ // If missing or the empty string, the tool will be automatically // determined by looking for tools on the PATH environment // variable. - "environment_type": "conda", + "environment_type": "mamba", // timeout in seconds for installing any dependencies in environment // defaults to 10 min diff --git a/asv_bench/asv.conf.unidist.json b/asv_bench/asv.conf.unidist.json index 7fc8ad88b53..7f1863a5c1b 100644 --- a/asv_bench/asv.conf.unidist.json +++ b/asv_bench/asv.conf.unidist.json @@ -22,7 +22,7 @@ // If missing or the empty string, the tool will be automatically // determined by looking for tools on the PATH environment // variable. - "environment_type": "conda", + "environment_type": "mamba", // timeout in seconds for installing any dependencies in environment // defaults to 10 min diff --git a/environment-dev.yml b/environment-dev.yml index 6e4bdd05337..b0b3f67f5e1 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -47,7 +47,7 @@ dependencies: - pygit2>=1.9.2 # test dependencies - - asv==0.5.1 + - asv==0.6.0 - boto3>=1.26.0 - coverage>=7.1.0 - moto>=4.1.0 diff --git a/requirements-dev.txt b/requirements-dev.txt index 029fc24e9bd..cbd0bb1e1a9 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -41,7 +41,7 @@ PyGithub>=1.58.0 pygit2>=1.9.2 ## test dependencies -asv==0.5.1 +asv==0.6.0 boto3>=1.26.0 coverage>=7.1.0 # experimental version of fuzzydata requires at least 0.0.6 to successfully resolve all dependencies diff --git a/requirements/requirements-no-engine.yml b/requirements/requirements-no-engine.yml index 6e78427a2ce..ab56004758b 100644 --- a/requirements/requirements-no-engine.yml +++ b/requirements/requirements-no-engine.yml @@ -33,7 +33,7 @@ dependencies: - pygit2>=1.9.2 # test dependencies - - asv==0.5.1 + - asv==0.6.0 - boto3>=1.26.0 - coverage>=7.1.0 - moto>=4.1.0