From f31b0f136b0f8ec34444aa05c79e8c2841735d0e Mon Sep 17 00:00:00 2001 From: Theodore Chang Date: Sat, 21 Sep 2024 17:21:32 +0200 Subject: [PATCH] Ignore files, ensure patch --- .github/workflows/docker.yml | 2 +- .github/workflows/windows.yml | 2 ++ MANIFEST.in | 53 +++++++++++++++++++++++++++++++++-- eigen | 2 +- pybind11 | 2 +- setup.py | 21 ++++++++++---- 6 files changed, 71 insertions(+), 11 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index fcc50b3..e32ca1d 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -4,7 +4,7 @@ on: branches: [ master ] jobs: ubuntu-dev: - if: "!contains(github.event.head_commit.message, '[skip]')" + if: ${{!contains(github.event.head_commit.message, '[skip]')}} runs-on: ubuntu-22.04 timeout-minutes: 60 steps: diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 8b1e9a9..f5e91bb 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -4,6 +4,8 @@ on: branches: [ master ] pull_request: branches: [ master ] +env: + VPMR_VERSION: "" jobs: windows: runs-on: windows-2022 diff --git a/MANIFEST.in b/MANIFEST.in index ee64f21..40155f7 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,50 @@ -graft . -prune .git -recursive-exclude .github .gitlab .circleci +graft eigen +graft exprtk +graft exprtk-custom-types +graft mpreal +graft pybind11 +graft pyvpmr +graft src +include patch_size.patch +prune eigen/.gitlab +prune eigen/bench +prune eigen/ci +prune eigen/cmake +prune eigen/debug +prune eigen/demos +prune eigen/doc +prune eigen/failtest +prune eigen/scripts +prune eigen/test +prune eigen/unsupported/bench +prune eigen/unsupported/doc +prune eigen/unsupported/test +prune exprtk/.circleci +prune mpreal/example +prune pybind11/.github +prune pybind11/docs +prune pybind11/tests +prune pybind11/tools +prune test +global-exclude .clang-format +global-exclude .clang-tidy +global-exclude .codespell-ignore-lines +global-exclude .git +global-exclude .git-blame-ignore-revs +global-exclude .gitattributes +global-exclude .gitignore +global-exclude .hgeol +global-exclude *.dat +global-exclude *.in +global-exclude *.inc +global-exclude *.sh +global-exclude *.txt +global-exclude *.yaml +global-exclude *.yml +global-exclude *cmake* +global-exclude changelog* +global-exclude COPYING.* +global-exclude INSTALL +global-exclude LICENSE +global-exclude Makefile +prune eigen/Eigen/src/plugins diff --git a/eigen b/eigen index 132f281..2d4c9b4 160000 --- a/eigen +++ b/eigen @@ -1 +1 @@ -Subproject commit 132f281f501380faeba1b5b1fe7e4f237099c2a3 +Subproject commit 2d4c9b400cca33d2f5cf316efc7151236244edb1 diff --git a/pybind11 b/pybind11 index a7910be..1f8b4a7 160000 --- a/pybind11 +++ b/pybind11 @@ -1 +1 @@ -Subproject commit a7910be6307e442297e55c84901a96dd0d046e93 +Subproject commit 1f8b4a7f1a1c5cc9bd6e0d63fe15540e6c458b24 diff --git a/setup.py b/setup.py index 0ffc001..b217fa2 100644 --- a/setup.py +++ b/setup.py @@ -8,17 +8,28 @@ # noinspection PyTypeChecker setup( version=datetime.now().strftime("%y%m%d"), - long_description=(Path(__file__).parent / "README.md").read_text(encoding='utf8').replace( - "resource/", "https://raw.githubusercontent.com/TLCFEM/vpmr/master/resource/"), - long_description_content_type='text/markdown', + long_description=(Path(__file__).parent / "README.md") + .read_text(encoding="utf8") + .replace( + "resource/", "https://raw.githubusercontent.com/TLCFEM/vpmr/master/resource/" + ), + long_description_content_type="text/markdown", ext_modules=[ Pybind11Extension( "_pyvpmr", ["src/VPMR.cpp"], - include_dirs=["eigen", "eigen/unsupported", "mpreal", "exprtk", "exprtk-custom-types"], + include_dirs=[ + "eigen", + "eigen/unsupported", + "mpreal", + "exprtk", + "exprtk-custom-types", + ], libraries=["mpfr", "gmp", "tbb"], define_macros=[("PYVPMR", 1)], - extra_compile_args=['-fno-aligned-allocation'] if "Darwin" == platform.system() else [], + extra_compile_args=["-fno-aligned-allocation"] + if "Darwin" == platform.system() + else [], ), ], cmdclass={"build_ext": build_ext},