From a1f2f7c70dab438a204276021f28a80e09d0d16c Mon Sep 17 00:00:00 2001
From: inso <insomniak.fr@gmaiL.com>
Date: Fri, 22 Jun 2018 18:51:32 +0200
Subject: [PATCH] Squashed commit of the following:
commit 9853124b068c4c89ceb0145c38009dcc2a77e1d6
Author: inso <insomniak.fr@gmaiL.com>
Date: Fri Jun 1 18:51:45 2018 +0200
0.33.0rc5
commit 8a1168348f0d3206fa9d13454e31769136721690
Author: inso <insomniak.fr@gmaiL.com>
Date: Fri Jun 1 18:51:26 2018 +0200
0.330
commit 04f2eeba832948830786ef00affb787ef2dc8a4e
Author: inso <insomniak.fr@gmaiL.com>
Date: Fri Jun 1 18:48:27 2018 +0200
Fix decode
commit ad103e75b12791d602a97d8decd8a416efa69b9d
Author: inso <insomniak.fr@gmaiL.com>
Date: Fri Jun 1 18:18:28 2018 +0200
Fix gitlab
commit 01edbd03bfd0473e4328c4d385ee9c485ad92a3a
Author: inso <insomniak.fr@gmaiL.com>
Date: Thu May 24 14:11:10 2018 +0200
Fix setup.py
---
.gitlab-ci.yml | 2 ++
ci/appveyor/sakia.iss | 2 +-
ci/travis/debian/DEBIAN/control | 2 +-
res/linux/usr/share/applications/sakia.desktop | 2 +-
setup.py | 4 ++++
src/sakia/__init__.py | 2 +-
6 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1482ffb1..b5ef70a5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,5 +58,7 @@ releases:
- pip install -r requirements.txt
- pip install wheel
- pip install twine
+ - python gen_resources.py
+ - python gen_translations.py --lrelease
- python setup.py bdist_wheel
- twine upload dist/* --username duniter --password $PYPI_PASSWORD
diff --git a/ci/appveyor/sakia.iss b/ci/appveyor/sakia.iss
index 305a1a35..669add27 100644
--- a/ci/appveyor/sakia.iss
+++ b/ci/appveyor/sakia.iss
@@ -15,7 +15,7 @@
#error "Unable to find MyAppExe"
#endif
-#define MyAppVerStr "0.33.0rc4"
+#define MyAppVerStr "0.33.0rc5"
[Setup]
AppName={#MyAppName}
diff --git a/ci/travis/debian/DEBIAN/control b/ci/travis/debian/DEBIAN/control
index f26aee6e..c32cfe1d 100644
--- a/ci/travis/debian/DEBIAN/control
+++ b/ci/travis/debian/DEBIAN/control
@@ -1,5 +1,5 @@
Package: sakia
-Version: 0.33.0rc4
+Version: 0.33.0rc5
Section: misc
Priority: optional
Architecture: all
diff --git a/res/linux/usr/share/applications/sakia.desktop b/res/linux/usr/share/applications/sakia.desktop
index e6ea4125..40eded3b 100644
--- a/res/linux/usr/share/applications/sakia.desktop
+++ b/res/linux/usr/share/applications/sakia.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Version=0.33.0rc4
+Version=0.33.0rc5
Name=Sakia
Comment=Duniter Qt Client
Exec=sakia
diff --git a/setup.py b/setup.py
index fbc2b7c2..b98e1e67 100644
--- a/setup.py
+++ b/setup.py
@@ -26,6 +26,10 @@ def which(program):
return None
+
+
+path = os.path.abspath(os.path.join(os.path.dirname(__file__)))
+
EDITABLE_REQUIREMENT = re.compile(r'^-e (?P<link>(?P<vcs>git|svn|hg|bzr).+#egg=(?P<package>.+)-(?P<version>\d(?:\.\d)*))$')
install_requires = []
diff --git a/src/sakia/__init__.py b/src/sakia/__init__.py
index e5a12adc..6a5e1aa2 100644
--- a/src/sakia/__init__.py
+++ b/src/sakia/__init__.py
@@ -1,2 +1,2 @@
-__version_info__ = ('0', '33', '0rc4')
+__version_info__ = ('0', '330', '')
__version__ = '.'.join(__version_info__)
--
GitLab