Skip to content

Commit

Permalink
update version and add COPYING / license
Browse files Browse the repository at this point in the history
  • Loading branch information
cokelaer committed Feb 10, 2017
1 parent a540565 commit a5085fd
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 7 deletions.
33 changes: 33 additions & 0 deletions COPYING
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
New BSD License

Copyright (c) 2007–2017 The scikit-learn developers.
All rights reserved.


Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

a. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
b. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
c. Neither the name of the Scikit-learn Developers nor the names of
its contributors may be used to endorse or promote products
derived from this software without specific prior written
permission.


THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
DAMAGE.


2 changes: 2 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
include COPYING
include README.rst
recursive-include easydev/share *
include easydev/share/copybutton.js
2 changes: 1 addition & 1 deletion doc/source/quickstart.rst
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ This works also if you want to set a value::
.. _devtools:

The DevTools class
========================
-------------------------

Little by little, small tools have been added in **easydev**. To make life easier such tools
have been gatherered within a single class called :class:`easydev.tools.DevTools`.
Expand Down
3 changes: 2 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,6 @@ attr=!skip,!notravis
upload_dir=doc/build/html/

[tool:pytest]
addopts= --cov=easydev --cov-report=term-missing --durations=10 --verbose
addopts= --durations=10 --verbose
#addopts= --cov=easydev --cov-report=term-missing --durations=10 --verbose

14 changes: 9 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@

_MAJOR = 0
_MINOR = 9
_MICRO = 31
_MICRO = 32
version = '%d.%d.%d' % (_MAJOR, _MINOR, _MICRO)
release = '%d.%d' % (_MAJOR, _MINOR)

metainfo = {
'authors': {'Cokelaer':('Thomas Cokelaer','cokelaer@ebi.ac.uk')},
'version': version,
'license' : 'GPL',
'license' : 'new BSD',
'download_url' : ['http://pypi.python.org/pypi/easydev'],
'url' : ["http://packages.python.org/easydev/"],
'description':'Common utilities to ease the development of Python packages' ,
Expand All @@ -25,9 +25,13 @@
'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers',
'Intended Audience :: Science/Research',
'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)',
'License :: OSI Approved',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Topic :: Software Development :: Libraries :: Python Modules'
]
}
Expand Down Expand Up @@ -58,8 +62,8 @@
package_data = {"easydev.share": [
"themes/standard/*html",
"themes/standard/static/*",
"themes/cno/*html",
"themes/cno/static/*",
"themes/cno/*html",
"themes/cno/static/*",
"copybutton.js"]},

install_requires = ['colorama', 'pexpect'],
Expand Down

0 comments on commit a5085fd

Please sign in to comment.