Skip to content

Commit

Permalink
Fixed CI error, conda -> mamba
Browse files Browse the repository at this point in the history
  • Loading branch information
MerlinDumeur committed Apr 14, 2024
1 parent 9e96f8f commit 72d2319
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 15 deletions.
11 changes: 5 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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)
4 changes: 2 additions & 2 deletions .github/workflows/doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 1 addition & 7 deletions meta.yml
Original file line number Diff line number Diff line change
@@ -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
- seaborn>=0.12.0

0 comments on commit 72d2319

Please sign in to comment.