From 72d2319ce8a8cc62d454e0e2577bfa8a88ebd653 Mon Sep 17 00:00:00 2001 From: Merlin Dumeur Date: Sun, 14 Apr 2024 15:59:07 +0300 Subject: [PATCH] Fixed CI error, conda -> mamba --- .github/workflows/ci.yml | 11 +++++------ .github/workflows/doc.yml | 4 ++-- meta.yml | 8 +------- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d8fc558..a09c831 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,7 +39,7 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest, macos-latest, windows-latest] - python-version: ["3.11"] + python-version: ["3.10", "3.11"] steps: - uses: actions/checkout@v3 - name: Get Date @@ -55,16 +55,15 @@ jobs: key: ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{ hashFiles('env.yml') }} - - name: Setup python ${{ matrix.python-version }} with conda - uses: conda-incubator/setup-miniconda@v2 + - name: Setup python ${{ matrix.python-version }} with mamba + uses: mamba-org/setup-micromamba@v1 with: auto-update-conda: true python-version: ${{ matrix.python-version }} environment-file: meta.yml - use-only-tar-bz2: true - name: Testing run: | - conda install numpy scipy pywavelets seaborn numba statsmodels pytest pytest-xdist pytest-cov tqdm joblib + mamba install numpy scipy pywavelets seaborn numba statsmodels pytest pytest-xdist pytest-cov tqdm joblib pip install -e .[bootstrap,robust] pytest -n auto -x --cov=./ --cov-report=xml - name: Upload coverage @@ -73,5 +72,5 @@ jobs: with: files: ./coverage.xml # optional name: codecov-umbrella # optional - fail_ci_if_error: true # optional (default = false) + fail_ci_if_error: false # optional (default = false) verbose: true # optional (default = false) \ No newline at end of file diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index e21c697..17b1dd5 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -34,8 +34,8 @@ jobs: - name: Build doc shell: bash -el {0} run: | - conda install -c conda-forge pip sphinx numpydoc pydata-sphinx-theme - python -m pip install . + conda install -c conda-forge pip sphinx numpydoc pydata-sphinx-theme nbsphinx + python -m pip install .[doc] cd doc make html touch _build/html/.nojekyll diff --git a/meta.yml b/meta.yml index 803159a..6eb5803 100644 --- a/meta.yml +++ b/meta.yml @@ -1,15 +1,9 @@ name: pymultifracs channels: - conda-forge - - defaults dependencies: - python>=3.8,<3.12.0 - numpy>=1.22.4 - scipy>=1.8.1 - pywavelets>=1.3.0 - - seaborn>=0.12.0 - - scikit-learn>=1.1.1 - - statsmodels - - pip - - pip: - - recombinator \ No newline at end of file + - seaborn>=0.12.0 \ No newline at end of file