* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/, net-analyzer/graphite-web/files/
@ 2018-06-12 10:35 Fabian Groffen
0 siblings, 0 replies; 5+ messages in thread
From: Fabian Groffen @ 2018-06-12 10:35 UTC (permalink / raw
To: gentoo-commits
commit: 048bbf243d0ac6536b57a14fadcba5770383b681
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 12 09:52:09 2018 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jun 12 10:35:24 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=048bbf24
net-analyzer/graphite-web: version bump to 1.1.3
Package-Manager: Portage-2.3.40, Repoman-2.3.9
net-analyzer/graphite-web/Manifest | 1 +
.../files/graphite-web-1.1.3-fhs-paths.patch | 53 +++++++++
.../graphite-web/graphite-web-1.1.3.ebuild | 120 +++++++++++++++++++++
3 files changed, 174 insertions(+)
diff --git a/net-analyzer/graphite-web/Manifest b/net-analyzer/graphite-web/Manifest
index 56d125f06cf..b794186eb09 100644
--- a/net-analyzer/graphite-web/Manifest
+++ b/net-analyzer/graphite-web/Manifest
@@ -1,2 +1,3 @@
DIST graphite-web-0.9.13-share.png 325 BLAKE2B 390d5de23ae8300ca042e9c259fb7f892a4fd69ee8225d171b1f32b4215188fdd7a5c4f8e65fb3eae64cf154044ddb03c4490a8318ef8dc5934f3d5c04aeb6bb SHA512 19dc9139e97a99bf06fded2958bc52bc856fa11d0dc50f57e6c54214373795534cb74883ab5da7a05e2ddb69a2870d3b02dcf2ab0628bdf289f1ffd925e044e2
DIST graphite-web-0.9.13.tar.gz 2182781 BLAKE2B c4db10fbdfd45efb683862967e743de5d96a6342ade85548c43f3072fbc7f15d32a606979800e1c46ce8c81611121fa91ed873d57a184c92cc3167a7c5ac531e SHA512 5e2cc84ec57e1fa0ecff8c9671d8753655a8ce2c07ce2f446451ceaad7679b0cefe932de45315be360b8f13eb25cd25ef179814f340c2c42b0e7048a3d4f4a96
+DIST graphite-web-1.1.3.tar.gz 1171342 BLAKE2B f18c84d707f93d897553ec05d7b910a3dba97c6068498d1b216f178ea8a1f64baf59bb572b433a56f5e417a2873c018a38a19c3b8c765f667d7c3fbb38b9ed0a SHA512 3f9de216bd55e4e8de7391087e9b876a16e4f137fd60932a6d5855804c3d9868422645177776258e74486b97ec7a853b63a6d89b1de9b325bcb50ad694208436
diff --git a/net-analyzer/graphite-web/files/graphite-web-1.1.3-fhs-paths.patch b/net-analyzer/graphite-web/files/graphite-web-1.1.3-fhs-paths.patch
new file mode 100644
index 00000000000..39d32598424
--- /dev/null
+++ b/net-analyzer/graphite-web/files/graphite-web-1.1.3-fhs-paths.patch
@@ -0,0 +1,53 @@
+Install FHS-style paths
+
+--- a/conf/graphite.wsgi.example
++++ b/conf/graphite.wsgi.example
+@@ -1,4 +1,4 @@
+ import sys
+-sys.path.append('/opt/graphite/webapp')
++sys.path.append('@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web/webapp')
+
+ from graphite.wsgi import application
+--- a/setup.py
++++ b/setup.py
+@@ -59,8 +59,7 @@
+ ],
+ package_data={'graphite' :
+ ['templates/*', 'local_settings.py.example']},
+- scripts=glob('bin/*'),
+- data_files=list(webapp_content.items()) + storage_dirs + conf_files + examples,
++ data_files=list(webapp_content.items()),
+ install_requires=['Django>=1.8,<1.11.99', 'django-tagging==0.4.3', 'pytz', 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'],
+ classifiers=[
+ 'Intended Audience :: Developers',
+--- a/webapp/graphite/local_settings.py.example
++++ b/webapp/graphite/local_settings.py.example
+@@ -101,6 +101,7 @@
+ # Change only GRAPHITE_ROOT if your install is merely shifted from /opt/graphite
+ # to somewhere else
+ #GRAPHITE_ROOT = '/opt/graphite'
++GRAPHITE_ROOT = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web'
+
+ # Most installs done outside of a separate tree such as /opt/graphite will
+ # need to change these settings. Note that the default settings for each
+@@ -110,6 +111,11 @@
+ #STATIC_ROOT = '/opt/graphite/static'
+ #LOG_DIR = '/opt/graphite/storage/log/webapp'
+ #INDEX_FILE = '/opt/graphite/storage/index' # Search index file
++CONF_DIR = '@GENTOO_PORTAGE_EPREFIX@/etc/graphite-web'
++STORAGE_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon'
++STATIC_ROOT = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web'
++LOG_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/log/graphite-web'
++INDEX_FILE = '@GENTOO_PORTAGE_EPREFIX@/var/lib/graphite-web/index' # Search index file
+
+ # To further or fully customize the paths, modify the following. Note that the
+ # default settings for each of these are relative to CONF_DIR and STORAGE_DIR
+@@ -127,6 +133,8 @@
+ #CERES_DIR = '/opt/graphite/storage/ceres'
+ #WHISPER_DIR = '/opt/graphite/storage/whisper'
+ #RRD_DIR = '/opt/graphite/storage/rrd'
++WHISPER_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/whisper'
++RRD_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/rrd'
+ #
+ # Data directories using the "Standard" metrics finder (i.e. not Ceres)
+ #STANDARD_DIRS = [WHISPER_DIR, RRD_DIR] # Default: set from the above variables
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.3.ebuild b/net-analyzer/graphite-web/graphite-web-1.1.3.ebuild
new file mode 100644
index 00000000000..7ca11c643e1
--- /dev/null
+++ b/net-analyzer/graphite-web/graphite-web-1.1.3.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1 python-utils-r1 prefix
+
+DESCRIPTION="Enterprise scalable realtime graphing"
+HOMEPAGE="http://graphite.readthedocs.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+carbon mysql memcached postgres +sqlite"
+#ldap - needs bump of python-ldap to latest
+# ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+
+DEPEND=""
+RDEPEND="
+ carbon? ( dev-python/carbon[${PYTHON_USEDEP}] )
+ mysql? (
+ || (
+ dev-python/mysql-python[${PYTHON_USEDEP}]
+ dev-python/mysqlclient[${PYTHON_USEDEP}]
+ )
+ )
+ memcached? ( dev-python/python-memcached[${PYTHON_USEDEP}] )
+ postgres? (
+ dev-python/psycopg:2[${PYTHON_USEDEP}]
+ )
+ dev-lang/python[sqlite?]
+ dev-python/cairocffi[${PYTHON_USEDEP}]
+ >=dev-python/django-1.8[sqlite?,${PYTHON_USEDEP}]
+ <dev-python/django-1.11.99[sqlite?,${PYTHON_USEDEP}]
+ >=dev-python/django-tagging-0.4.3[${PYTHON_USEDEP}]
+ dev-python/pyparsing[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/scandir[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/txAMQP[${PYTHON_USEDEP}]
+ dev-python/twisted[${PYTHON_USEDEP}]
+ dev-python/urllib3[${PYTHON_USEDEP}]
+ dev-python/zope-interface[${PYTHON_USEDEP}]
+ dev-python/whisper[${PYTHON_USEDEP}]
+ media-libs/fontconfig"
+
+PATCHES=(
+ # Do not install the configuration and data files. We install them
+ # somewhere sensible by hand.
+ "${FILESDIR}"/${PN}-1.1.3-fhs-paths.patch
+)
+
+src_prepare() {
+ # use FHS-style paths
+ export GRAPHITE_NO_PREFIX=yes
+ # make sure we don't use bundled stuff
+ rm -Rf webapp/graphite/thirdparty
+ distutils-r1_src_prepare
+ eprefixify \
+ conf/graphite.wsgi.example \
+ webapp/graphite/local_settings.py.example
+}
+
+python_install() {
+ distutils-r1_python_install \
+ --install-data="${EPREFIX}"/usr/share/${PN}
+
+ # make manage.py available from an easier location/name
+ # (missing from tarball)
+ dodir /usr/bin
+ cat > "${ED}"/usr/bin/${PN}-manage <<- EOS
+ #!/usr/bin/env python
+ import os
+ import sys
+
+
+ if __name__ == "__main__":
+ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "graphite.settings")
+
+ from django.core.management import execute_from_command_line
+
+ execute_from_command_line(sys.argv)
+ EOS
+ #mv "${D}"/$(python_get_sitedir)/graphite/manage.py \
+ # "${ED}"/usr/bin/${PN}-manage || die
+ chmod 0755 "${ED}"/usr/bin/${PN}-manage || die
+ python_fix_shebang "${ED}"/usr/bin/${PN}-manage
+
+ insinto /etc/${PN}
+ newins webapp/graphite/local_settings.py.example local_settings.py
+ pushd "${D}"/$(python_get_sitedir)/graphite > /dev/null || die
+ ln -s ../../../../../etc/${PN}/local_settings.py local_settings.py
+ popd > /dev/null || die
+
+ insinto /usr/share/doc/${PF}/examples
+ doins \
+ examples/example-graphite-vhost.conf \
+ conf/dashboard.conf.example \
+ conf/graphite.wsgi.example
+}
+
+pkg_config() {
+ "${ROOT}"/usr/bin/${PN}-manage syncdb --noinput
+ local idx=$(grep 'INDEX_FILE =' "${EROOT}"/etc/graphite-web/local_settings.py 2>/dev/null)
+ if [[ -n ${idx} ]] ; then
+ idx=${idx##*=}
+ idx=$(echo ${idx})
+ eval "idx=${idx}"
+ touch "${ROOT}"/"${idx}"/index
+ fi
+}
+
+pkg_postinst() {
+ einfo "You need to configure ${PN} to run with a WSGI server of your choice."
+ einfo "Don't forget to edit local_settings.py in ${EPREFIX}/etc/${PN}"
+ einfo "See http://graphite.readthedocs.org/en/latest/config-local-settings.html"
+ einfo "Run emerge --config =${PN}-${PVR} if this is a fresh install."
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/, net-analyzer/graphite-web/files/
@ 2018-07-22 17:10 Virgil Dupras
0 siblings, 0 replies; 5+ messages in thread
From: Virgil Dupras @ 2018-07-22 17:10 UTC (permalink / raw
To: gentoo-commits
commit: 4f40c918a652f6ecb28c94c06165f7c5d2914f98
Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 22 17:09:10 2018 +0000
Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
CommitDate: Sun Jul 22 17:10:14 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f40c918
net-analyzer/graphite-web: remove old
Package-Manager: Portage-2.3.43, Repoman-2.3.10
net-analyzer/graphite-web/Manifest | 2 -
.../files/graphite-web-0.9.13-fhs-paths.patch | 76 ---------------
.../files/graphite-web-0.9.13-system-libs.patch | 100 -------------------
.../graphite-web/graphite-web-0.9.13-r3.ebuild | 108 ---------------------
4 files changed, 286 deletions(-)
diff --git a/net-analyzer/graphite-web/Manifest b/net-analyzer/graphite-web/Manifest
index b794186eb09..15fe0c57bdd 100644
--- a/net-analyzer/graphite-web/Manifest
+++ b/net-analyzer/graphite-web/Manifest
@@ -1,3 +1 @@
-DIST graphite-web-0.9.13-share.png 325 BLAKE2B 390d5de23ae8300ca042e9c259fb7f892a4fd69ee8225d171b1f32b4215188fdd7a5c4f8e65fb3eae64cf154044ddb03c4490a8318ef8dc5934f3d5c04aeb6bb SHA512 19dc9139e97a99bf06fded2958bc52bc856fa11d0dc50f57e6c54214373795534cb74883ab5da7a05e2ddb69a2870d3b02dcf2ab0628bdf289f1ffd925e044e2
-DIST graphite-web-0.9.13.tar.gz 2182781 BLAKE2B c4db10fbdfd45efb683862967e743de5d96a6342ade85548c43f3072fbc7f15d32a606979800e1c46ce8c81611121fa91ed873d57a184c92cc3167a7c5ac531e SHA512 5e2cc84ec57e1fa0ecff8c9671d8753655a8ce2c07ce2f446451ceaad7679b0cefe932de45315be360b8f13eb25cd25ef179814f340c2c42b0e7048a3d4f4a96
DIST graphite-web-1.1.3.tar.gz 1171342 BLAKE2B f18c84d707f93d897553ec05d7b910a3dba97c6068498d1b216f178ea8a1f64baf59bb572b433a56f5e417a2873c018a38a19c3b8c765f667d7c3fbb38b9ed0a SHA512 3f9de216bd55e4e8de7391087e9b876a16e4f137fd60932a6d5855804c3d9868422645177776258e74486b97ec7a853b63a6d89b1de9b325bcb50ad694208436
diff --git a/net-analyzer/graphite-web/files/graphite-web-0.9.13-fhs-paths.patch b/net-analyzer/graphite-web/files/graphite-web-0.9.13-fhs-paths.patch
deleted file mode 100644
index ecfce96e053..00000000000
--- a/net-analyzer/graphite-web/files/graphite-web-0.9.13-fhs-paths.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Install FHS-style paths
-
---- graphite-web-0.9.13/conf/graphite.wsgi.example
-+++ graphite-web-0.9.13/conf/graphite.wsgi.example
-@@ -1,5 +1,5 @@
- import os, sys
--sys.path.append('/opt/graphite/webapp')
-+sys.path.append('@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web/webapp')
- os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'graphite.settings')
-
- import django
---- graphite-web-0.9.13/setup.py
-+++ graphite-web-0.9.13/setup.py
-@@ -59,7 +59,6 @@
- ],
- package_data={'graphite' :
- ['templates/*', 'local_settings.py.example']},
-- scripts=glob('bin/*'),
-- data_files=webapp_content.items() + storage_dirs + conf_files + examples,
-+ data_files=webapp_content.items(),
- **setup_kwargs
- )
---- graphite-web-0.9.13/webapp/graphite/local_settings.py.example
-+++ graphite-web-0.9.13/webapp/graphite/local_settings.py.example
-@@ -54,14 +54,14 @@
- #####################################
- # Change only GRAPHITE_ROOT if your install is merely shifted from /opt/graphite
- # to somewhere else
--#GRAPHITE_ROOT = '/opt/graphite'
-+GRAPHITE_ROOT = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web'
-
- # Most installs done outside of a separate tree such as /opt/graphite will only
- # need to change these three settings. Note that the default settings for each
- # of these is relative to GRAPHITE_ROOT
--#CONF_DIR = '/opt/graphite/conf'
--#STORAGE_DIR = '/opt/graphite/storage'
--#CONTENT_DIR = '/opt/graphite/webapp/content'
-+CONF_DIR = '@GENTOO_PORTAGE_EPREFIX@/etc/graphite-web'
-+STORAGE_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon'
-+CONTENT_DIR = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web/webapp/content'
-
- # To further or fully customize the paths, modify the following. Note that the
- # default settings for each of these are relative to CONF_DIR and STORAGE_DIR
-@@ -69,6 +69,8 @@
- ## Webapp config files
- #DASHBOARD_CONF = '/opt/graphite/conf/dashboard.conf'
- #GRAPHTEMPLATES_CONF = '/opt/graphite/conf/graphTemplates.conf'
-+DASHBOARD_CONF = '@GENTOO_PORTAGE_EPREFIX@/etc/graphite-web/dashboard.conf'
-+GRAPHTEMPLATES_CONF = '@GENTOO_PORTAGE_EPREFIX@/etc/graphite-web/graphTemplates.conf'
-
- ## Data directories
- # NOTE: If any directory is unreadable in DATA_DIRS it will break metric browsing
-@@ -77,7 +79,11 @@
- #DATA_DIRS = [WHISPER_DIR, RRD_DIR] # Default: set from the above variables
- #LOG_DIR = '/opt/graphite/storage/log/webapp'
- #INDEX_FILE = '/opt/graphite/storage/index' # Search index file
--
-+WHISPER_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/whisper'
-+RRD_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/rrd'
-+DATA_DIRS = [WHISPER_DIR, RRD_DIR] # Default: set from the above variables
-+LOG_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/log/graphite-web/'
-+INDEX_FILE = '@GENTOO_PORTAGE_EPREFIX@/var/lib/graphite-web/index' # Search index file
-
- #####################################
- # Email Configuration #
---- graphite-web-0.9.13/webapp/graphite/manage.py
-+++ graphite-web-0.9.13/webapp/graphite/manage.py
-@@ -6,7 +6,7 @@
-
-
- if __name__ == "__main__":
-- os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
-+ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "graphite.settings")
-
- from django.core.management import execute_from_command_line
-
diff --git a/net-analyzer/graphite-web/files/graphite-web-0.9.13-system-libs.patch b/net-analyzer/graphite-web/files/graphite-web-0.9.13-system-libs.patch
deleted file mode 100644
index be5bbb9ab76..00000000000
--- a/net-analyzer/graphite-web/files/graphite-web-0.9.13-system-libs.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 1ca73dd4ec442d6ada765e5375efee84bbc7522b Mon Sep 17 00:00:00 2001
-From: Jamie Nguyen <j@jamielinux.com>
-Date: Mon, 29 Sep 2014 09:53:22 +0100
-Subject: [PATCH] Force use of system libraries
-
----
- setup.py | 2 --
- webapp/graphite/cli/parser.py | 2 +-
- webapp/graphite/render/attime.py | 5 +----
- webapp/graphite/render/glyph.py | 5 +----
- webapp/graphite/render/grammar.py | 2 +-
- webapp/graphite/render/views.py | 5 +----
- 6 files changed, 5 insertions(+), 16 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 4dc0ce0..1b910d1 100644
---- a/setup.py
-+++ b/setup.py
-@@ -54,8 +54,6 @@ setup(
- 'graphite.graphlot',
- 'graphite.events',
- 'graphite.version',
-- 'graphite.thirdparty',
-- 'graphite.thirdparty.pytz',
- ],
- package_data={'graphite' :
- ['templates/*', 'local_settings.py.example']},
-diff --git a/webapp/graphite/cli/parser.py b/webapp/graphite/cli/parser.py
-index ec1a435..7d7d48d 100644
---- a/webapp/graphite/cli/parser.py
-+++ b/webapp/graphite/cli/parser.py
-@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License."""
-
--from graphite.thirdparty.pyparsing import *
-+from pyparsing import *
-
- grammar = Forward()
-
-diff --git a/webapp/graphite/render/attime.py b/webapp/graphite/render/attime.py
-index 55a644c..8adde3f 100644
---- a/webapp/graphite/render/attime.py
-+++ b/webapp/graphite/render/attime.py
-@@ -16,10 +16,7 @@ from datetime import datetime,timedelta
- from time import daylight
- from django.conf import settings
-
--try: # See if there is a system installation of pytz first
-- import pytz
--except ImportError: # Otherwise we fall back to Graphite's bundled version
-- from graphite.thirdparty import pytz
-+import pytz
-
-
- months = ['jan','feb','mar','apr','may','jun','jul','aug','sep','oct','nov','dec']
-diff --git a/webapp/graphite/render/glyph.py b/webapp/graphite/render/glyph.py
-index a2cc893..c6f31f1 100644
---- a/webapp/graphite/render/glyph.py
-+++ b/webapp/graphite/render/glyph.py
-@@ -22,10 +22,7 @@ from graphite.render.datalib import TimeSeries
- from graphite.util import json
-
-
--try: # See if there is a system installation of pytz first
-- import pytz
--except ImportError: # Otherwise we fall back to Graphite's bundled version
-- from graphite.thirdparty import pytz
-+import pytz
-
- INFINITY = float('inf')
-
-diff --git a/webapp/graphite/render/grammar.py b/webapp/graphite/render/grammar.py
-index 07e3e4b..2b0ba41 100644
---- a/webapp/graphite/render/grammar.py
-+++ b/webapp/graphite/render/grammar.py
-@@ -1,4 +1,4 @@
--from graphite.thirdparty.pyparsing import *
-+from pyparsing import *
-
- ParserElement.enablePackrat()
- grammar = Forward()
-diff --git a/webapp/graphite/render/views.py b/webapp/graphite/render/views.py
-index 186232e..cd747a7 100644
---- a/webapp/graphite/render/views.py
-+++ b/webapp/graphite/render/views.py
-@@ -25,10 +25,7 @@ try:
- except ImportError:
- import pickle
-
--try: # See if there is a system installation of pytz first
-- import pytz
--except ImportError: # Otherwise we fall back to Graphite's bundled version
-- from graphite.thirdparty import pytz
-+import pytz
-
- from graphite.util import getProfileByUsername, json, unpickle
- from graphite.remote_storage import HTTPConnectionWithTimeout
---
-1.9.3
diff --git a/net-analyzer/graphite-web/graphite-web-0.9.13-r3.ebuild b/net-analyzer/graphite-web/graphite-web-0.9.13-r3.ebuild
deleted file mode 100644
index f0fed573df9..00000000000
--- a/net-analyzer/graphite-web/graphite-web-0.9.13-r3.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 python-utils-r1 prefix
-
-DESCRIPTION="Enterprise scalable realtime graphing"
-HOMEPAGE="https://graphiteapp.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
- https://raw.githubusercontent.com/graphite-project/graphite-web/522d84fed687bd946878e48d85982d59f7bd1267/webapp/content/img/share.png -> ${P}-share.png"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+carbon ldap mysql memcached postgres +sqlite"
-
-DEPEND=""
-RDEPEND="
- dev-lang/python[sqlite?]
- sqlite? ( >=dev-python/django-1.4[sqlite?,${PYTHON_USEDEP}] )
- mysql? ( >=dev-python/django-1.4[${PYTHON_USEDEP}]
- || (
- dev-python/mysql-python[${PYTHON_USEDEP}]
- dev-python/mysqlclient[${PYTHON_USEDEP}]
- )
- )
- postgres? (
- >=dev-python/django-1.4[${PYTHON_USEDEP}]
- dev-python/psycopg:2[${PYTHON_USEDEP}]
- )
- >=dev-python/twisted-core-10.0[${PYTHON_USEDEP}]
- >=dev-python/django-tagging-0.3.1[${PYTHON_USEDEP}]
- <dev-python/django-1.9[${PYTHON_USEDEP}]
- dev-python/pycairo[${PYTHON_USEDEP}]
- dev-python/zope-interface[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/pyparsing[${PYTHON_USEDEP}]
- dev-python/txAMQP[${PYTHON_USEDEP}]
- carbon? ( dev-python/carbon[${PYTHON_USEDEP}] )
- dev-python/whisper[${PYTHON_USEDEP}]
- media-libs/fontconfig
- memcached? ( dev-python/python-memcached[${PYTHON_USEDEP}] )
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )"
-
-PATCHES=(
- # Do not install the configuration and data files. We install them
- # somewhere sensible by hand.
- "${FILESDIR}"/${P}-fhs-paths.patch
- "${FILESDIR}"/${P}-system-libs.patch
-)
-
-EXAMPLES=(
- examples/example-graphite-vhost.conf
- conf/dashboard.conf.example
- conf/graphite.wsgi.example
-)
-
-src_prepare() {
- # use FHS-style paths
- rm setup.cfg || die
- # make sure we don't use bundled stuff
- rm -Rf webapp/graphite/thirdparty
- distutils-r1_src_prepare
- eprefixify \
- conf/graphite.wsgi.example \
- webapp/graphite/local_settings.py.example
-}
-
-python_install() {
- distutils-r1_python_install \
- --install-data="${EPREFIX}"/usr/share/${PN}
-
- # make manage.py available from an easier location/name
- dodir /usr/bin
- mv "${D}"/$(python_get_sitedir)/graphite/manage.py \
- "${ED}"/usr/bin/${PN}-manage || die
- chmod 0755 "${ED}"/usr/bin/${PN}-manage || die
- python_fix_shebang "${ED}"/usr/bin/${PN}-manage
-
- # shortener image isn't included for some reason
- cp "${DISTDIR}"/"${P}"-share.png "${ED}"/usr/share/${PN}/webapp/content/img/
-
- insinto /etc/${PN}
- newins webapp/graphite/local_settings.py.example local_settings.py
- pushd "${D}"/$(python_get_sitedir)/graphite > /dev/null || die
- ln -s ../../../../../etc/${PN}/local_settings.py local_settings.py
- popd > /dev/null || die
-}
-
-pkg_config() {
- "${ROOT}"/usr/bin/${PN}-manage syncdb --noinput
- local idx=$(grep 'INDEX_FILE =' "${EROOT}"/etc/graphite-web/local_settings.py 2>/dev/null)
- if [[ -n ${idx} ]] ; then
- idx=${idx##*=}
- idx=$(echo ${idx})
- eval "idx=${idx}"
- touch "${ROOT}"/"${idx}"/index
- fi
-}
-
-pkg_postinst() {
- einfo "You need to configure ${PN} to run with a WSGI server of your choice."
- einfo "Don't forget to edit local_settings.py in ${EPREFIX}/etc/${PN}"
- einfo "See http://graphite.readthedocs.org/en/latest/config-local-settings.html"
- einfo "Run emerge --config =${PN}-${PVR} if this is a fresh install."
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/, net-analyzer/graphite-web/files/
@ 2019-01-23 13:55 Fabian Groffen
0 siblings, 0 replies; 5+ messages in thread
From: Fabian Groffen @ 2019-01-23 13:55 UTC (permalink / raw
To: gentoo-commits
commit: 48520c2867a182b1983a3e75b7024ab8c97b95e2
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 23 13:52:23 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jan 23 13:52:39 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48520c28
net-analyzer/graphite-web: version bump
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
net-analyzer/graphite-web/Manifest | 1 +
.../files/graphite-web-1.1.5-fhs-paths.patch | 63 +++++++++++++
.../graphite-web/graphite-web-1.1.5.ebuild | 100 +++++++++++++++++++++
3 files changed, 164 insertions(+)
diff --git a/net-analyzer/graphite-web/Manifest b/net-analyzer/graphite-web/Manifest
index 15fe0c57bdd..4f5f75d3c2b 100644
--- a/net-analyzer/graphite-web/Manifest
+++ b/net-analyzer/graphite-web/Manifest
@@ -1 +1,2 @@
DIST graphite-web-1.1.3.tar.gz 1171342 BLAKE2B f18c84d707f93d897553ec05d7b910a3dba97c6068498d1b216f178ea8a1f64baf59bb572b433a56f5e417a2873c018a38a19c3b8c765f667d7c3fbb38b9ed0a SHA512 3f9de216bd55e4e8de7391087e9b876a16e4f137fd60932a6d5855804c3d9868422645177776258e74486b97ec7a853b63a6d89b1de9b325bcb50ad694208436
+DIST graphite-web-1.1.5.tar.gz 1173809 BLAKE2B 94a1b4deab3159d3bde2d3c8b6f9664f39942cb1b815ce042b196be3c0e769ee1acac4b619135e9471360849308b90e02e1df4f7d6b7d0ef31e46d38ee2425e5 SHA512 b2097609ca77a40e6e7d83a3141335e2208d69e7f4edbac8ce3505ed9dd654589836a3b3498bfb7f7585332bceeb8e367f0c10f3cf6afdb5ad6b96377338a7bb
diff --git a/net-analyzer/graphite-web/files/graphite-web-1.1.5-fhs-paths.patch b/net-analyzer/graphite-web/files/graphite-web-1.1.5-fhs-paths.patch
new file mode 100644
index 00000000000..4cbbe7213b3
--- /dev/null
+++ b/net-analyzer/graphite-web/files/graphite-web-1.1.5-fhs-paths.patch
@@ -0,0 +1,63 @@
+Install FHS-style paths
+
+--- a/conf/graphite.wsgi.example
++++ b/conf/graphite.wsgi.example
+@@ -1,4 +1,4 @@
+ import sys
+-sys.path.append('/opt/graphite/webapp')
++sys.path.append('@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web/webapp')
+
+ from graphite.wsgi import application
+--- a/setup.py
++++ b/setup.py
+@@ -107,8 +107,8 @@
+ ],
+ package_data={'graphite' :
+ ['templates/*', 'local_settings.py.example']},
+- scripts=glob('bin/*'),
+- data_files=list(webapp_content.items()) + storage_dirs + conf_files + examples,
++ scripts=['bin/graphite-web-build-index'],
++ data_files=list(webapp_content.items()),
+ install_requires=['Django>=1.8,<2.1', 'django-tagging==0.4.3', 'pytz', 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'],
+ classifiers=[
+ 'Intended Audience :: Developers',
+--- a/webapp/graphite/local_settings.py.example
++++ b/webapp/graphite/local_settings.py.example
+@@ -101,6 +101,7 @@
+ # Change only GRAPHITE_ROOT if your install is merely shifted from /opt/graphite
+ # to somewhere else
+ #GRAPHITE_ROOT = '/opt/graphite'
++GRAPHITE_ROOT = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web'
+
+ # Most installs done outside of a separate tree such as /opt/graphite will
+ # need to change these settings. Note that the default settings for each
+@@ -110,6 +111,11 @@
+ #STATIC_ROOT = '/opt/graphite/static'
+ #LOG_DIR = '/opt/graphite/storage/log/webapp'
+ #INDEX_FILE = '/opt/graphite/storage/index' # Search index file
++CONF_DIR = '@GENTOO_PORTAGE_EPREFIX@/etc/graphite-web'
++STORAGE_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon'
++STATIC_ROOT = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web/webapp/content'
++LOG_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/log/graphite-web'
++INDEX_FILE = '@GENTOO_PORTAGE_EPREFIX@/var/lib/graphite-web/index' # Search index file
+
+ # To further or fully customize the paths, modify the following. Note that the
+ # default settings for each of these are relative to CONF_DIR and STORAGE_DIR
+@@ -127,6 +133,8 @@
+ #CERES_DIR = '/opt/graphite/storage/ceres'
+ #WHISPER_DIR = '/opt/graphite/storage/whisper'
+ #RRD_DIR = '/opt/graphite/storage/rrd'
++WHISPER_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/whisper'
++RRD_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/rrd'
+ #
+ # Data directories using the "Standard" metrics finder (i.e. not Ceres)
+ #STANDARD_DIRS = [WHISPER_DIR, RRD_DIR] # Default: set from the above variables
+@@ -244,7 +244,7 @@
+ #
+ #DATABASES = {
+ # 'default': {
+-# 'NAME': '/opt/graphite/storage/graphite.db',
++# 'NAME': '@GENTOO_PORTAGE_EPREFIX@/var/lib/graphite-web/graphite.db',
+ # 'ENGINE': 'django.db.backends.sqlite3',
+ # 'USER': '',
+ # 'PASSWORD': '',
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.5.ebuild b/net-analyzer/graphite-web/graphite-web-1.1.5.ebuild
new file mode 100644
index 00000000000..b0cada7cd87
--- /dev/null
+++ b/net-analyzer/graphite-web/graphite-web-1.1.5.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) # 3.7 dropped due to dep-hell
+
+inherit distutils-r1 python-utils-r1 prefix
+
+DESCRIPTION="Enterprise scalable realtime graphing"
+HOMEPAGE="https://graphiteapp.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+carbon ldap mysql memcached postgres +sqlite"
+
+DEPEND=""
+RDEPEND="
+ carbon? ( dev-python/carbon[${PYTHON_USEDEP}] )
+ ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+ memcached? ( dev-python/python-memcached[${PYTHON_USEDEP}] )
+ mysql? (
+ || (
+ dev-python/mysql-python[${PYTHON_USEDEP}]
+ dev-python/mysqlclient[${PYTHON_USEDEP}]
+ )
+ )
+ postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+ >=dev-python/django-1.8[sqlite?,${PYTHON_USEDEP}]
+ <dev-python/django-2.1.99[sqlite?,${PYTHON_USEDEP}]
+ >=dev-python/django-tagging-0.4.6[${PYTHON_USEDEP}]
+ dev-python/cairocffi[${PYTHON_USEDEP}]
+ dev-python/pyparsing[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/scandir[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/urllib3[${PYTHON_USEDEP}]
+ media-libs/fontconfig
+"
+
+PATCHES=(
+ # Do not install the configuration and data files. We install them
+ # somewhere sensible by hand.
+ "${FILESDIR}"/${PN}-1.1.5-fhs-paths.patch
+)
+
+python_prepare_all() {
+ # Use a less common name
+ mv bin/build-index bin/${PN}-build-index || die
+ # use FHS-style paths
+ export GRAPHITE_NO_PREFIX=yes
+ distutils-r1_python_prepare_all
+ eprefixify \
+ conf/graphite.wsgi.example \
+ webapp/graphite/local_settings.py.example
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ keepdir /var/{lib,log}/${PN}
+ docinto examples
+ docompress -x "/usr/share/doc/${PF}/examples"
+ dodoc \
+ examples/example-graphite-vhost.conf \
+ conf/dashboard.conf.example \
+ conf/graphite.wsgi.example
+}
+
+python_install() {
+ distutils-r1_python_install \
+ --install-data="${EPREFIX}"/usr/share/${PN}
+
+ insinto /etc/${PN}
+ newins webapp/graphite/local_settings.py.example local_settings.py
+ pushd "${D}/$(python_get_sitedir)"/graphite > /dev/null || die
+ ln -s ../../../../../etc/${PN}/local_settings.py local_settings.py || die
+ popd > /dev/null || die
+}
+
+pkg_config() {
+ "${EROOT}"/usr/bin/django-admin.py migrate \
+ --settings=graphite.settings --run-syncdb
+ "${EROOT}"/usr/bin/${PN}-build-index
+}
+
+pkg_postinst() {
+ # Only display this for new installs
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ elog "You need to configure ${PN} to run with a WSGI server of your choice."
+ elog "For example using Apache, you can use www-apache/mod_wsgi,"
+ elog " using Nginx, you can use www-servers/uwsgi."
+ elog "Don't forget to edit local_settings.py in ${EPREFIX}/etc/${PN}"
+ elog "See https://graphite.readthedocs.org/en/latest/config-local-settings.html"
+ elog "Run emerge --config =${PN}-${PVR} if this is a fresh install."
+ elog ""
+ elog "If you want to update the search index regularily, you should consider running"
+ elog "the '${PN}-build-index' script in a crontab."
+ fi
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/, net-analyzer/graphite-web/files/
@ 2020-05-31 9:32 Fabian Groffen
0 siblings, 0 replies; 5+ messages in thread
From: Fabian Groffen @ 2020-05-31 9:32 UTC (permalink / raw
To: gentoo-commits
commit: 09be558617aa84cf5b146a95c22d4584ff824f5a
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun May 31 09:32:30 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun May 31 09:32:30 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09be5586
net-analyzer/graphite-web-1.1.7: version bump with support for Django 3
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
net-analyzer/graphite-web/Manifest | 1 +
...hs.patch => graphite-web-1.1.7-fhs-paths.patch} | 8 +-
.../graphite-web/graphite-web-1.1.7.ebuild | 96 ++++++++++++++++++++++
3 files changed, 101 insertions(+), 4 deletions(-)
diff --git a/net-analyzer/graphite-web/Manifest b/net-analyzer/graphite-web/Manifest
index b2a84682aab..7a5d3aca5d0 100644
--- a/net-analyzer/graphite-web/Manifest
+++ b/net-analyzer/graphite-web/Manifest
@@ -1 +1,2 @@
DIST graphite-web-1.1.5.tar.gz 1173809 BLAKE2B 94a1b4deab3159d3bde2d3c8b6f9664f39942cb1b815ce042b196be3c0e769ee1acac4b619135e9471360849308b90e02e1df4f7d6b7d0ef31e46d38ee2425e5 SHA512 b2097609ca77a40e6e7d83a3141335e2208d69e7f4edbac8ce3505ed9dd654589836a3b3498bfb7f7585332bceeb8e367f0c10f3cf6afdb5ad6b96377338a7bb
+DIST graphite-web-1.1.7.tar.gz 1173818 BLAKE2B e2373360897c1447d60cbf84e5d0dd280130730f617ba12cf0195ed2539f55bcfe8a1cb3b6b9e4f9540a6f08ecb7870072aa61447012baa5553878ebf417937f SHA512 eb0a1de35d3535bd1fdc4e6edc6fe50fd6c8789fef4807eb4cd30d6b20e91e09d21daedb80f55339a8c05325db8fe1038e7a461bf155e41555dee60160d5b241
diff --git a/net-analyzer/graphite-web/files/graphite-web-1.1.3-fhs-paths.patch b/net-analyzer/graphite-web/files/graphite-web-1.1.7-fhs-paths.patch
similarity index 92%
rename from net-analyzer/graphite-web/files/graphite-web-1.1.3-fhs-paths.patch
rename to net-analyzer/graphite-web/files/graphite-web-1.1.7-fhs-paths.patch
index aa6ea74ff93..6550f083039 100644
--- a/net-analyzer/graphite-web/files/graphite-web-1.1.3-fhs-paths.patch
+++ b/net-analyzer/graphite-web/files/graphite-web-1.1.7-fhs-paths.patch
@@ -10,17 +10,17 @@ Install FHS-style paths
from graphite.wsgi import application
--- a/setup.py
+++ b/setup.py
-@@ -59,8 +59,8 @@
+@@ -115,8 +115,8 @@
],
package_data={'graphite' :
['templates/*', 'local_settings.py.example']},
- scripts=glob('bin/*'),
-+ scripts=['bin/graphite-web-build-index'],
- data_files=list(webapp_content.items()) + storage_dirs + conf_files + examples,
++ scripts=['bin/graphite-web-build-index'],
+ data_files=list(webapp_content.items()),
- install_requires=['Django>=1.8,<1.11.99', 'django-tagging==0.4.3', 'pytz', 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'],
+ install_requires=['Django>=1.8,<3.1', 'django-tagging==0.4.3', 'pytz',
+ 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'],
classifiers=[
- 'Intended Audience :: Developers',
--- a/webapp/graphite/local_settings.py.example
+++ b/webapp/graphite/local_settings.py.example
@@ -101,6 +101,7 @@
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild b/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild
new file mode 100644
index 00000000000..74a4e43dac9
--- /dev/null
+++ b/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} ) # 3.8 dropped due to dep on python-memcached
+ # 1.1.7 supports up to 3.9, so it's a matter of deps
+
+inherit distutils-r1 prefix
+
+DESCRIPTION="Enterprise scalable realtime graphing"
+HOMEPAGE="https://graphiteapp.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+carbon ldap mysql memcached postgres +sqlite"
+
+DEPEND=""
+RDEPEND="
+ carbon? ( dev-python/carbon[${PYTHON_USEDEP}] )
+ ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+ memcached? ( dev-python/python-memcached[${PYTHON_USEDEP}] )
+ mysql? ( dev-python/mysqlclient[${PYTHON_USEDEP}] )
+ postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+ >=dev-python/django-1.11.19[sqlite?,${PYTHON_USEDEP}]
+ >=dev-python/django-tagging-0.4.6[${PYTHON_USEDEP}]
+ dev-python/cairocffi[${PYTHON_USEDEP}]
+ dev-python/pyparsing[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/urllib3[${PYTHON_USEDEP}]
+ media-libs/fontconfig
+"
+
+PATCHES=(
+ # Do not install the configuration and data files. We install them
+ # somewhere sensible by hand.
+ "${FILESDIR}"/${PN}-1.1.7-fhs-paths.patch
+)
+
+python_prepare_all() {
+ # Use a less common name
+ mv bin/build-index bin/${PN}-build-index || die
+ # use FHS-style paths
+ export GRAPHITE_NO_PREFIX=yes
+ distutils-r1_python_prepare_all
+ eprefixify \
+ conf/graphite.wsgi.example \
+ webapp/graphite/local_settings.py.example
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ keepdir /var/{lib,log}/${PN}
+ docinto examples
+ docompress -x "/usr/share/doc/${PF}/examples"
+ dodoc \
+ examples/example-graphite-vhost.conf \
+ conf/dashboard.conf.example \
+ conf/graphite.wsgi.example
+}
+
+python_install() {
+ distutils-r1_python_install \
+ --install-data="${EPREFIX}"/usr/share/${PN}
+
+ insinto /etc/${PN}
+ newins webapp/graphite/local_settings.py.example local_settings.py
+ pushd "${D}/$(python_get_sitedir)"/graphite > /dev/null || die
+ ln -s ../../../../../etc/${PN}/local_settings.py local_settings.py || die
+ popd > /dev/null || die
+
+ python_optimize
+}
+
+pkg_config() {
+ "${EROOT}"/usr/bin/django-admin.py migrate \
+ --settings=graphite.settings --run-syncdb
+ "${EROOT}"/usr/bin/${PN}-build-index
+}
+
+pkg_postinst() {
+ # Only display this for new installs
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ elog "You need to configure ${PN} to run with a WSGI server of your choice."
+ elog "For example using Apache, you can use www-apache/mod_wsgi,"
+ elog " using Nginx, you can use www-servers/uwsgi."
+ elog "Don't forget to edit local_settings.py in ${EPREFIX}/etc/${PN}"
+ elog "See https://graphite.readthedocs.org/en/latest/config-local-settings.html"
+ elog "Run emerge --config =${PN}-${PVR} if this is a fresh install."
+ elog ""
+ elog "If you want to update the search index regularily, you should consider running"
+ elog "the '${PN}-build-index' script in a crontab."
+ fi
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/, net-analyzer/graphite-web/files/
@ 2022-01-06 8:08 Fabian Groffen
0 siblings, 0 replies; 5+ messages in thread
From: Fabian Groffen @ 2022-01-06 8:08 UTC (permalink / raw
To: gentoo-commits
commit: a71dd49cbd39fe665d469ff392d31816436610a1
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 6 08:07:42 2022 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jan 6 08:07:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a71dd49c
net-analyzer/graphite-web-1.1.8: version bump, fix pyparsing interaction
Closes: https://bugs.gentoo.org/829727
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
net-analyzer/graphite-web/Manifest | 3 +-
.../files/graphite-web-1.1.8-pyparsing3.patch | 60 ++++++++++++++
.../graphite-web/graphite-web-1.1.5-r1.ebuild | 93 ----------------------
...-web-1.1.7.ebuild => graphite-web-1.1.8.ebuild} | 6 +-
4 files changed, 65 insertions(+), 97 deletions(-)
diff --git a/net-analyzer/graphite-web/Manifest b/net-analyzer/graphite-web/Manifest
index 7a5d3aca5d0a..d34c717db751 100644
--- a/net-analyzer/graphite-web/Manifest
+++ b/net-analyzer/graphite-web/Manifest
@@ -1,2 +1 @@
-DIST graphite-web-1.1.5.tar.gz 1173809 BLAKE2B 94a1b4deab3159d3bde2d3c8b6f9664f39942cb1b815ce042b196be3c0e769ee1acac4b619135e9471360849308b90e02e1df4f7d6b7d0ef31e46d38ee2425e5 SHA512 b2097609ca77a40e6e7d83a3141335e2208d69e7f4edbac8ce3505ed9dd654589836a3b3498bfb7f7585332bceeb8e367f0c10f3cf6afdb5ad6b96377338a7bb
-DIST graphite-web-1.1.7.tar.gz 1173818 BLAKE2B e2373360897c1447d60cbf84e5d0dd280130730f617ba12cf0195ed2539f55bcfe8a1cb3b6b9e4f9540a6f08ecb7870072aa61447012baa5553878ebf417937f SHA512 eb0a1de35d3535bd1fdc4e6edc6fe50fd6c8789fef4807eb4cd30d6b20e91e09d21daedb80f55339a8c05325db8fe1038e7a461bf155e41555dee60160d5b241
+DIST graphite-web-1.1.8.tar.gz 1177214 BLAKE2B 20e058feff0fa7f12393cfd41acca7cf05ff6a3995aa5f6547764fae3b8824e8b424efb8d5d47227eb2b5591ae6b45ab960da30f810acb4f1fbd0b9ae78ec47b SHA512 4637a541e61f56c1ac69bf18e7eab88ecf93f59099dc3e8022d8bf8fb1b204672bc0a1b5302e5031701714db17aabb316ba40f4cfabb2bf4fb0dedb8f412e4a9
diff --git a/net-analyzer/graphite-web/files/graphite-web-1.1.8-pyparsing3.patch b/net-analyzer/graphite-web/files/graphite-web-1.1.8-pyparsing3.patch
new file mode 100644
index 000000000000..6a1c44ff0109
--- /dev/null
+++ b/net-analyzer/graphite-web/files/graphite-web-1.1.8-pyparsing3.patch
@@ -0,0 +1,60 @@
+Modified to apply on 1.1.8 release
+
+From 5de8405307ded14930b3381380e9f91e583172a9 Mon Sep 17 00:00:00 2001
+From: parrotpock <51694161+parrotpock@users.noreply.github.com>
+Date: Mon, 15 Nov 2021 17:39:23 +0100
+Subject: [PATCH] Fix pyparsing > 3.0 compatibility issue. (#2727)
+
+* Fix bool() issue in recursion termination check.
+
+The behaviour of ParsedResults seems to have changed in the way that
+the usage of pop() along with the bool() check on the object interact
+wrt checking if there are further elements in the parsed structure to
+consume. In version > 3.0 bool() checks whether either the internal
+_toklist or _tokdict members contain items left to consume and returns
+True if either do, whereas pop with no arguments will only consume from
+the underlying list. That means that we would get a True in the if
+condition in this code, whereas a subsequent call to pop() would throw
+an exception. Calling asList() forces the use of the list representation
+in the bool check here and so fixes this issue.
+
+* Fix pyparsing backwards compatibility issue.
+
+* Remove upper-bound on pin.
+
+* Add pyparsing3 test target for versions >= 3.0.6
+
+* Remove try/except, use dictionary key index syntax
+
+Co-authored-by: Ubuntu <ubuntu@ip-172-31-7-19.eu-west-1.compute.internal>
+---
+ webapp/graphite/render/evaluator.py | 2 +-
+ webapp/graphite/render/grammar_unsafe.py | 2 +-
+ 4 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/webapp/graphite/render/evaluator.py b/webapp/graphite/render/evaluator.py
+index 748626ed0c..12179dcc44 100644
+--- a/webapp/graphite/render/evaluator.py
++++ b/webapp/graphite/render/evaluator.py
+@@ -58,7 +58,7 @@ def evaluateTokens(requestContext, tokens, replacements=None, pipedArg=None):
+ return evaluateTokens(requestContext, tokens.template, arglist)
+
+ if tokens.expression:
+- if tokens.expression.pipedCalls:
++ if tokens.expression.pipedCalls.asList():
+ # when the expression has piped calls, we pop the right-most call and pass the remaining
+ # expression into it via pipedArg, to get the same result as a nested call
+ rightMost = tokens.expression.pipedCalls.pop()
+diff --git a/webapp/graphite/render/grammar_unsafe.py b/webapp/graphite/render/grammar_unsafe.py
+index f25b5eff8f..2481176b53 100644
+--- a/webapp/graphite/render/grammar_unsafe.py
++++ b/webapp/graphite/render/grammar_unsafe.py
+@@ -80,7 +80,7 @@
+
+
+ def setRaw(s, loc, toks):
+- toks[0].raw = s[toks[0].start:toks[0].end]
++ toks[0]['raw'] = s[toks[0].start:toks[0].end]
+
+
+ call = Group(
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild b/net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild
deleted file mode 100644
index dfdaeff5c5b3..000000000000
--- a/net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1 prefix
-
-DESCRIPTION="Enterprise scalable realtime graphing"
-HOMEPAGE="https://graphiteapp.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+carbon ldap mysql memcached postgres +sqlite"
-
-DEPEND=""
-RDEPEND="
- carbon? ( dev-python/carbon[${PYTHON_USEDEP}] )
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
- memcached? ( dev-python/python-memcached[${PYTHON_USEDEP}] )
- mysql? ( dev-python/mysqlclient[${PYTHON_USEDEP}] )
- postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
- >=dev-python/django-1.11.19[sqlite?,${PYTHON_USEDEP}]
- >=dev-python/django-tagging-0.4.6[${PYTHON_USEDEP}]
- dev-python/cairocffi[${PYTHON_USEDEP}]
- dev-python/pyparsing[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- dev-python/urllib3[${PYTHON_USEDEP}]
- media-libs/fontconfig
-"
-
-PATCHES=(
- # Do not install the configuration and data files. We install them
- # somewhere sensible by hand.
- "${FILESDIR}"/${PN}-1.1.5-fhs-paths.patch
-)
-
-python_prepare_all() {
- # Use a less common name
- mv bin/build-index bin/${PN}-build-index || die
- # use FHS-style paths
- export GRAPHITE_NO_PREFIX=yes
- distutils-r1_python_prepare_all
- eprefixify \
- conf/graphite.wsgi.example \
- webapp/graphite/local_settings.py.example
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- keepdir /var/{lib,log}/${PN}
- docinto examples
- docompress -x "/usr/share/doc/${PF}/examples"
- dodoc \
- examples/example-graphite-vhost.conf \
- conf/dashboard.conf.example \
- conf/graphite.wsgi.example
-}
-
-python_install() {
- distutils-r1_python_install \
- --install-data="${EPREFIX}"/usr/share/${PN}
-
- insinto /etc/${PN}
- newins webapp/graphite/local_settings.py.example local_settings.py
- pushd "${D}/$(python_get_sitedir)"/graphite > /dev/null || die
- ln -s ../../../../../etc/${PN}/local_settings.py local_settings.py || die
- popd > /dev/null || die
-}
-
-pkg_config() {
- "${EROOT}"/usr/bin/django-admin.py migrate \
- --settings=graphite.settings --run-syncdb
- "${EROOT}"/usr/bin/${PN}-build-index
-}
-
-pkg_postinst() {
- # Only display this for new installs
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- elog "You need to configure ${PN} to run with a WSGI server of your choice."
- elog "For example using Apache, you can use www-apache/mod_wsgi,"
- elog " using Nginx, you can use www-servers/uwsgi."
- elog "Don't forget to edit local_settings.py in ${EPREFIX}/etc/${PN}"
- elog "See https://graphite.readthedocs.org/en/latest/config-local-settings.html"
- elog "Run emerge --config =${PN}-${PVR} if this is a fresh install."
- elog ""
- elog "If you want to update the search index regularily, you should consider running"
- elog "the '${PN}-build-index' script in a crontab."
- fi
-}
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild b/net-analyzer/graphite-web/graphite-web-1.1.8.ebuild
similarity index 94%
rename from net-analyzer/graphite-web/graphite-web-1.1.7.ebuild
rename to net-analyzer/graphite-web/graphite-web-1.1.8.ebuild
index 53bd930f12a7..d3392bd0c712 100644
--- a/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild
+++ b/net-analyzer/graphite-web/graphite-web-1.1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -26,7 +26,7 @@ RDEPEND="
>=dev-python/django-1.11.19[sqlite?,${PYTHON_USEDEP}]
>=dev-python/django-tagging-0.4.6[${PYTHON_USEDEP}]
dev-python/cairocffi[${PYTHON_USEDEP}]
- dev-python/pyparsing[${PYTHON_USEDEP}]
+ <dev-python/pyparsing-3[${PYTHON_USEDEP}]
dev-python/pytz[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
dev-python/urllib3[${PYTHON_USEDEP}]
@@ -37,6 +37,8 @@ PATCHES=(
# Do not install the configuration and data files. We install them
# somewhere sensible by hand.
"${FILESDIR}"/${PN}-1.1.7-fhs-paths.patch
+ # pyparsing fix, can be dropped from 1.1.9 onwards
+ "${FILESDIR}"/${PN}-1.1.8-pyparsing3.patch
)
python_prepare_all() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-01-06 8:08 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-06 8:08 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/, net-analyzer/graphite-web/files/ Fabian Groffen
-- strict thread matches above, loose matches on Subject: below --
2020-05-31 9:32 Fabian Groffen
2019-01-23 13:55 Fabian Groffen
2018-07-22 17:10 Virgil Dupras
2018-06-12 10:35 Fabian Groffen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox