From 7215709180118c549b3ffebd4f72a32e059cdc82 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 11 Oct 2018 11:33:15 +0100 Subject: [PATCH] Use pip requirements instead of configure Signed-off-by: Michael Tremer --- configure.ac | 11 --------- m4/ax_python_module.m4 | 56 ------------------------------------------ requirements.txt | 19 ++++++++++++++ 3 files changed, 19 insertions(+), 67 deletions(-) delete mode 100644 m4/ax_python_module.m4 create mode 100644 requirements.txt diff --git a/configure.ac b/configure.ac index e6ba57e7..937a5823 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,6 @@ AC_INIT([ipfire.org], [ipfire.org], [https://www.ipfire.org/]) -AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) AC_PREFIX_DEFAULT([/usr]) @@ -29,16 +28,6 @@ AC_PROG_SED # Python AM_PATH_PYTHON([3.4]) -# Python modules -AX_PYTHON_MODULE([hwdata],[]) -AX_PYTHON_MODULE([iso3166],[]) -AX_PYTHON_MODULE([ldap],[]) -AX_PYTHON_MODULE([markdown2],[]) -AX_PYTHON_MODULE([memcached],[]) -AX_PYTHON_MODULE([psycopg2],[]) -AX_PYTHON_MODULE([textile],[]) -AX_PYTHON_MODULE([tornado],[]) - # scss AC_CHECK_PROG(SASSC, [sassc], [sassc]) diff --git a/m4/ax_python_module.m4 b/m4/ax_python_module.m4 deleted file mode 100644 index f0f873d1..00000000 --- a/m4/ax_python_module.m4 +++ /dev/null @@ -1,56 +0,0 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_python_module.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_PYTHON_MODULE(modname[, fatal, python]) -# -# DESCRIPTION -# -# Checks for Python module. -# -# If fatal is non-empty then absence of a module will trigger an error. -# The third parameter can either be "python" for Python 2 or "python3" for -# Python 3; defaults to Python 3. -# -# LICENSE -# -# Copyright (c) 2008 Andrew Collier -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 9 - -AU_ALIAS([AC_PYTHON_MODULE], [AX_PYTHON_MODULE]) -AC_DEFUN([AX_PYTHON_MODULE],[ - if test -z $PYTHON; - then - if test -z "$3"; - then - PYTHON="python3" - else - PYTHON="$3" - fi - fi - PYTHON_NAME=`basename $PYTHON` - AC_MSG_CHECKING($PYTHON_NAME module: $1) - $PYTHON -c "import $1" 2>/dev/null - if test $? -eq 0; - then - AC_MSG_RESULT(yes) - eval AS_TR_CPP(HAVE_PYMOD_$1)=yes - else - AC_MSG_RESULT(no) - eval AS_TR_CPP(HAVE_PYMOD_$1)=no - # - if test -n "$2" - then - AC_MSG_ERROR(failed to find required module $1) - exit 1 - fi - fi -]) diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000..f70ac158 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,19 @@ +backports-abc==0.5 +feedparser==5.2.1 +file-magic==0.4.0 +html5lib==1.0.1 +iso3166==0.9 +ldap==1.0.2 +ldap3==2.5.1 +markdown2==2.3.6 +pciutils==2.3.7 +Pillow==5.3.0 +psycopg2-binary==2.7.5 +py-dateutil==2.2 +pyasn1==0.4.4 +pycurl==7.43.0 +python3-memcached==1.51 +six==1.11.0 +textile==3.0.3 +tornado==4.4.2 +webencodings==0.5.1 -- 2.39.2