From a59f729cf41ecb4f4542f94d74f701c9e4db4728 Mon Sep 17 00:00:00 2001 From: Amar Menezes Date: Thu, 9 Nov 2017 11:42:22 +0000 Subject: [PATCH 1/2] Uses git tags for version info --- setup.py | 10 +++++++++- src/drozer/meta.py | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 3f771f10..37dc381c 100644 --- a/setup.py +++ b/setup.py @@ -117,9 +117,17 @@ def get_package_data(): data[""].append(os.path.join(root, filename)[11:]) return data +def get_version(): + version_cmd = ['git', 'describe', '--tags', '|' ,'cut', '-c', '1-5'] + + if platform == "linux2" or platform == "linux": + return subprocess.check_output(' '.join(version_cmd),shell=True) + elif platform == "win32": + return subprocess.check_output(version_cmd,shell=True) + setuptools.setup( name = meta.name, - version = str(meta.version), + version = get_version(), author = meta.vendor, author_email = meta.contact, description = meta.description, diff --git a/src/drozer/meta.py b/src/drozer/meta.py index 67159f17..6cb4b04c 100644 --- a/src/drozer/meta.py +++ b/src/drozer/meta.py @@ -30,7 +30,7 @@ def __str__(self): name = "drozer" vendor = "MWR InfoSecurity" -version = Version("2.4.3", "2017-03-09") +version = Version("2.4.4", "2017-11-09") contact = "drozer@mwrinfosecurity.com" description = "The Leading Android Security Testing Framework" From 1c2806fc07d6e261d6dfda0893fbdb2904de8119 Mon Sep 17 00:00:00 2001 From: Amar Menezes Date: Thu, 9 Nov 2017 12:03:55 +0000 Subject: [PATCH 2/2] Update appveyor environment --- .appveyor.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index c0b84070..dd365b8f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,8 +1,6 @@ environment: matrix: - - PYTHON: "C:\\Python27" - JAVA_HOME: "C:\\Program Files (x86)\\Java\\jdk1.7.0" - PYTHON: "C:\\Python27-x64" JAVA_HOME: "C:\\Program Files\\Java\\jdk1.7.0"