Skip to content

Commit

Permalink
Merge pull request #918 from deniszh/backport/1.1.x/commit-1ebd4c16_c…
Browse files Browse the repository at this point in the history
…ommit-7ece7f57_pr-893_commit-41af02c3_commit-f90516db_commit-6e69af5e_commit-26719e97_commit-8e701f5f_commit-1d3e026b_commit-632ffc44_commit-0f3236a5_commit-86dba756_commit-374d465a_c

[1.1.x] remove carbon-client.py, is broken for 4 years (1ebd4c1) | Add skipcq: PTC-W0034 (7ece7f5) | Spelling (#893) | Update storage-aggregation.conf.example (41af02c) | add config option to turn off logging of lost connections (f90516d
  • Loading branch information
deniszh authored Apr 18, 2021
2 parents 56250f5 + d350e87 commit 1dfbc48
Show file tree
Hide file tree
Showing 24 changed files with 260 additions and 218 deletions.
12 changes: 12 additions & 0 deletions .deepsource.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
version = 1

test_patterns = [
"*/test/**"
]

[[analyzers]]
name = "python"
enabled = true

[analyzers.meta]
runtime_version = "3.x.x"
56 changes: 56 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
name: "CodeQL"

on:
push:
branches: [ master, 0.9.x, 1.0.x, 1.1.x ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master ]
schedule:
- cron: '37 7 * * 6'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
language: [ 'python' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
# Learn more:
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed

steps:
- name: Checkout repository
uses: actions/checkout@v2

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
74 changes: 74 additions & 0 deletions .github/workflows/tests-amd64.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
name: "Run tests for amd64 architecture"

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
build:
runs-on: ubuntu-latest

strategy:
matrix:
include:
- name: "Python 2.7"
python-version: '2.7'
toxenv: "py27"
- name: "Pypy 2.7"
python-version: 'pypy-2.7'
toxenv: 'pypy'
- name: "Python 3.6"
python-version: '3.6'
toxenv: 'py36'
- name: "Pypy 3.6"
python-version: 'pypy-3.6'
toxenv: 'pypy3'
- name: "Python 3.7"
python-version: '3.7'
toxenv: 'py37'
- name: "Pypy 3.7"
python-version: 'pypy-3.7'
toxenv: 'pypy3'
- name: "Python 3.8"
python-version: '3.8'
toxenv: 'py38'
- name: "Python 3.9-pyhash"
python-version: '3.9'
toxenv: 'py39-pyhash'
- name: "Python 3.9"
python-version: '3.9'
toxenv: 'py39'
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install tox flake8 pytest
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
- name: Tests with tox
env:
TOXENV: ${{ matrix.toxenv }}
run: |
tox
- name: Linting
if: ${{ matrix.python-version==3.9 }}
env:
TOXENV: lint
run: |
tox
- name: Run Codecov
if: ${{ matrix.python-version==3.9 }}
env:
TOXENV: lint
run: |
pip install codecov
codecov
- name: Upload coverage to Codecov
if: ${{ matrix.python-version==3.9 }}
uses: codecov/codecov-action@v1
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ htmlcov
.eggs/
*.egg-info/
lib/twisted/plugins/dropin.cache
venv
52 changes: 26 additions & 26 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,63 +1,63 @@
# http://travis-ci.org/#!/graphite-project/carbon
dist: xenial
dist: bionic
language: python
python: 2.7
python: 3.9

matrix:
include:
- python: pypy
env:
- TOXENV=pypy
- python: 3.5
- python: 2.7
arch: s390x
env:
- TOXENV=py35
- TOXENV=py27
- python: 3.6
arch: s390x
env:
- TOXENV=py36
- python: 3.7
arch: s390x
env:
- TOXENV=py37
- python: 3.8
env:
- TOXENV=py38-pyhash
- python: 3.8
arch: s390x
env:
- TOXENV=py38
- python: 3.8
env:
- TOXENV=lint
- python: 2.7
- python: 3.9
arch: s390x
env:
- TOXENV=py27
- python: 2.7
- TOXENV=py39
- python: 3.9
arch: s390x
env:
- TOXENV=lint
- python: 3.5
arch: s390x
#PPC64LE jobs:-
- python: 2.7
arch: ppc64le
env:
- TOXENV=py35
- TOXENV=py27
- python: 3.6
arch: s390x
arch: ppc64le
env:
- TOXENV=py36
- python: 3.7
arch: s390x
arch: ppc64le
env:
- TOXENV=py37
- python: 3.8
arch: s390x
arch: ppc64le
env:
- TOXENV=py38
- python: 3.8
arch: s390x
- python: 3.9
arch: ppc64le
env:
- TOXENV=py39
- python: 3.9
arch: ppc64le
env:
- TOXENV=lint

env:
- TOXENV=py27
- TOXENV=py27-pyhash
- TOXENV=py39
- TOXENV=py39-pyhash
- TOXENV=lint

install:
Expand Down
144 changes: 0 additions & 144 deletions bin/carbon-client.py

This file was deleted.

Loading

0 comments on commit 1dfbc48

Please sign in to comment.