lp://staging/graphite
- Get this branch:
- bzr branch lp://staging/graphite
Branch merges
Branch information
Import details
This branch is an import of the HEAD branch of the Git repository at https://github.com/graphite-project/graphite-web.git.
Last successful import was .
Recent revisions
- 1945. By Mauro Stettler
-
Merge pull request #2740 from grafana/
raise_exception _when_not_ recoverable Raise exception when not recoverable
- 1943. By Mauro Stettler
-
Implement upper lower case functions (#2586)
* implement functions to upper/lower case
* add tests
* better way to update a single char within a string
Co-Authored-By: Dan Cech <email address hidden>
* add assert for linter
Co-authored-by: Dan Cech <email address hidden>
- 1940. By Denis Zhdanov
-
Forward port changes from #2729 to master (#2730)
* Revert "Add CodeSee architecture diagram workflow to repository"
This reverts commit 217ad6f7086f368
9394ed9ad601d5f db12fc1b98. * Fix dependency issue for usage as Grafana data source.
* Add pyparsing version restriction to tox tests.
* Update CHANGELOG.md
* Correct carbon-relay-ng url (#2723)
* maxStep in requestContext for Finder (#2724)
* Revert "Add CodeSee architecture diagram workflow to repository"
This reverts commit 217ad6f7086f368
9394ed9ad601d5f db12fc1b98. * populate maxStep from URL parameter
* populate serialized targets if enabled
* Fixing lint
* Fix dependency issue for usage as Grafana data source.
* Add pyparsing version restriction to tox tests.
* Update CHANGELOG.md
* Correct carbon-relay-ng url (#2723)
* Removing "targets_
serialized" * Removing "targets_
serialized" Co-authored-by: Henk Freimuth <email address hidden>
Co-authored-by: Dan Cech <email address hidden>* Update CHANGELOG.md
* 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 <email address hidden>
* Update CHANGELOG.md
* Update CHANGELOG.md
* Backporting changes from #2729
* Fixing reqs
* Removing master
* Removing test_is_
local_interface _dns completely * Test 3.10 only with Django 3.0
* unused import
Co-authored-by: Henk Freimuth <email address hidden>
Co-authored-by: Dan Cech <email address hidden>
Co-authored-by: parrotpock <email address hidden>
Co-authored-by: Ubuntu <email address hidden> - 1937. By parrotpock <email address hidden>
-
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 <email address hidden>
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)