Skip to content

Commit

Permalink
removed citation automation as there is incompatibility with pyprojec…
Browse files Browse the repository at this point in the history
…t.toml metadata when building the package
  • Loading branch information
jurra committed Sep 20, 2023
1 parent 2cb357c commit b6990b5
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 91 deletions.
52 changes: 0 additions & 52 deletions .github/workflows/gen-citation.yaml

This file was deleted.

30 changes: 10 additions & 20 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ description = "Python bindings for MurTree C++ library"
readme = "README.md"
long_description = {file = "README.md"}
long_description_content_type = "text/markdown"
license = 'MIT'
keywords = ["MurTree", "Optimal decision tree", "Python bindings"]

authors = [
Expand All @@ -43,43 +42,34 @@ authors = [
{name = "Emir Demirovic"}
]

classifiers = [
"Programming Language :: Python :: 3",
"License :: OSI Approved :: MIT License",
"Operating System :: Linux"
]

dependencies = [
"pandas>=1.0.0",
"numpy>=1.18.0"
]

[project.license]
file = 'LICENSE'


[project.urls]
homepage = "https://github.com/MurTree/pymurtree.git"
MurTreeCpp = "https://github.com/MurTree/murtree"
sample_data = "https://github.com/MurTree/murtree-data"
journal = "https://doi.org/10.48550/arXiv.2007.12652"

classifiers = [
"Programming Language :: Python :: 3",
"License :: OSI Approved :: MIT License",
"Operating System :: Linux"
]

[project.optional-dependencies]
dev = [
"pytest>=5.3.0",
"pytest-cov>=2.8.0"
]
publishing = [
"cff-from-621"
]

[tool.pytest.ini_options]
pythonpath = [
".", "src/pymurtree"
]

[tool.cff-from-621]
order = ["message", "cff-version", "title", "abstract", "version", "date-released", "authors", "keywords"]

[tool.cff-from-621.static]
date-released = "2023-09-20"
message = "If you use this software, please cite it as below."

[tool.setuptools.dynamic]
version = {attr = "cff_from_621.version.VERSION"}
36 changes: 17 additions & 19 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,19 @@

ext_modules = [
Pybind11Extension(package_name + '.' + extension_name,
(["src/pymurtree/bindings.cpp",
"src/pymurtree/exporttree.cpp"]
+ sorted(glob("murtree/code/MurTree/Utilities/*.cpp"))
+ sorted(glob("murtree/code/MurTree/Engine/*.cpp"))
+ sorted(glob("murtree/code/MurTree/Data Structures/*.cpp"))
),
include_dirs = ["murtree/code/MurTree/Utilities/",
"murtree/code/MurTree/Engine/",
"murtree/code/MurTree/Data Structures/",
"src/pymurtree/"],
define_macros = [('VERSION_INFO', __version__)], # passing in the version to the compiled code
# extra_objects=["murtree/code/MurTree/Data Structures/binary_data.h",
# "src/pymurtree/exporttree.h"],

)
(["src/pymurtree/bindings.cpp",
"src/pymurtree/exporttree.cpp"]
+ sorted(glob("murtree/code/MurTree/Utilities/*.cpp"))
+ sorted(glob("murtree/code/MurTree/Engine/*.cpp"))
+ sorted(glob("murtree/code/MurTree/Data Structures/*.cpp"))
),
include_dirs=["murtree/code/MurTree/Utilities/",
"murtree/code/MurTree/Engine/",
"murtree/code/MurTree/Data Structures/",
"src/pymurtree/"],
# passing in the version to the compiled code
define_macros=[('VERSION_INFO', __version__)]
)
]

setup(
Expand All @@ -44,9 +42,9 @@
author_email="[email protected]",
url="https://github.com/MurTree/pymurtree",
description="Python wrapper for the MurTree project",
packages=[package_name], # only look for a packages called <package_name>
package_dir={"": "src"}, # look for the root package in the src directory
# only look for a packages called <package_name>
packages=[package_name],
# look for the root package in the src directory
package_dir={"": "src"},
ext_modules=ext_modules,
requires=["pandas", "numpy"],
dev_requires=['pytest']
)

0 comments on commit b6990b5

Please sign in to comment.