From 9537a5ed873f44f723530f436ee4faf325fe0aef Mon Sep 17 00:00:00 2001 From: Kurtis Heimerl Date: Fri, 9 Jun 2017 13:02:39 -0700 Subject: [PATCH 1/3] first round of changes --- client/commands/python_packaging.py | 2 +- client/deploy/openbts.dev.yml | 6 ++++-- client/packaging/build-endaga.sh | 2 +- client/setup.py | 1 - 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/client/commands/python_packaging.py b/client/commands/python_packaging.py index e0018174..d79d8bbe 100644 --- a/client/commands/python_packaging.py +++ b/client/commands/python_packaging.py @@ -90,7 +90,7 @@ def package_python_openbts(package_requirements='no'): if package_requirements == 'yes': package_install_requirements(path) with cd(path): - run('fpm -s python -t %s setup.py' % env.pkgfmt) + _run_fpm_python('setup.py') run('mv *.%s ~/endaga-packages' % env.pkgfmt) def package_python_osmocom(package_requirements='no'): diff --git a/client/deploy/openbts.dev.yml b/client/deploy/openbts.dev.yml index 7c5f32d1..1fc672ff 100644 --- a/client/deploy/openbts.dev.yml +++ b/client/deploy/openbts.dev.yml @@ -64,8 +64,10 @@ - name: Setup build requirements for python packages apt: pkg={{ item }} state=present update_cache=no with_items: - - python-pip - - python-pybabel + - python3-pip + - python3-babel + - python3-dev + - python3-setuptools - name: Setup requirements for building FS from source (needed to generate working python modules) apt: pkg={{ item }} state=present update_cache=no diff --git a/client/packaging/build-endaga.sh b/client/packaging/build-endaga.sh index 30f5f318..80b2e124 100755 --- a/client/packaging/build-endaga.sh +++ b/client/packaging/build-endaga.sh @@ -68,7 +68,7 @@ if [[ $GSM =~ openbts ]]; then '--depends' 'openbts-public (= 5.0.8)' '--depends' 'sipauthserve-public (= 5.0.1)' '--depends' 'smqueue-public (= 5.0.4)' - '--depends' 'python-openbts (= 0.1.15)' + '--depends' 'python3-openbts (= 0.1.15)' '--depends' 'liba53 (= 0.1)' '--depends' 'freeswitch-meta-vanilla (= 1.4.15~1-1~wheezy+1)' '--depends' 'freeswitch-mod-python (= 1.4.15~1-1~wheezy+1)' diff --git a/client/setup.py b/client/setup.py index 22fd98a9..b714c487 100644 --- a/client/setup.py +++ b/client/setup.py @@ -67,7 +67,6 @@ "python-dateutil==2.4.2", "pytz==2015.7", "snowflake>=0.0.3", - "supervisor>=0.4.0", "pexpect>=4.2.1", "ptyprocess>=0.5.1", ], From 5d99a3be76be8d5cbdcff83b3b5b2865c575c729 Mon Sep 17 00:00:00 2001 From: Kurtis Heimerl Date: Fri, 9 Jun 2017 14:08:47 -0700 Subject: [PATCH 2/3] Fixes the pip issue found in osmocom --- client/deploy/openbts.dev.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/client/deploy/openbts.dev.yml b/client/deploy/openbts.dev.yml index 1fc672ff..f76a1238 100644 --- a/client/deploy/openbts.dev.yml +++ b/client/deploy/openbts.dev.yml @@ -64,11 +64,19 @@ - name: Setup build requirements for python packages apt: pkg={{ item }} state=present update_cache=no with_items: - - python3-pip - python3-babel - python3-dev - python3-setuptools + - name: Get pip3 installer (not from debian repositories, uses ancient version) + get_url: + url: https://bootstrap.pypa.io/get-pip.py + dest: /tmp/get-pip.py + + - name: Install pip + command: python3 /tmp/get-pip.py + + - name: Setup requirements for building FS from source (needed to generate working python modules) apt: pkg={{ item }} state=present update_cache=no with_items: From b4b44b3628612935c51ec1875525112713cf33ea Mon Sep 17 00:00:00 2001 From: Kurtis Heimerl Date: Fri, 9 Jun 2017 14:13:48 -0700 Subject: [PATCH 3/3] reverts change to supervisor dependency --- client/setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/client/setup.py b/client/setup.py index b714c487..22fd98a9 100644 --- a/client/setup.py +++ b/client/setup.py @@ -67,6 +67,7 @@ "python-dateutil==2.4.2", "pytz==2015.7", "snowflake>=0.0.3", + "supervisor>=0.4.0", "pexpect>=4.2.1", "ptyprocess>=0.5.1", ],