Skip to content

Commit

Permalink
- 2.1.0rc
Browse files Browse the repository at this point in the history
- GPLv3.0 for everything but rpy2.rinterface

--HG--
branch : version_2.1.x
  • Loading branch information
lgautier committed Apr 1, 2010
1 parent 35d649d commit 7573201
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Copyright Laurent Gautier 2008-2010
People have contributed suggestions or patches; they are thanked here,
rpy2 is much better because of them.

rpy2 is making a limited use of code from:
rpy2 is making a limited use (if much left) of code from:

RPy - http://rpy.sourceforge.net
--------------------------------
Expand Down
2 changes: 1 addition & 1 deletion doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
# The short X.Y version.
version = '2.1'
# The full version, including alpha/beta/rc tags.
release = '2.1beta'
release = '2.1rc'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion rpy/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version_vector__ = ((2,1,0), 'beta2')
__version_vector__ = ((2,1,0), 'rc')

__version__ = '.'.join([str(x) for x in __version_vector__[0]]) + \
'' + __version_vector__[1]
Expand Down
2 changes: 2 additions & 0 deletions rpy/robjects/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
The module is structured around the singleton r of class R,
that represents an embedded R.
License: GPLv3.0 (although a dual license can be worked out)
"""

import os, sys
Expand Down
6 changes: 4 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ def getRinterface_ext():
version = pack_version,
description = "Python interface to the R language",
url = "http://rpy.sourceforge.net",
license = "(L)GPL",
license = "GPLv3.0 (except rpy2.rinterface LGPL)",
author = "Laurent Gautier",
author_email = "lgautier@gmail.com",
ext_modules = rinterface_exts[0],
Expand All @@ -293,9 +293,11 @@ def getRinterface_ext():
],
classifiers = ['Programming Language :: Python',
'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)',
'License :: OSI Approved :: GNU General Public License (GPL)
',
'Intended Audience :: Developers',
'Intended Audience :: Science/Research',
'Development Status :: 3 - Alpha'
'Development Status :: 4 - Beta'
],
data_files = [(os.path.join('rpy2', 'images'),
[os.path.join('doc', 'source', 'rpy2_logo.png')])]
Expand Down

0 comments on commit 7573201

Please sign in to comment.