diff --git a/.github/workflows/conda-windows.yml b/.github/workflows/conda-windows.yml index 62ef9bf..87390fc 100644 --- a/.github/workflows/conda-windows.yml +++ b/.github/workflows/conda-windows.yml @@ -9,8 +9,8 @@ on: branches: [ master ] jobs: - example-6: - name: Ex6 Mamba + build: + name: windows conda runs-on: "windows-latest" steps: - uses: actions/checkout@v2 @@ -35,7 +35,6 @@ jobs: conda activate mescore mamba install pytest caimanmanager.py install - pip install https://pypi.anaconda.org/scipy-wheels-nightly/simple/pandas/1.5.0.dev0%2B1172.ga7c5773d19/pandas-1.5.0.dev0%2B1172.ga7c5773d19-cp39-cp39-win_amd64.whl + pip install "pandas==1.5.0rc0" pip install . DOWNLOAD_GROUND_TRUTHS=1 pytest -s . - diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index 1e8be0e..81017f5 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -1,7 +1,7 @@ # This workflow will install Python dependencies, run tests and lint with a single version of Python # For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions -name: Python application +name: Linux pip on: pull_request: @@ -29,8 +29,6 @@ jobs: - name: Install deps run: | python -m pip install --upgrade pip setuptools wheel - echo "*************** Path during install deps ***************" - echo $PWD - name: install caiman run: | @@ -40,19 +38,13 @@ jobs: pip install -r requirements.txt pip install . caimanmanager.py install - echo "*************** Path during install caiman ***************" - echo $PWD - + - name: Install mesmerize-core run: | - echo "*************** Path during install mesmerize ***************" - echo $PWD pip install -r requirements.txt - pip install git+https://github.com/pandas-dev/pandas.git pip install pytest pip install . - name: Test with pytest run: | DOWNLOAD_GROUND_TRUTHS=1 pytest -s . - diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml index dde4d75..555d7f0 100644 --- a/.github/workflows/python-package-conda.yml +++ b/.github/workflows/python-package-conda.yml @@ -1,4 +1,4 @@ -name: Python Package using Conda +name: Linux Conda on: pull_request: @@ -38,11 +38,10 @@ jobs: run: | mamba env update -n base --file environment.yml caimanmanager.py install - pip install git+https://github.com/pandas-dev/pandas.git + pip install "pandas==1.5.0rc0" pip install . - name: Test with pytest run: | mamba install pytest DOWNLOAD_GROUND_TRUTHS=1 pytest -s . - diff --git a/requirements.txt b/requirements.txt index f42e2ec..69861f1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -pandas +pandas==1.5.0rc0 pytest requests tqdm