[tryton-debian-vcs] tryton-modules-stock-supply-forecast branch debian updated. debian/3.0.0-3-4-gccc757f

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Tue Apr 22 13:11:32 UTC 2014


The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock-supply-forecast.git;a=commitdiff;h=debian/3.0.0-3-4-gccc757f

commit ccc757f410eea26c507db4438a43aed351287a12
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Apr 22 15:00:29 2014 +0200

    Bumping minimal required Python version to 2.7.

diff --git a/debian/control b/debian/control
index 7fea65a..2a99efd 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.9.5
 Homepage: http://www.tryton.org/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=tryton/tryton-modules-stock-supply-forecast.git
 Vcs-Git: git://anonscm.debian.org/tryton/tryton-modules-stock-supply-forecast.git
-X-Python-Version: >= 2.6
+X-Python-Version: >= 2.7
 
 Package: tryton-modules-stock-supply-forecast
 Architecture: all
commit d45f4af79cb551034f4f0c86e3f3e5f9c2bc6ed0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Apr 22 14:47:04 2014 +0200

    Updating copyright.

diff --git a/debian/copyright b/debian/copyright
index b9721e9..9bec2ff 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
-Copyright: 2011-2013 Cédric Krier
-           2011-2013 B2CK SPRL
+Copyright: 2011-2014 Cédric Krier
+           2011-2014 B2CK SPRL
 License: GPL-3+
 
 Files: debian/*
commit 82c37ce0e9853d4470be1fea827d053c9f195835
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Apr 22 14:24:01 2014 +0200

    Merging upstream version 3.2.0.

diff --git a/CHANGELOG b/CHANGELOG
index cb1b42f..f1b031e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.0 - 2014-04-21
+* Bug fixes (see mercurial logs for details)
+
 Version 3.0.0 - 2013-10-21
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index cd6950c..7bcdb7f 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2011-2013 Cédric Krier.
-Copyright (C) 2011-2013 B2CK SPRL.
+Copyright (C) 2011-2014 Cédric Krier.
+Copyright (C) 2011-2014 B2CK SPRL.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/INSTALL b/INSTALL
index 8241ee5..db9d51c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_stock_supply_forecast
 Prerequisites
 -------------
 
- * Python 2.6 or later (http://www.python.org/)
+ * Python 2.7 or later (http://www.python.org/)
  * trytond (http://www.tryton.org/)
  * trytond_stock_supply (http://www.tryton.org/)
  * trytond_stock_forecast (http://www.tryton.org/)
diff --git a/MANIFEST.in b/MANIFEST.in
index 97a9596..ddeb1b3 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,11 +1,7 @@
 include INSTALL
 include README
-include TODO
 include COPYRIGHT
 include CHANGELOG
 include LICENSE
 include tryton.cfg
 include *.xml
-include *.odt
-include locale/*.po
-include doc/*
diff --git a/PKG-INFO b/PKG-INFO
index 904d0e7..4ffd720 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond_stock_supply_forecast
-Version: 3.0.0
+Version: 3.2.0
 Summary: Tryton module to add forecast to supply computation
 Home-page: http://www.tryton.org/
 Author: Tryton
-Author-email: UNKNOWN
+Author-email: issue_tracker at tryton.org
 License: GPL-3
-Download-URL: http://downloads.tryton.org/3.0/
+Download-URL: http://downloads.tryton.org/3.2/
 Description: trytond_stock_supply_forecast
         =============================
         
@@ -43,6 +43,7 @@ Description: trytond_stock_supply_forecast
         
           http://www.tryton.org/
         
+Keywords: tryton stock supply forecast
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Plugins
@@ -63,6 +64,5 @@ Classifier: Natural Language :: Russian
 Classifier: Natural Language :: Slovenian
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.6
 Classifier: Programming Language :: Python :: 2.7
 Classifier: Topic :: Office/Business
diff --git a/setup.py b/setup.py
index a826a4e..fa5794e 100644
--- a/setup.py
+++ b/setup.py
@@ -11,33 +11,51 @@ import ConfigParser
 def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
 
+
+def get_require_version(name):
+    if minor_version % 2:
+        require = '%s >= %s.%s.dev0, < %s.%s'
+    else:
+        require = '%s >= %s.%s, < %s.%s'
+    require %= (name, major_version, minor_version,
+        major_version, minor_version + 1)
+    return require
+
 config = ConfigParser.ConfigParser()
 config.readfp(open('tryton.cfg'))
 info = dict(config.items('tryton'))
 for key in ('depends', 'extras_depend', 'xml'):
     if key in info:
         info[key] = info[key].strip().splitlines()
-major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
+version = info.get('version', '0.0.1')
+major_version, minor_version, _ = version.split('.', 2)
 major_version = int(major_version)
 minor_version = int(minor_version)
+name = 'trytond_stock_supply_forecast'
+
+download_url = 'http://downloads.tryton.org/%s.%s/' % (
+    major_version, minor_version)
+if minor_version % 2:
+    version = '%s.%s.dev0' % (major_version, minor_version)
+    download_url = (
+        'hg+http://hg.tryton.org/modules/%s#egg=%s-%s' % (
+            name[8:], name, version))
 
 requires = []
 for dep in info.get('depends', []):
     if not re.match(r'(ir|res|webdav)(\W|$)', dep):
-        requires.append('trytond_%s >= %s.%s, < %s.%s' %
-            (dep, major_version, minor_version, major_version,
-                minor_version + 1))
-requires.append('trytond >= %s.%s, < %s.%s' %
-    (major_version, minor_version, major_version, minor_version + 1))
+        requires.append(get_require_version('trytond_%s' % dep))
+requires.append(get_require_version('trytond'))
 
-setup(name='trytond_stock_supply_forecast',
-    version=info.get('version', '0.0.1'),
+setup(name=name,
+    version=version,
     description='Tryton module to add forecast to supply computation',
     long_description=read('README'),
     author='Tryton',
+    author_email='issue_tracker at tryton.org',
     url='http://www.tryton.org/',
-    download_url=("http://downloads.tryton.org/" +
-        info.get('version', '0.0.1').rsplit('.', 1)[0] + '/'),
+    download_url=download_url,
+    keywords='tryton stock supply forecast',
     package_dir={'trytond.modules.stock_supply_forecast': '.'},
     packages=[
         'trytond.modules.stock_supply_forecast',
@@ -66,7 +84,6 @@ setup(name='trytond_stock_supply_forecast',
         'Natural Language :: Slovenian',
         'Natural Language :: Spanish',
         'Operating System :: OS Independent',
-        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Topic :: Office/Business',
         ],
diff --git a/tryton.cfg b/tryton.cfg
index b65bac8..ce53c23 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.0.0
+version=3.2.0
 depends:
     ir
     stock_supply
diff --git a/trytond_stock_supply_forecast.egg-info/PKG-INFO b/trytond_stock_supply_forecast.egg-info/PKG-INFO
index bc1c591..4b5091b 100644
--- a/trytond_stock_supply_forecast.egg-info/PKG-INFO
+++ b/trytond_stock_supply_forecast.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond-stock-supply-forecast
-Version: 3.0.0
+Version: 3.2.0
 Summary: Tryton module to add forecast to supply computation
 Home-page: http://www.tryton.org/
 Author: Tryton
-Author-email: UNKNOWN
+Author-email: issue_tracker at tryton.org
 License: GPL-3
-Download-URL: http://downloads.tryton.org/3.0/
+Download-URL: http://downloads.tryton.org/3.2/
 Description: trytond_stock_supply_forecast
         =============================
         
@@ -43,6 +43,7 @@ Description: trytond_stock_supply_forecast
         
           http://www.tryton.org/
         
+Keywords: tryton stock supply forecast
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Plugins
@@ -63,6 +64,5 @@ Classifier: Natural Language :: Russian
 Classifier: Natural Language :: Slovenian
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.6
 Classifier: Programming Language :: Python :: 2.7
 Classifier: Topic :: Office/Business
diff --git a/trytond_stock_supply_forecast.egg-info/requires.txt b/trytond_stock_supply_forecast.egg-info/requires.txt
index eb37004..df80d5d 100644
--- a/trytond_stock_supply_forecast.egg-info/requires.txt
+++ b/trytond_stock_supply_forecast.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_stock_supply >= 3.0, < 3.1
-trytond_stock_forecast >= 3.0, < 3.1
-trytond >= 3.0, < 3.1
\ No newline at end of file
+trytond_stock_supply >= 3.2, < 3.3
+trytond_stock_forecast >= 3.2, < 3.3
+trytond >= 3.2, < 3.3
\ No newline at end of file
-- 
tryton-modules-stock-supply-forecast



More information about the tryton-debian-vcs mailing list