Skip to content
Snippets Groups Projects
Verified Commit d340cab8 authored by Michal Hrusecky's avatar Michal Hrusecky :mouse:
Browse files

Improve some aspects of python packaging

parent 17968401
Branches
Tags
No related merge requests found
From 390b6b1c3ad18833743320f1c8fd04b0246b4759 Mon Sep 17 00:00:00 2001
From: Michal Hrusecky <michal.hrusecky@nic.cz>
Date: Wed, 21 Nov 2018 15:25:57 +0100
Subject: [PATCH] python3: Drop pytest from requirements
We don't plan to run them anyway, so let's keep this dependency out.
Signed-off-by: Michal Hrusecky <michal.hrusecky@nic.cz>
---
lang/python/python3-package.mk | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/lang/python/python3-package.mk b/lang/python/python3-package.mk
index 7f47370..0986537 100644
--- a/lang/python/python3-package.mk
+++ b/lang/python/python3-package.mk
@@ -141,8 +141,12 @@ endef
Py3Build/Compile=$(Py3Build/Compile/Default)
+define python3_drop_pytest_requirements
+ $(SED) -i '/^pytest/ d' $(PKG_BUILD_DIR)/requirements.txt
+endef
Hooks/Compile/Post += python3_fix_interpreter_paths
+Hooks/Compile/Pre += python3_drop_pytest_requirements
ifeq ($(BUILD_VARIANT),python3)
define Build/Compile
--
2.19.1
From 80daee8c1a4573e5045934a14f7f2d77e7d99f19 Mon Sep 17 00:00:00 2001
From: Michal Hrusecky <michal.hrusecky@nic.cz>
Date: Wed, 21 Nov 2018 15:27:34 +0100
Subject: [PATCH] python3: Make python version part of release number
We need to distinguish between packages targeting different python version.
Signed-off-by: Michal Hrusecky <michal.hrusecky@nic.cz>
---
lang/python/python3-package.mk | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lang/python/python3-package.mk b/lang/python/python3-package.mk
index 0986537..f573367 100644
--- a/lang/python/python3-package.mk
+++ b/lang/python/python3-package.mk
@@ -20,6 +20,8 @@ PYTHON3:=python$(PYTHON3_VERSION)
PYTHON3PATH:=$(PYTHON3_LIB_DIR):$(STAGING_DIR)/$(PYTHON3_PKG_DIR):$(PKG_INSTALL_DIR)/$(PYTHON3_PKG_DIR)
+PKG_RELEASE:=$(PYTHON3_VERSION)-$(PKG_RELEASE)
+
# These configure args are needed in detection of path to Python header files
# using autotools.
CONFIGURE_ARGS += \
--
2.19.1
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment