Skip to content

Commit

Permalink
Clean up and migrate to GHA
Browse files Browse the repository at this point in the history
Signed-off-by: Arcadiy Ivanov <[email protected]>
  • Loading branch information
arcivanov committed Oct 7, 2021
1 parent 809e558 commit a3eedc2
Show file tree
Hide file tree
Showing 8 changed files with 62 additions and 151 deletions.
51 changes: 51 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: fluent-logger
on:
pull_request:
push:
branches:
- master
jobs:
build-stable:
runs-on: ${{ matrix.os }}
continue-on-error: false
strategy:
fail-fast: false
matrix:
os:
- ubuntu-latest
- windows-latest
- macosx-latest
python-version:
- '3.10'
- '3.9'
- '3.8'
- '3.7'
- '3.6'
- 'pypy-3.7'
env:
DEPLOY_PYTHONS: "3.9"
DEPLOY_OSES: "Linux"
TWINE_USERNAME: __token__
TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps:
- shell: bash
if: |
github.event_name == 'push' &&
contains(env.DEPLOY_OSES, runner.os) &&
contains(env.DEPLOY_PYTHONS, matrix.python-version)
run: |
echo "PYB_EXTRA_ARGS=+upload" >> $GITHUB_ENV
- uses: pybuilder/build@master
with:
python-version: ${{ matrix.python-version }}
pyb-extra-args: ${{ env.PYB_EXTRA_ARGS }}
build-stable-summary:
if: success() || failure()
runs-on: ubuntu-latest
name: Build Stable Summary
needs: build-stable
steps:
- name: Check build matrix status
if: needs.build-stable.result != 'success'
run: exit 1
32 changes: 0 additions & 32 deletions .travis.yml

This file was deleted.

6 changes: 3 additions & 3 deletions build.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@

@init
def set_properties(project):
project.build_depends_on("docker", "~=4.2.0")
project.build_depends_on("cryptography", "~=2.9.0")
project.build_depends_on("docker", ">=5.0")
project.build_depends_on("cryptography", ">=2.9.0")

project.set_property("verbose", True)

project.set_property("coverage_break_build", True)
project.set_property("coverage_break_build", False)
project.get_property("coverage_exceptions").extend(["setup"])

project.set_property("flake8_break_build", True)
Expand Down
7 changes: 4 additions & 3 deletions src/main/python/fluent/sender.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
from urllib.parse import urlparse
from uuid import uuid1

from msgpack import Unpacker, Packer
from msgpack import Packer
from msgpack.fallback import Unpacker

DEFAULT_SCHEME = "tcp"
Expand All @@ -37,6 +37,7 @@

_endpoint_registry = {}


def to_bytes(s):
if isinstance(s, str):
return s.encode("utf-8")
Expand Down Expand Up @@ -886,7 +887,7 @@ def run(self):
r_int.add(wakeup_sock_r)

op_queue = self.op_queue
last_ts = time.time()
# last_ts = time.time()

with wakeup_sock_r, self.wakeup_sock_w:
while r_int or w_int:
Expand All @@ -909,7 +910,7 @@ def run(self):
r_int.remove(r)
break
elif cmd == NEW_OP:
enable, op, conn = op_queue.pop() # type: EndpointOp
enable, op, conn = op_queue.pop()
if op == OP_READ:
if enable:
r_int.add(conn)
Expand Down
6 changes: 4 additions & 2 deletions src/unittest/python/fluentd_tester.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import os
import tempfile
from collections import namedtuple

import docker

"""
Expand Down Expand Up @@ -32,7 +33,8 @@ def __init__(self, config, *, port_generator, docker, data_dir):
self.data_dir = data_dir

def start(self):

pass

def cleanup(self):
self.config_dir.cleanup()
if self.config.proto.startswith("unix"):
Expand All @@ -59,7 +61,7 @@ def port_generator():
data_dir=self.data_dir)

def setUp(self):

pass

def tearDown(self):
for config in self.instances:
Expand Down
17 changes: 0 additions & 17 deletions travis/travis_install.cmd

This file was deleted.

33 changes: 0 additions & 33 deletions travis/travis_install.sh

This file was deleted.

61 changes: 0 additions & 61 deletions travis/travis_shim.py

This file was deleted.

0 comments on commit a3eedc2

Please sign in to comment.