Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into tabmat-v4
Browse files Browse the repository at this point in the history
  • Loading branch information
MarcAntoineSchmidtQC committed Dec 12, 2023
2 parents 4c5ad31 + 4bd8cd8 commit 84c6a52
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 20 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build-wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
platforms: all

- name: Set up micromamba
uses: mamba-org/setup-micromamba@db1df3ba9e07ea86f759e98b575c002747e9e757
uses: mamba-org/setup-micromamba@8752438cc2755ab7d0de2a8d70b694f5586baae8

- name: Build wheels
if: github.event_name != 'release'
Expand All @@ -50,7 +50,7 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
name: Install Python
with:
python-version: '3.10'
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
name: artifact
path: dist

- uses: pypa/[email protected].10
- uses: pypa/[email protected].11
with:
repository-url: https://test.pypi.org/legacy/

Expand All @@ -99,4 +99,4 @@ jobs:
name: artifact
path: dist

- uses: pypa/[email protected].10
- uses: pypa/[email protected].11
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ jobs:
- name: Checkout branch
uses: actions/checkout@v4
- name: Set up micromamba
uses: mamba-org/setup-micromamba@db1df3ba9e07ea86f759e98b575c002747e9e757
uses: mamba-org/setup-micromamba@8752438cc2755ab7d0de2a8d70b694f5586baae8
- name: Add micromamba to GITHUB_PATH
run: echo "${HOME}/micromamba-bin" >> "$GITHUB_PATH"
- name: Install Python 3.10
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.10"
- name: Run pre-commit checks
Expand All @@ -39,7 +39,7 @@ jobs:
- name: Checkout branch
uses: actions/checkout@v4
- name: Set up conda env
uses: mamba-org/setup-micromamba@db1df3ba9e07ea86f759e98b575c002747e9e757
uses: mamba-org/setup-micromamba@8752438cc2755ab7d0de2a8d70b694f5586baae8
with:
environment-file: ${{ matrix.os == 'windows-latest' && 'environment-win.yml' || 'environment.yml' }}
init-shell: ${{ matrix.os == 'windows-latest' && 'powershell' || 'bash' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/conda-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
uses: actions/checkout@v4
- name: Fetch full git history
run: git fetch --prune --unshallow
- uses: mamba-org/setup-micromamba@db1df3ba9e07ea86f759e98b575c002747e9e757
- uses: mamba-org/setup-micromamba@8752438cc2755ab7d0de2a8d70b694f5586baae8
with:
init-shell: ${{ matrix.os == 'windows-latest' && 'cmd.exe' || 'bash' }}
environment-name: build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
steps:
- name: Checkout branch
uses: actions/checkout@v4
- uses: mamba-org/setup-micromamba@db1df3ba9e07ea86f759e98b575c002747e9e757
- uses: mamba-org/setup-micromamba@8752438cc2755ab7d0de2a8d70b694f5586baae8
with:
environment-file: environment.yml
create-args: >-
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
repos:
- repo: https://github.com/Quantco/pre-commit-mirrors-ruff
rev: 0.1.3
rev: 0.1.6
hooks:
- id: ruff-conda
- id: ruff-format-conda
- repo: https://github.com/Quantco/pre-commit-mirrors-mypy
rev: "1.6.1"
rev: "1.7.1"
hooks:
- id: mypy-conda
- repo: https://github.com/Quantco/pre-commit-mirrors-cython-lint
rev: 0.15.0
rev: 0.16.0
hooks:
- id: cython-lint-conda
args: [--no-pycodestyle]
Expand Down
2 changes: 1 addition & 1 deletion build_tools/prepare_macos_wheel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ else
export CONDA_SUBDIR="osx-64"
fi

/Users/runner/micromamba-bin/micromamba create -y -p $CONDA/envs/build -c conda-forge jemalloc-local xsimd llvm-openmp
/Users/runner/micromamba-bin/micromamba create -y -p $CONDA/envs/build -c conda-forge jemalloc-local "xsimd<11|>12.1" llvm-openmp
2 changes: 1 addition & 1 deletion conda.recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ requirements:
- numpy
- pip
- setuptools_scm
- xsimd
- xsimd <11|>12.1
run:
- python
- {{ pin_compatible('numpy') }}
Expand Down
2 changes: 1 addition & 1 deletion environment-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies:
- make
- mako
- mkl-include
- xsimd
- xsimd <11|>12.1

# documentation dev
- jupyterlab
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies:
- jemalloc-local
- make
- mako
- xsimd
- xsimd <11|>12.1

# documentation dev
- jupyterlab
Expand Down
8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ before-build = [
]

[tool.cibuildwheel.macos.environment]
LDFLAGS="-Wl,-rpath,$CONDA/envs/build/lib -L$CONDA/envs/build/lib"
LDFLAGS="-Wl,-rpath,$CONDA/envs/build/lib -L$CONDA/envs/build/lib -headerpad_max_install_names"
CFLAGS="-I$CONDA/envs/build/include"
CXXFLAGS="-I$CONDA/envs/build/include"
CXX="/usr/bin/clang++"
Expand All @@ -61,7 +61,7 @@ JE_INSTALL_SUFFIX="local"

[tool.cibuildwheel.windows]
before-all = [
"C:\\Miniconda\\condabin\\conda install -c conda-forge xsimd",
"C:\\Miniconda\\condabin\\conda install -c conda-forge \"xsimd<11\"",
]

[tool.cibuildwheel.windows.environment]
Expand All @@ -70,13 +70,13 @@ INCLUDE="C:\\\\Miniconda\\\\Library\\\\include"
[tool.cibuildwheel.linux]
before-all = [
"cd ~/",
"git clone --branch 5.2.1 https://github.com/jemalloc/jemalloc.git",
"git clone --branch 5.3.0 https://github.com/jemalloc/jemalloc.git",
"cd jemalloc",
"./autogen.sh --disable-cxx --with-jemalloc-prefix=local --with-install-suffix=local --disable-tls --disable-initial-exec-tls",
"make",
"make install_bin install_include install_lib",
"cd ~/",
"git clone --branch 7.6.0 https://github.com/xtensor-stack/xsimd.git",
"git clone --branch 12.1.1 https://github.com/xtensor-stack/xsimd.git",
"cd xsimd",
"mkdir build",
"cd build",
Expand Down

0 comments on commit 84c6a52

Please sign in to comment.