Commit ced2848b authored by Benjy Marks's avatar Benjy Marks
Browse files

updating setup.py to include hpp file

parent abc2b2fb
Pipeline #78495 failed with stage
in 1 minute and 19 seconds
......@@ -3,15 +3,16 @@
package:
name: {{ name|lower }}
version: 1.0.0 # {{ data.get('version') }}
version: 1.0.1 # {{ data.get('version') }}
source:
# url: ./../dist/{{ name }}-1.0.0.tar.gz # for local testing
url: https://gricad-gitlab.univ-grenoble-alpes.fr/ttk/radioSphere/-/archive/version-1.0.0/radioSphere-version-1.0.0.tar.gz
url: https://gricad-gitlab.univ-grenoble-alpes.fr/ttk/radioSphere/uploads/5aef14329123e2288e5a1ff34a233f6b/radioSphere-1.0.1.tar.gz
sha256: d2dcfdedafec16c8ecc7c88c9c2a99380273ca532dfa3b2899c9051bfb026034
build:
number: 0
script: {{ PYTHON }} setup.py install . -vv
script: {{ PYTHON }} setup.py install -vv
requirements:
build:
......@@ -30,6 +31,7 @@ requirements:
# - opencv-python
- pytest
run:
- python
- matplotlib
- numpy x.x
- scipy
......@@ -37,14 +39,14 @@ requirements:
- tifffile
- pytest
# test:
# imports:
# - radiosphere
# - radiosphere.tests
test:
imports:
- radiosphere
- radiosphere.tests
about:
home: "https://ttk.gricad-gitlab.univ-grenoble-alpes.fr/ttk/radioSphere"
license: GPL-3.0+
license: GPL-2.0-or-later
license_family: GPL
license_file: LICENSE
summary: "Single-projection reconstruction technique for positioning monodisperse spheres in 3D with a divergent x-ray beam"
......@@ -52,6 +54,4 @@ about:
extra:
recipe-maintainers:
- ostamati
- benjym
- edwardando
......@@ -7,7 +7,7 @@ import os
import sysconfig
name="radioSphere"
version="1.0.0"
version="1.0.1"
modules = ["DEM"]
packages = ["radioSphere", "radioSphere.DEM"]
......@@ -16,7 +16,9 @@ packages = ["radioSphere", "radioSphere.DEM"]
if os.getenv('PREFIX') != None: # if we are compiling with conda
EIGEN_LOC = os.getenv('PREFIX')
else:
EIGEN_LOC = "/opt/homebrew/Cellar/eigen/3.4.0_1/include/eigen3/" # on benjy's macbook pro installed with brew, this is so very very brittle
EIGEN_LOC = "/opt/homebrew/Cellar/eigen/3.4.0_1" # on benjy's macbook pro installed with brew, this is so very very brittle
print(EIGEN_LOC)
def readConf(fileName, comments=["#"]):
"""
......@@ -45,7 +47,8 @@ setup(
cmdclass={'build_ext': build_ext},
ext_modules=[ Extension("projectSphereC3",
sources=["tools/projectSphereC3.cython/_projectSphereC.pyx",
"tools/projectSphereC3.cython/projectSphereC.cpp"],
"tools/projectSphereC3.cython/projectSphereC.cpp",
"tools/projectSphereC3.cython/projectSphereC.hpp"],
include_dirs=[numpy.get_include()],
extra_compile_args=['-fopenmp','-I/usr/local/include/eigen3', '-I/usr/include/eigen3', '-I' + EIGEN_LOC + '/include/eigen3'],
# extra_link_args=['-fopenmp'],
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment