Skip to content
This repository was archived by the owner on Jun 14, 2023. It is now read-only.

Commit 68ee959

Browse files
vojtatomvojtatom
authored
Merge pull request #51 from MetacitySuite/dev
Minimizing build time & cleaning up `MANIFEST.in`
2 parents 4a13dde + 8fd643f commit 68ee959

File tree

484 files changed

+29
-2603
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

484 files changed

+29
-2603
lines changed

‎.github/workflows/wheel.yaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
name: "Create Python distributions and upload to PyPI"
1+
name: "Create Python distributions"
22

33
on:
4-
push:
5-
branches: [ ci ]
64
workflow_dispatch: {}
75

86
jobs:

‎.gitmodules‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎CMakeLists.txt‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -25,29 +25,29 @@ add_compile_options(-Wall -pedantic -O3)
2525
add_link_options(-pthread)
2626

2727

28-
pybind11_add_module(geometry src/cpp/geometry.cpp
29-
src/cpp/types.hpp
30-
src/cpp/convert.hpp
31-
src/cpp/progress.hpp
32-
src/cpp/mesh_pipeline/bbox.hpp
33-
src/cpp/mesh_pipeline/bbox.cpp
34-
src/cpp/mesh_pipeline/modifiers.hpp
35-
src/cpp/mesh_pipeline/modifiers.cpp
36-
src/cpp/mesh_pipeline/graham.hpp
37-
src/cpp/mesh_pipeline/graham.cpp
38-
src/cpp/mesh_pipeline/bvh.hpp
39-
src/cpp/mesh_pipeline/bvh.cpp
40-
src/cpp/mesh_pipeline/model.hpp
41-
src/cpp/mesh_pipeline/model.cpp
42-
src/cpp/mesh_pipeline/layer.hpp
43-
src/cpp/mesh_pipeline/layer.cpp
44-
src/cpp/mesh_pipeline/attribute.hpp
45-
src/cpp/mesh_pipeline/attribute.cpp
46-
src/cpp/mesh_pipeline/grid.hpp
47-
src/cpp/mesh_pipeline/grid.cpp
48-
src/cpp/mesh_pipeline/triangulation.hpp
49-
src/cpp/mesh_pipeline/triangulation.cpp
50-
src/cpp/vector_pipeline/graph.hpp
51-
src/cpp/vector_pipeline/graph.cpp)
28+
pybind11_add_module(geometry src/metacity/geometry/geometry.cpp
29+
src/metacity/geometry/types.hpp
30+
src/metacity/geometry/convert.hpp
31+
src/metacity/geometry/progress.hpp
32+
src/metacity/geometry/mesh_pipeline/bbox.hpp
33+
src/metacity/geometry/mesh_pipeline/bbox.cpp
34+
src/metacity/geometry/mesh_pipeline/modifiers.hpp
35+
src/metacity/geometry/mesh_pipeline/modifiers.cpp
36+
src/metacity/geometry/mesh_pipeline/graham.hpp
37+
src/metacity/geometry/mesh_pipeline/graham.cpp
38+
src/metacity/geometry/mesh_pipeline/bvh.hpp
39+
src/metacity/geometry/mesh_pipeline/bvh.cpp
40+
src/metacity/geometry/mesh_pipeline/model.hpp
41+
src/metacity/geometry/mesh_pipeline/model.cpp
42+
src/metacity/geometry/mesh_pipeline/layer.hpp
43+
src/metacity/geometry/mesh_pipeline/layer.cpp
44+
src/metacity/geometry/mesh_pipeline/attribute.hpp
45+
src/metacity/geometry/mesh_pipeline/attribute.cpp
46+
src/metacity/geometry/mesh_pipeline/grid.hpp
47+
src/metacity/geometry/mesh_pipeline/grid.cpp
48+
src/metacity/geometry/mesh_pipeline/triangulation.hpp
49+
src/metacity/geometry/mesh_pipeline/triangulation.cpp
50+
src/metacity/geometry/vector_pipeline/graph.hpp
51+
src/metacity/geometry/vector_pipeline/graph.cpp)
5252

5353
install(TARGETS geometry DESTINATION .)

‎MANIFEST.in‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
1-
include README.md LICENSE pybind11/LICENSE setup.py
2-
global-include CMakeLists.txt *.cmake *.pyi
3-
graft pybind11/include
4-
graft pybind11/tools
1+
include README.md setup.py pyproject.toml CMakeLists.txt
52
graft src

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Metacity
22

33
[![Build Status](https://github.com/MetacitySuite/Metacity/workflows/Metacity%20CI/badge.svg)](https://github.com/MetacitySuite/Metacity/actions?query=workflow%3A%22Metacity+CI%22)
4-
[![Coverage Status](https://coveralls.io/repos/github/MetacitySuite/Metacity/badge.svg?branch=main)](https://coveralls.io/github/MetacitySuite/Metacity?branch=main)
4+
[![Coverage Status](https://coveralls.io/repos/github/MetacitySuite/Metacity/badge.svg?branch=release)](https://coveralls.io/github/MetacitySuite/Metacity?branch=release)
55
[![Pypi version](https://badge.fury.io/py/metacity.svg)](https://pypi.org/project/metacity/)
66

77
Toolkit for Urban Data Preprocessing

‎pybind11‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ archs = ["universal2"]
2121
archs = ["auto64"]
2222

2323
[tool.cibuildwheel.windows]
24-
archs = ["auto64"]
24+
archs = ["auto64"]

‎setup.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
setup(
2323
name="metacity",
24-
version="0.5.2",
24+
version="0.5.3",
2525
author="Metacity",
2626
license="MIT",
2727
description="Python toolkit for Urban Data processing",
@@ -30,7 +30,6 @@
3030
packages=find_packages(where="src"),
3131
package_dir={"": "src"},
3232
cmake_install_dir="src/metacity",
33-
include_package_data=True,
3433
install_requires = [
3534
"orjson>=3.6.4"
3635
],

‎src/cpp/deps/cppcodec/base32_crockford.hpp‎

Lines changed: 0 additions & 91 deletions
This file was deleted.

‎src/cpp/deps/cppcodec/base32_default_crockford.hpp‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)