[Python-apps-commits] r10797 - in packages/slapos.core/trunk/debian (6 files)
arnau at users.alioth.debian.org
arnau at users.alioth.debian.org
Sat Apr 26 09:28:48 UTC 2014
Date: Saturday, April 26, 2014 @ 09:28:47
Author: arnau
Revision: 10797
Uploaded slapos.core 1.0.3-1.
Modified:
packages/slapos.core/trunk/debian/changelog
packages/slapos.core/trunk/debian/patches/series
packages/slapos.core/trunk/debian/slapos-node-unofficial.install
Deleted:
packages/slapos.core/trunk/debian/patches/fix_register_configuration_replace.patch
packages/slapos.core/trunk/debian/patches/fix_setup_depends.patch
packages/slapos.core/trunk/debian/patches/fix_tests_install_requires.patch
Modified: packages/slapos.core/trunk/debian/changelog
===================================================================
--- packages/slapos.core/trunk/debian/changelog 2014-04-20 20:26:02 UTC (rev 10796)
+++ packages/slapos.core/trunk/debian/changelog 2014-04-26 09:28:47 UTC (rev 10797)
@@ -1,3 +1,15 @@
+slapos.core (1.0.3-1) unstable; urgency=medium
+
+ * New upstream release.
+ + debian/patches/fix_register_configuration_replace.patch,
+ debian/patches/fix_setup_depends.patch,
+ debian/patches/fix_tests_install_requires.patch:
+ - Dropped as they have been applied upstream.
+ + debian/slapos-node-unofficial.install:
+ - Add slapos/cli/boot.py.
+
+ -- Arnaud Fontaine <arnau at debian.org> Tue, 25 Mar 2014 19:22:41 +0900
+
slapos.core (1.0.2.1-4) unstable; urgency=medium
* Add cli/register.py to allow registering a node to the master.
Deleted: packages/slapos.core/trunk/debian/patches/fix_register_configuration_replace.patch
===================================================================
--- packages/slapos.core/trunk/debian/patches/fix_register_configuration_replace.patch 2014-04-20 20:26:02 UTC (rev 10796)
+++ packages/slapos.core/trunk/debian/patches/fix_register_configuration_replace.patch 2014-04-26 09:28:47 UTC (rev 10797)
@@ -1,11 +0,0 @@
---- a/slapos/cli/register.py
-+++ b/slapos/cli/register.py
-@@ -247,7 +247,7 @@
- to_replace.append(('ipv6_interface', conf.ipv6_interface))
-
- for key, value in to_replace:
-- cfg = re.sub('%s\s+=.*' % key, '%s = %s' % (key, value), cfg)
-+ cfg = re.sub('\n\s*%s\s*=.*' % key, '\n%s = %s' % (key, value), cfg)
-
- if not dry_run:
- with open(config_path, 'w') as fout:
Deleted: packages/slapos.core/trunk/debian/patches/fix_setup_depends.patch
===================================================================
--- packages/slapos.core/trunk/debian/patches/fix_setup_depends.patch 2014-04-20 20:26:02 UTC (rev 10796)
+++ packages/slapos.core/trunk/debian/patches/fix_setup_depends.patch 2014-04-26 09:28:47 UTC (rev 10797)
@@ -1,30 +0,0 @@
-commit 8f5868b5aff8a33dffe65ce1b68fc8a37f38a9c4
-Author: Arnaud Fontaine <arnaud.fontaine at nexedi.com>
-Date: Tue Jan 28 17:06:20 2014 +0900
-
- Make ipython and bpython optional dependencies (enhancements compared to plain Python).
-
-diff --git a/setup.py b/setup.py
-index 98b30f4..efe621b 100644
---- a/setup.py
-+++ b/setup.py
-@@ -54,14 +54,15 @@ setup(name=name,
- 'zc.buildout',
- 'cliff',
- 'requests',
-- 'ipython',
-- 'bpython',
- ] + additional_install_requires,
-- extra_requires={'docs': (
-+ extras_require={
-+ 'docs': (
- 'Sphinx',
- 'repoze.sphinx.autointerface',
- 'sphinxcontrib.programoutput'
-- ),},
-+ ),
-+ 'ipython_console': ('ipython',),
-+ 'bpython_console': ('bpython',)},
- tests_require=[
- 'pyflakes',
- 'mock'
Deleted: packages/slapos.core/trunk/debian/patches/fix_tests_install_requires.patch
===================================================================
--- packages/slapos.core/trunk/debian/patches/fix_tests_install_requires.patch 2014-04-20 20:26:02 UTC (rev 10796)
+++ packages/slapos.core/trunk/debian/patches/fix_tests_install_requires.patch 2014-04-26 09:28:47 UTC (rev 10797)
@@ -1,22 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -38,15 +38,17 @@
- 'lxml', # needed to play with XML trees
- 'netaddr>=0.7.5', # to play safely with IPv6 prefixes
- 'netifaces', # to fetch information about network devices
-- 'pyflakes', # For testing purposes
- 'setuptools', # namespaces
- 'supervisor', # slapgrid uses supervisor to manage processes
-- 'unittest2',
- 'xml_marshaller>=0.9.3', # to unmarshall/marshall python objects to/from
- # XML
- 'zope.interface', # slap library implementes interfaces
- 'zc.buildout',
- ] + additional_install_requires,
-+ tests_require=[
-+ 'unittest2',
-+ 'pyflakes',
-+ ],
- zip_safe=False, # proxy depends on Flask, which has issues with
- # accessing templates
- entry_points={
Modified: packages/slapos.core/trunk/debian/patches/series
===================================================================
--- packages/slapos.core/trunk/debian/patches/series 2014-04-20 20:26:02 UTC (rev 10796)
+++ packages/slapos.core/trunk/debian/patches/series 2014-04-26 09:28:47 UTC (rev 10797)
@@ -1,4 +1,2 @@
system_configuration_file_by_default.patch
-fix_register_configuration_replace.patch
-fix_setup_depends.patch
slapos_command_split_up.patch
Modified: packages/slapos.core/trunk/debian/slapos-node-unofficial.install
===================================================================
--- packages/slapos.core/trunk/debian/slapos-node-unofficial.install 2014-04-20 20:26:02 UTC (rev 10796)
+++ packages/slapos.core/trunk/debian/slapos-node-unofficial.install 2014-04-26 09:28:47 UTC (rev 10797)
@@ -11,6 +11,7 @@
usr/lib/python2.*/dist-packages/slapos/cli/proxy_start.py
usr/lib/python2.*/dist-packages/slapos/cli/cache.py
usr/lib/python2.*/dist-packages/slapos/cli/register.py
+usr/lib/python2.*/dist-packages/slapos/cli/boot.py
usr/lib/python2.*/dist-packages/slapos/util.py
usr/lib/python2.*/dist-packages/slapos/tests/cli.py
usr/lib/python2.*/dist-packages/slapos/tests/slapproxy.py
More information about the Python-apps-commits
mailing list