Skip to content

Match cookiecutter #65

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.

Sign up for GitHub

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

Merged
sbillinge merged 3 commits into from
Jul 31, 2024
Merged

Match cookiecutter #65

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
76545d0
Match cookiecutter
Sparks29032 Jul 31, 2024
7ca10bc
[pre-commit.ci] auto fixes from pre-commit hooks
pre-commit-ci[bot] Jul 31, 2024
334ab8d
Flake8
Sparks29032 Jul 31, 2024
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
61 changes: 23 additions & 38 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,17 @@
Scripts: pdffit2
"""

import glob
import os
import re
import sys
import warnings

from setuptools import Extension, find_packages, setup
from setuptools import Extension, setup

# Use this version when git data are not available, like in git zip archive.
# Update when tagging a new release.
FALLBACK_VERSION = "1.4.3"

MYDIR = os.path.dirname(os.path.abspath(__file__))

Expand Down Expand Up @@ -98,50 +103,30 @@ def get_gsl_config_win():
library_dirs += gcfg["library_dirs"]
# add optimization flags for other compilers if needed

# define extension arguments here
ext_kws = {
"include_dirs": include_dirs,
"libraries": libraries,
"library_dirs": library_dirs,
"define_macros": define_macros,
"extra_compile_args": extra_compile_args,
"extra_link_args": extra_link_args,
"extra_objects": extra_objects,
}


# define extension here
pdffit2module = Extension(
"diffpy.pdffit2.pdffit2",
[
"src/extensions/pdffit2module/bindings.cc",
"src/extensions/pdffit2module/misc.cc",
"src/extensions/pdffit2module/pdffit2module.cc",
"src/extensions/pdffit2module/pyexceptions.cc",
"src/extensions/libpdffit2/Atom.cc",
"src/extensions/libpdffit2/LocalPeriodicTable.cc",
"src/extensions/libpdffit2/OutputStreams.cc",
"src/extensions/libpdffit2/PeriodicTable.cc",
"src/extensions/libpdffit2/PointsInSphere.cc",
"src/extensions/libpdffit2/StringUtils.cc",
"src/extensions/libpdffit2/fit.cc",
"src/extensions/libpdffit2/gaussj.cc",
"src/extensions/libpdffit2/metric.cc",
"src/extensions/libpdffit2/nrutil.cc",
"src/extensions/libpdffit2/output.cc",
"src/extensions/libpdffit2/parser.cc",
"src/extensions/libpdffit2/pdf.cc",
"src/extensions/libpdffit2/pdffit.cc",
"src/extensions/libpdffit2/pdflsmin.cc",
"src/extensions/libpdffit2/scatlen.cc",
"src/extensions/libpdffit2/stru.cc",
],
include_dirs=include_dirs,
libraries=libraries,
library_dirs=library_dirs,
define_macros=define_macros,
extra_compile_args=extra_compile_args,
extra_link_args=extra_link_args,
extra_objects=extra_objects,
)
def create_extensions():
ext = Extension("diffpy.pdffit2.pdffit2", glob.glob("src/extensions/**/*.cc"), **ext_kws)
return [ext]


setup_args = dict(
packages=find_packages(where="src"),
package_dir={"": "src"},
ext_modules=[pdffit2module],
# scripts=[] # place examples here
ext_modules=[],
)

if __name__ == "__main__":
setup_args["ext_modules"] = create_extensions()
setup(**setup_args)

# End of file