2 new revisions:
Revision: 63edeab344ec
Branch: default
Author: Pekka Klärck
Date: Thu Apr 24 22:08:26 2014 UTC
Log: package.py: fixed docs about release tags (we nowadays use 'a'
and 'b'...
http://code.google.com/p/robotframework/source/detail?r=63edeab344ec
Revision: f2505ecdf45e
Branch: default
Author: Pekka Klärck
Date: Thu Apr 24 22:12:11 2014 UTC
Log: setup.py: Support bdist_wheel...
http://code.google.com/p/robotframework/source/detail?r=f2505ecdf45e
==============================================================================
Revision: 63edeab344ec
Branch: default
Author: Pekka Klärck
Date: Thu Apr 24 22:08:26 2014 UTC
Log: package.py: fixed docs about release tags (we nowadays use 'a'
and 'b' and not 'alpha' and 'beta') and changed code to require 'a', 'b',
and 'rc' to contain number.
http://code.google.com/p/robotframework/source/detail?r=63edeab344ec
Modified:
/package.py
=======================================
--- /package.py Tue Feb 26 10:37:13 2013 UTC
+++ /package.py Thu Apr 24 22:08:26 2014 UTC
@@ -14,22 +14,20 @@
'version_number' must be a version number in format '2.x(.y)', 'trunk' or
'keep'. With 'keep', version information is not updated.
-'release_tag' must be either 'alpha', 'beta', 'rc' or 'final', where all
but
-the last one can have a number after the name like 'alpha1' or 'rc2'. When
-'version_number' is 'trunk', 'release_tag' is automatically assigned to the
-current date.
+'release_tag' must be either 'a<num>', 'b<num>', 'rc<num>' or 'final',
where
+'<num>' is an integer like 'a1' or 'rc2'. When 'version_number' is 'trunk',
+'release_tag' is automatically assigned to the current date.
When creating the jar distribution, jython.jar must be placed in 'ext-lib'
directory, under the project root.
This script uses 'setup.py' internally. Distribution packages are created
-under 'dist' directory, which is deleted initially. Depending on your
system,
-you may need to run this script with administrative rights (e.g.
with 'sudo').
+under 'dist' directory, which is deleted initially.
Examples:
package.py sdist 2.0 final
package.py wininst keep
- package.py all 2.1.13 alpha
+ package.py all 2.1.13 a2
package.py sdist trunk
package.py version trunk
"""
@@ -59,8 +57,8 @@
VERSION_PATH = join(ROBOT_PATH, 'version.py')
POM_PATH = join(ROOT_PATH, 'pom.xml')
VERSIONS = [re.compile('^2\.\d+(\.\d+)?$'), 'trunk', 'keep']
-RELEASES = [re.compile('^a\d*$'), re.compile('^b\d*$'),
- re.compile('^rc\d*$'), 'final']
+RELEASES = [re.compile('^a\d+$'), re.compile('^b\d+$'),
+ re.compile('^rc\d+$'), 'final']
VERSION_CONTENT = """# Automatically generated by 'package.py' script.
import sys
==============================================================================
Revision: f2505ecdf45e
Branch: default
Author: Pekka Klärck
Date: Thu Apr 24 22:12:11 2014 UTC
Log: setup.py: Support bdist_wheel
Update issue 1674
Enabled creating wheels by importing setuptools in setup.py when
bdist_wheel used.
After this change building wheels requires:
pip install -U setuptools wheel
python setup.py bdist_wheel
http://code.google.com/p/robotframework/source/detail?r=f2505ecdf45e
Modified:
/setup.py
=======================================
--- /setup.py Tue Dec 3 12:22:08 2013 UTC
+++ /setup.py Thu Apr 24 22:12:11 2014 UTC
@@ -5,8 +5,8 @@
from os.path import join, dirname
from distutils.core import setup
-if 'develop' in sys.argv:
- import setuptools # support setuptools development mode
+if 'develop' in sys.argv or 'bdist_wheel' in sys.argv:
+ import setuptools # support setuptools development mode and wheels
execfile(join(dirname(__file__), 'src', 'robot', 'version.py'))
--
---
You received this message because you are subscribed to the Google Groups "robotframework-commit" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to robotframework-commit+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
