Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

graphite-web: fix patch #91756

Merged
merged 3 commits into from Jun 30, 2020
Merged

graphite-web: fix patch #91756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f52551
grahpite-web: recreate patch file
JJJollyjim Jun 29, 2020
3c8762d
nixos/graphite: unmark test as broken
JJJollyjim Jun 29, 2020
3f31678
nixos/graphite: ensure graphite-api is properly tested
JJJollyjim Jun 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 5 additions & 6 deletions nixos/tests/graphite.nix
View file
Open in desktop
@@ -1,11 +1,6 @@
import ./make-test-python.nix ({ pkgs, ... } :
{
name = "graphite";
meta = {
# Fails on dependency `python-2.7-Twisted`'s test suite
# complaining `ImportError: No module named zope.interface`.
broken = true;
};
nodes = {
one =
{ ... }: {
Expand All @@ -21,7 +16,7 @@ import ./make-test-python.nix ({ pkgs, ... } :
api = {
enable = true;
port = 8082;
finders = [ pkgs.python3Packages.influxgraph ];
finders = [ ];
};
carbon.enableCache = true;
seyren.enable = false; # Implicitely requires openssl-1.0.2u which is marked insecure
Expand All @@ -41,10 +36,14 @@ import ./make-test-python.nix ({ pkgs, ... } :
# even if they're still in preStart (which takes quite long for graphiteWeb).
# Wait for ports to open so we're sure the services are up and listening.
one.wait_for_open_port(8080)
one.wait_for_open_port(8082)
one.wait_for_open_port(2003)
one.succeed('echo "foo 1 `date +%s`" | nc -N localhost 2003')
one.wait_until_succeeds(
"curl 'http://localhost:8080/metrics/find/?query=foo&format=treejson' --silent | grep foo >&2"
)
one.wait_until_succeeds(
"curl 'http://localhost:8082/metrics/find/?query=foo&format=treejson' --silent | grep foo >&2"
)
'';
})
15 changes: 8 additions & 7 deletions pkgs/development/python-modules/graphite-web/update-django-tagging.patch
View file
Open in desktop
@@ -1,12 +1,13 @@
diff -Nur a/setup.py b/setup.py
--- a/setup.py 2020-03-12 18:45:34.654296302 +0100
+++ b/setup.py 2020-03-12 18:46:17.476893828 +0100
@@ -115,7 +115,7 @@
diff --git a/setup.py b/setup.py
index a1a21f1..f0d1051 100644
--- a/setup.py
+++ b/setup.py
@@ -117,7 +117,7 @@ try:
['templates/*', 'local_settings.py.example']},
scripts=glob('bin/*'),
data_files=list(webapp_content.items()) + storage_dirs + conf_files + examples,
- install_requires=['Django>=1.8,<2.3', 'django-tagging==0.4.3', 'pytz', 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'],
+ install_requires=['Django>=1.8,<2.3', 'django-tagging==0.4.6', 'pytz', 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'],
- install_requires=['Django>=1.8,<3.1', 'django-tagging==0.4.3', 'pytz',
+ install_requires=['Django>=1.8,<3.1', 'django-tagging==0.5.0', 'pytz',
'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'],
classifiers=[
'Intended Audience :: Developers',
'Natural Language :: English',