Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update conda to fix errors in CI #43

Merged
merged 23 commits into from
Feb 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/conda-package-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ jobs:
build:
uses: openalea/github-action-conda-build/.github/workflows/conda-package-build.yml@main
secrets:
anaconda_token: ${{ secrets.ANACONDA_TOKEN }}
anaconda_token: ${{ secrets.ANACONDA_TOKEN }}
21 changes: 21 additions & 0 deletions conda/conda_build_config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# from conda-forge-pinning
c_compiler:
- gcc # [linux]
- clang # [osx]
- vs2019 # [win and x86_64]
- vs2022 # [win and arm64]
c_compiler_version: # [unix]
- 12 # [linux]
- 16 # [osx]
- 10 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux]
- 11 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux]
cxx_compiler:
- gxx # [linux]
- clangxx # [osx]
- vs2019 # [win and x86_64]
- vs2022 # [win and arm64]
cxx_compiler_version: # [unix]
- 12 # [linux]
- 16 # [osx]
- 10 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux]
- 11 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux]
29 changes: 15 additions & 14 deletions conda/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,39 +9,40 @@ build:
number: 0
preserve_egg_dir: True
string: phenomenal
script:
- {{ PYTHON }} setup.py install #--single-version-externally-managed --record record.txt
script:
- {{PYTHON}} setup.py build_ext -j{{ CPU_COUNT }}
- {{ PYTHON }} -m pip install . -vv

requirements:

build:
- {{ compiler('c') }}
- {{ compiler("cxx") }}
- python
- numpy
host:
- python
- numpy
- scipy
- cython

host:
build:
- {{ compiler('c') }}
- {{ compiler("cxx") }}
- python
- setuptools
- cython
- numpy
- scipy
- cython

run:
- python
- numpy
- python x.x
- numpy x.x
- cython
- numba
- scipy
- scikit-image
- scikit-learn
- networkx
- opencv [win or linux]
- opencv!=4.1.2 [osx]
- opencv >4.1.2 [osx]
- matplotlib
- vtk
- skan=0.10
- skan>=0.10
- pywin32 [win]

test:
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,12 @@
packages=packages,
package_dir={'': 'src'},
zip_safe=False,
ext_modules=cythonize(extentions),
ext_modules=cythonize(extentions, language_level = "3"),

entry_points={
"wralea": ["openalea.phenomenal = openalea.phenomenal_wralea", ],
},

# See MANIFEST.in
include_package_data=True,
)
)
Loading