Skip to content

Commit

Permalink
Merge d75c5c4 into fd66418
Browse files Browse the repository at this point in the history
  • Loading branch information
dpinte committed Jun 16, 2017
2 parents fd66418 + d75c5c4 commit abe6a75
Show file tree
Hide file tree
Showing 10 changed files with 2,336 additions and 5,280 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Expand Up @@ -14,3 +14,6 @@ docs/build/

# Auto-generated by setup.py
traits/_version.py

# Cython C files
traits/ctraits.c
14 changes: 9 additions & 5 deletions setup.py
Expand Up @@ -6,13 +6,15 @@
import sys

from setuptools import setup, Extension, find_packages
from Cython.Distutils import build_ext

MAJOR = 4
MINOR = 7
MICRO = 0

IS_RELEASED = False


VERSION = '%d.%d.%d' % (MAJOR, MINOR, MICRO)


Expand Down Expand Up @@ -122,22 +124,24 @@ def check_python_version():

ctraits = Extension(
'traits.ctraits',
sources=['traits/ctraits.c'],
sources=['traits/ctraits.pyx'],
extra_compile_args=['-DNDEBUG=1', '-O3'],
)
)

def additional_commands():
default = {'build_ext': build_ext}
# Pygments 2 isn't supported on Python 3 versions earlier than 3.3, so
# don't make the documentation command available there.
if (3,) <= sys.version_info < (3, 3):
return {}
return default

try:
from sphinx.setup_command import BuildDoc
except ImportError:
return {}
return default
else:
return {'documentation': BuildDoc}
default['documentation'] = BuildDoc
return default

setup(
name='traits',
Expand Down

0 comments on commit abe6a75

Please sign in to comment.