Skip to content

Make this build with newer Cython #1

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

Open
hroncok wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Make this build with newer Cython #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a9117c8
Make this build with newer Cython
hroncok Jun 21, 2015
392a118
Ignore stuff
hroncok Jun 21, 2015
ac02df8
Add manifest file to include files in source tarball
hroncok Jun 21, 2015
0736d0e
Remove useless files
hroncok Jun 21, 2015
e6d565c
Update Cython version in README
hroncok Jun 21, 2015
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
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
build
dist
src/p2t.cpp
*.egg*
7 changes: 7 additions & 0 deletions MANIFEST.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
recursive-include poly2tri *.h
recursive-include data *.dat *.dae
recursive-include src *
exclude src/p2t.cpp
include README
include AUTHORS
include test.py
2 changes: 1 addition & 1 deletion README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Dependencies
------------

Core poly2tri lib:
- Cython (0.14.1)
- Cython (0.22)

Testbed:
- Pygame
Expand Down
3 changes: 0 additions & 3 deletions bc.sh
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions imports.py
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions poly2tri/sweep/sweep_context.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@

#include <list>
#include <vector>
#include <cstddef>

namespace p2t {

Expand Down
19 changes: 7 additions & 12 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
import os
from setuptools import setup
from distutils.extension import Extension
from setuptools import setup, Extension
from Cython.Build import cythonize

import sys
if 'setuptools.extension' in sys.modules:
m = sys.modules['setuptools.extension']
m.Extension.__dict__ = m._Extension.__dict__

def read(fname):
return open(os.path.join(os.path.dirname(__file__), fname)).read()
Expand All @@ -19,11 +15,11 @@ def read(fname):
poly2tri/sweep/sweep.cc
poly2tri/sweep/sweep_context.cc""".split("\n")

mod_math = Extension(
mod_p2t = cythonize(Extension(
"p2t",
CYTHON_SOURCES + CPP_SOURCES,
language = "c++"
)
))

setup(
name = "poly2tri",
Expand All @@ -32,8 +28,7 @@ def read(fname):
description = "A 2D constrained Delaunay triangulation library",
long_description = read('README'),
url = "http://code.google.com/p/poly2tri/",

ext_modules = [mod_math],
setup_requires = ["cython==0.14.1", "setuptools_cython==0.2.1"],
install_requires = ["cython==0.14.1"],
ext_modules = mod_p2t,
setup_requires = ["cython>=0.22"],
install_requires = ["cython>=0.22"],
)