diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index c18dba23..968595be 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -20,15 +20,15 @@ jobs: fail-fast: false matrix: include: - - { conda_build_yml: linux_64_numpy1.20python3.8.____cpython, os: ubuntu-latest, conda-build-args: '' } - - { conda_build_yml: linux_64_numpy1.20python3.9.____cpython, os: ubuntu-latest, conda-build-args: '' } - - { conda_build_yml: linux_64_numpy1.23python3.11.____cpython, os: ubuntu-latest, conda-build-args: '' } - - { conda_build_yml: osx_64_numpy1.20python3.9.____cpython, os: macos-latest, conda-build-args: '' } - - { conda_build_yml: osx_64_numpy1.23python3.11.____cpython, os: macos-latest, conda-build-args: '' } - - { conda_build_yml: osx_arm64_numpy1.20python3.8.____cpython, os: macos-latest, conda-build-args: ' --no-test' } - - { conda_build_yml: osx_arm64_numpy1.21python3.10.____cpython, os: macos-latest, conda-build-args: ' --no-test' } - - { conda_build_yml: win_64_numpy1.20python3.8.____cpython, os: windows-latest, conda-build-args: '' } - - { conda_build_yml: win_64_numpy1.23python3.11.____cpython, os: windows-latest, conda-build-args: '' } + - { conda_build_yml: linux_64_numpy1.20python3.8.____cpython, os: ubuntu-latest, conda-build-args: ' -c conda-forge/label/tabmat_dev -c conda-forge' } + - { conda_build_yml: linux_64_numpy1.20python3.9.____cpython, os: ubuntu-latest, conda-build-args: ' -c conda-forge/label/tabmat_dev -c conda-forge' } + - { conda_build_yml: linux_64_numpy1.23python3.11.____cpython, os: ubuntu-latest, conda-build-args: ' -c conda-forge/label/tabmat_dev -c conda-forge' } + - { conda_build_yml: osx_64_numpy1.20python3.9.____cpython, os: macos-latest, conda-build-args: ' -c conda-forge/label/tabmat_dev -c conda-forge' } + - { conda_build_yml: osx_64_numpy1.23python3.11.____cpython, os: macos-latest, conda-build-args: ' -c conda-forge/label/tabmat_dev -c conda-forge' } + - { conda_build_yml: osx_arm64_numpy1.20python3.8.____cpython, os: macos-latest, conda-build-args: ' -c conda-forge/label/tabmat_dev -c conda-forge --no-test' } + - { conda_build_yml: osx_arm64_numpy1.21python3.10.____cpython, os: macos-latest, conda-build-args: ' -c conda-forge/label/tabmat_dev -c conda-forge --no-test' } + - { conda_build_yml: win_64_numpy1.20python3.8.____cpython, os: windows-latest, conda-build-args: ' -c conda-forge/label/tabmat_dev -c conda-forge' } + - { conda_build_yml: win_64_numpy1.23python3.11.____cpython, os: windows-latest, conda-build-args: ' -c conda-forge/label/tabmat_dev -c conda-forge' } steps: - name: Checkout branch uses: actions/checkout@v3 diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index 0a6c2bcc..1b7f62c3 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -44,7 +44,7 @@ jobs: done echo Install tabmat nightly micromamba remove -y --force tabmat - pip install git+https://github.com/Quantco/tabmat + pip install git+https://github.com/Quantco/tabmat@tabmat-v4 - name: Install repository shell: bash -el {0} run: pip install --no-use-pep517 --no-deps --disable-pip-version-check -e . diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml index 79bee267..eb5356c8 100644 --- a/conda.recipe/meta.yaml +++ b/conda.recipe/meta.yaml @@ -35,7 +35,7 @@ requirements: - pandas - scikit-learn >=0.23 - scipy - - tabmat >=3.1.0 + - tabmat >=4.0.0a test: requires: diff --git a/environment-benchmark.yml b/environment-benchmark.yml index 6c189af5..3dd449de 100644 --- a/environment-benchmark.yml +++ b/environment-benchmark.yml @@ -1,5 +1,6 @@ name: glum channels: + - conda-forge/label/tabmat_dev - conda-forge - nodefaults dependencies: diff --git a/environment.yml b/environment.yml index caf38614..0aa7c240 100644 --- a/environment.yml +++ b/environment.yml @@ -1,5 +1,6 @@ name: glum channels: + - conda-forge/label/tabmat_dev - conda-forge - nodefaults dependencies: @@ -8,7 +9,7 @@ dependencies: - libblas>=0=*mkl # comment this line out for macOS arm64 - numexpr - pandas>=0.21 - - tabmat>=3.1.0 + - tabmat>=4.0.0a - scikit-learn>=0.23 - scipy - tqdm diff --git a/setup.py b/setup.py index edc063f3..016f12c3 100644 --- a/setup.py +++ b/setup.py @@ -85,7 +85,7 @@ "pandas", "scikit-learn>=0.23", "scipy", - "tabmat>=3.1.0", + "tabmat>=4.0.0a", ], entry_points=None if os.environ.get("CONDA_BUILD")