Skip to content

Commit eefa606

Browse files
committed
Fix matrix build: remove vectorbt from conda, use matrix-setup.py, disable old workflow
- Created matrix-setup.py with minimal CLI dependencies only - Updated matrix-build.yml to run on anaconda-integration branch - Updated matrix conda recipe to use matrix-setup.py (no pip installs during build) - Disabled old python-conda-ci.yml workflow to avoid conflicts - Confirmed vectorbt only in pip-extras, not in conda build - Added pip to run requirements for user pip-extras functionality
1 parent c41188f commit eefa606

4 files changed

Lines changed: 38 additions & 4 deletions

File tree

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@ jobs:
5757
shell: bash -l {0}
5858
run: |
5959
conda install conda-build anaconda-client -y
60-
conda build conda-recipe
60+
conda build conda-recipe-matrix
6161
6262
- name: Upload Conda package to Anaconda (releases only)
6363
if: github.event_name == 'release'
6464
env:
6565
ANACONDA_API_TOKEN: ${{ secrets.CICD_TOKEN_GH_ANACONDA }}
6666
shell: bash -l {0}
6767
run: |
68-
PKG_PATH=$(conda build conda-recipe --output)
68+
PKG_PATH=$(conda build conda-recipe-matrix --output)
6969
anaconda upload -u quantdiy $PKG_PATH --label main --force

.github/workflows/matrix-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
workflow_dispatch: # Manually triggerable
55
push:
66
branches:
7-
- matrix-build
7+
- anaconda-integration
88

99
jobs:
1010
matrix-conda-build:

matrix-build/conda-recipe/meta.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ build:
1212
number: 0
1313
skip: true # [py<310 or win]
1414
script: |
15-
pip install -e .
15+
python matrix-setup.py install
1616
npm install
1717
npm run build
1818
@@ -26,6 +26,7 @@ requirements:
2626
run:
2727
- python >=3.10
2828
- nodejs >=18,<25
29+
- pip
2930
# C++ libraries from conda-forge
3031
- conda-forge::libta-lib
3132
- conda-forge::postgresql

matrix-setup.py

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# matrix-setup.py
2+
# Minimal setup.py for matrix conda builds - only core CLI dependencies
3+
4+
from setuptools import setup, find_packages
5+
6+
setup(
7+
name="quantx",
8+
version="0.0.4",
9+
packages=find_packages(),
10+
include_package_data=True,
11+
install_requires=[
12+
# Core CLI dependencies only - everything else via conda or pip-extras
13+
"click",
14+
"rich",
15+
"python-dotenv",
16+
"requests",
17+
"flask",
18+
"flask-cors",
19+
"flask-socketio",
20+
"eventlet",
21+
# Note: All scientific/ML packages are provided by conda recipe
22+
# Users install additional packages via 'quantx pip-extras'
23+
],
24+
entry_points={
25+
"console_scripts": [
26+
"quantx = quantx.matrix-cli:main",
27+
],
28+
},
29+
author="QuantDIY",
30+
description="QuantX Core - Minimal build for matrix testing",
31+
url="https://github.com/quantDIY/QuantX",
32+
license="CC-BY-NC-4.0"
33+
)

0 commit comments

Comments
 (0)