Skip to content

Commit

Permalink
Update various files for Pypi package.
Browse files Browse the repository at this point in the history
  • Loading branch information
KelSolaar committed Sep 2, 2014
1 parent 5cc66eb commit 9a77e1e
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 26 deletions.
9 changes: 9 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
include COPYING
include LICENSE
include *.rst
graft docs/_build
graft utilities
global-exclude *.pyc
global-exclude *.pyo
global-exclude ._*
global-exclude .DS_Store
5 changes: 3 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,13 @@ The two main references for `Colour <https://github.com/colour-science/colour>`_
Contributing
------------

If you would like to contribute to **Colour**, please refer to the following guide: http://colour-science.org/contributing.php

If you would like to contribute to `Colour <https://github.com/colour-science/colour>`_, please refer to the following `contributing <http://colour-science.org/contributing.php>`_ guide.

Changes
-------

The changes are viewable on the `releases <https://github.com/colour-science/colour/releases>`_ page.

About
-----

Expand Down
2 changes: 2 additions & 0 deletions colour/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
from . import appearance
from .colorimetry import * # noqa
from . import colorimetry
from .constants import *
from . import constants
from .difference import * # noqa
from . import difference
Expand Down Expand Up @@ -88,6 +89,7 @@
__all__ += appearance.__all__
__all__ += characterisation.__all__
__all__ += colorimetry.__all__
__all__ += constants.__all__
__all__ += difference.__all__
__all__ += io.__all__
__all__ += models.__all__
Expand Down
18 changes: 11 additions & 7 deletions colour/constants/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,15 @@

from __future__ import absolute_import

from .cie import * # noqa
from . import cie
from .codata import * # noqa
from . import codata
from .cie import CIE_E, CIE_K
from .codata import (
AVOGADRO_CONSTANT,
BOLTZMANN_CONSTANT,
LIGHT_SPEED,
PLANCK_CONSTANT)

__all__ = []
__all__ += cie.__all__
__all__ += codata.__all__
__all__ = ['CIE_E', 'CIE_K']
__all__ += ['AVOGADRO_CONSTANT',
'BOLTZMANN_CONSTANT',
'LIGHT_SPEED',
'PLANCK_CONSTANT']
4 changes: 2 additions & 2 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ The two main references for `Colour <https://github.com/colour-science/colour>`_
Contributing
------------

If you would like to contribute to **Colour**, please refer to the following guide: http://colour-science.org/contributing.php
If you would like to contribute to `Colour <https://github.com/colour-science/colour>`_, please refer to the following `contributing <http://colour-science.org/contributing.php>`_ guide.

Changes
-------

The releases changes are available on Github: https://github.com/colour-science/colour/releases
The changes are viewable on the `releases <https://github.com/colour-science/colour/releases>`_ page.

About
-----
Expand Down
32 changes: 17 additions & 15 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
from setuptools import setup
from setuptools import find_packages

import colour

__author__ = 'Colour Developers'
__copyright__ = 'Copyright (C) 2013 - 2014 - Colour Developers'
__license__ = 'New BSD License - http://opensource.org/licenses/BSD-3-Clause'
Expand All @@ -25,18 +23,19 @@
__all__ = ['SHORT_DESCRIPTION',
'LONG_DESCRIPTION',
'INSTALLATION_REQUIREMENTS',
'TESTS_REQUIREMENTS',
'DOCS_REQUIREMENTS']
'OPTIONAL_REQUIREMENTS',
'DOCS_REQUIREMENTS',
'TESTS_REQUIREMENTS']

SHORT_DESCRIPTION = 'Colour Science for Python'

LONG_DESCRIPTION = ('Colour is a Python colour science package implementing a '
'comprehensive number of colour theory transformations '
'and algorithms.')

INSTALLATION_REQUIREMENTS = [
'matplotlib>=1.3.1',
'numpy>=1.8.2',
'scipy>=0.14.0']
'matplotlib>=1.3.1']

if sys.version_info[:2] <= (2, 7):
INSTALLATION_REQUIREMENTS += [
Expand All @@ -47,16 +46,18 @@
'ordereddict>=1.1',
'unittest2>=0.5.1']

TESTS_REQUIREMENTS = (
'nose>=1.3.4',)
OPTIONAL_REQUIREMENTS = ['scipy>=0.14.0']

DOCS_REQUIREMENTS = ['sphinx>=1.2.2']

DOCS_REQUIREMENTS = (
'sphinx>=1.2.2',)
TESTS_REQUIREMENTS = ['coverage>=3.7.1',
'flake8>=2.1.0',
'nose>=1.3.4']

setup(name='colour-science',
version=colour.__version__,
author=colour.__author__,
author_email=colour.__email__,
version='0.3.0',
author=__author__,
author_email=__email__,
include_package_data=True,
packages=find_packages(),
scripts=[],
Expand All @@ -66,8 +67,9 @@
long_description=LONG_DESCRIPTION,
install_requires=INSTALLATION_REQUIREMENTS,
extras_require={
'tests': TESTS_REQUIREMENTS,
'docs': DOCS_REQUIREMENTS},
'docs': DOCS_REQUIREMENTS,
'optional': OPTIONAL_REQUIREMENTS,
'tests': TESTS_REQUIREMENTS},
classifiers=['Development Status :: 3 - Alpha',
'Environment :: Console',
'Intended Audience :: Developers',
Expand Down

0 comments on commit 9a77e1e

Please sign in to comment.