Merge pull request #10 from saudzahirr/CI/CD

CI/CD and Skbuild

.github/workflows/c-cpp.yml → .github/workflows/ci.yml

@@ -13,11 +13,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: configure
-      run: ./configure
-    - name: make
-      run: make
-    - name: make check
-      run: make check
-    - name: make distcheck
-      run: make distcheck
+    - name: Build and test
+      run: |
+        mkdir build
+        cd build
+        cmake ..
+        cmake --build .
+        cd ..

.gitignore

@@ -6,7 +6,13 @@ __pycache__
 _skbuild/
 dist/
 build/
+<<<<<<< HEAD
+_skbuild/
+lib/
+_cmake_test_compile/
+=======
 lib/
+>>>>>>> master
 
 _version.py
 *.log

CMakeLists.txt

@@ -1,10 +1,8 @@
 cmake_minimum_required(VERSION 3.22...3.28)
 project(vonMises)
 
-
 set(CMAKE_CXX_STANDARD 11)
 
-
 set(SOURCES
     src/eigenlib/eigen_API.cpp
     src/eigenlib/logger.cpp
@@ -17,8 +15,8 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/src/lib)
 
 include_directories(src/lib)
 
-
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -fopenmp")
 
-
 add_library(eigen SHARED ${SOURCES})
+
+install(TARGETS eigen LIBRARY DESTINATION lib)

environment.yml

@@ -17,5 +17,3 @@ dependencies:
   - ruff
   - pytest
   - tqdm
-  - pip:
-  - - -r requirements.txt

install.py

@@ -7,7 +7,10 @@
 install_cmd = shlex.split("python -m pip install -e . -v")
 setup_directory = os.getcwd()
 
+
 with open("build.log", "w") as log:
+<<<<<<< HEAD
+=======
     if not os.path.exists("build"):
         os.makedirs("build")
     os.chdir("build")
@@ -17,6 +20,7 @@
 os.chdir(setup_directory)
 
 with open("build.log", "a") as log:
+>>>>>>> master
     rv = subprocess.Popen(wheel_cmd, stdout=log, stderr=log)
     while rv.poll() is None:
         time.sleep(0.5)

pyproject.toml

@@ -1,5 +1,43 @@
 [build-system]
+<<<<<<< HEAD
+build-backend = "setuptools.build_meta"
+requires = [
+  "setuptools",
+  "setuptools_scm",
+  "scikit-build",
+  "cmake",
+  "ninja",
+]
+
+[project]
+name = "vonMises"
+authors = [{name = "Saud Zahir", email = "[email protected]"}]
+classifiers = [
+  "Programming Language :: Python :: 3",
+  "Programming Language :: C++ :: 11",
+  "License :: proprietary",
+  "Operating System :: Linux",
+]
+description = "Numerical Algorithm for Eigen Value Problems."
+keywords = ["numerical"]
+license = {file = "LICENSE"}
+requires-python = ">=3.11"
+dynamic = ["version"]
+
+[project.urls]
+"Homepage" = "https://github.com/saudzahirr/vonMises"
+
+[project.scripts]
+"vonMises" = "src.__main__:main"
+
+[tool.setuptools.packages.find]
+where = ["."]
+
+[tool.setuptools_scm]
+version_file = "src/_version.py"
+=======
 requires = ["setuptools", "setuptools_scm", "wheel"]
 
 [tool.setuptools_scm]
-version_file = "src/_version.py"
+version_file = "src/_version.py"
+>>>>>>> master

setup.py

@@ -1,3 +1,3 @@
-import setuptools
+from skbuild import setup
 
-setuptools.setup()
+setup()