From bc5385e0f9a57cfaaa9a04015e4ee94f4c420b37 Mon Sep 17 00:00:00 2001 From: Arcadiy Ivanov Date: Thu, 7 Oct 2021 01:14:34 -0400 Subject: [PATCH] Clean up and migrate to GHA Signed-off-by: Arcadiy Ivanov --- .github/workflows/build.yml | 51 ++++++++++++++++++++++ .travis.yml | 32 -------------- build.py | 6 +-- src/main/python/fluent/sender.py | 7 +-- src/unittest/python/fluentd_tester.py | 6 ++- travis/travis_install.cmd | 17 -------- travis/travis_install.sh | 33 --------------- travis/travis_shim.py | 61 --------------------------- 8 files changed, 62 insertions(+), 151 deletions(-) create mode 100644 .github/workflows/build.yml delete mode 100644 .travis.yml delete mode 100755 travis/travis_install.cmd delete mode 100755 travis/travis_install.sh delete mode 100644 travis/travis_shim.py diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..6f0a026 --- /dev/null +++ b/.github/workflows/build.yml @@ -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 diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 4afb8d0..0000000 --- a/.travis.yml +++ /dev/null @@ -1,32 +0,0 @@ -sudo: false -language: python -python: - - "3.5" - - "3.6" - - "3.7" - - "3.8" - - "3.9" - - pypy3 - - nightly -# command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors -install: - - "pip install -e ." - - "pip install 'coverage~=4.5.4' coveralls" -script: - - "PYTHONFAULTHANDLER=x timeout -sABRT 30s nosetests -vsd" -after_success: - - coveralls - -deploy: - provider: pypi - user: repeatedly - server: https://upload.pypi.org/legacy/ - password: - secure: CpNaj4F3TZvpP1aSJWidh/XexrWODV2sBdObrYU79Gyh9hFl6WLsA3JM9BfVsy9cGb/P/jP6ly4Z0/6qdIzZ5D6FPOB1B7rn5GZ2LAMOypRCA6W2uJbRjUU373Wut0p0OmQcMPto6XJsMlpvOEq+1uAq+LLAnAGEmmYTeskZebs= - on: - tags: true - condition: '"$TRAVIS_PYTHON_VERSION" = "3.9" || "$TRAVIS_PYTHON_VERSION" = "2.7"' - distributions: "sdist bdist_wheel" - -install: travis_wait 30 python travis/travis_shim.py install -script: travis_wait 60 python travis/travis_shim.py build diff --git a/build.py b/build.py index cc03828..1f52196 100644 --- a/build.py +++ b/build.py @@ -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) diff --git a/src/main/python/fluent/sender.py b/src/main/python/fluent/sender.py index 0ce2e80..0b59cec 100644 --- a/src/main/python/fluent/sender.py +++ b/src/main/python/fluent/sender.py @@ -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" @@ -37,6 +37,7 @@ _endpoint_registry = {} + def to_bytes(s): if isinstance(s, str): return s.encode("utf-8") @@ -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: @@ -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) diff --git a/src/unittest/python/fluentd_tester.py b/src/unittest/python/fluentd_tester.py index 3be21a7..5a29e3b 100644 --- a/src/unittest/python/fluentd_tester.py +++ b/src/unittest/python/fluentd_tester.py @@ -1,6 +1,7 @@ import os import tempfile from collections import namedtuple + import docker """ @@ -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"): @@ -59,7 +61,7 @@ def port_generator(): data_dir=self.data_dir) def setUp(self): - + pass def tearDown(self): for config in self.instances: diff --git a/travis/travis_install.cmd b/travis/travis_install.cmd deleted file mode 100755 index 2d4df1b..0000000 --- a/travis/travis_install.cmd +++ /dev/null @@ -1,17 +0,0 @@ -choco config set --name="'webRequestTimeoutSeconds'" --value="'3600'" -choco config set --name="'commandExecutionTimeoutSeconds'" --value="'14400'" - -choco install -y %PYTHON_PACKAGE% --version=%PYTHON_VERSION% --timeout=14400 - -set PATH=%PYTHON_BIN%;%PYTHON_BIN%\Scripts;%PATH% - -pip install virtualenv -python -m virtualenv \venv -set PATH=%VENV_DIR%;%PATH% - -where python -where pip -pip install -U pip setuptools pybuilder -python --version -pip --version -pyb --version diff --git a/travis/travis_install.sh b/travis/travis_install.sh deleted file mode 100755 index 6599cf1..0000000 --- a/travis/travis_install.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash - -set -eu - -git clone https://github.com/pyenv/pyenv.git ~/.pyenv || true -git clone https://github.com/pyenv/pyenv-virtualenv.git ~/.pyenv/plugins/pyenv-virtualenv || true -git clone https://github.com/pyenv/pyenv-update.git ~/.pyenv/plugins/pyenv-update || true -echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.bash_profile -echo 'export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.bash_profile -echo -e 'if command -v pyenv 1>/dev/null 2>&1; then\n eval "$(pyenv init -)"\nfi' >> ~/.bash_profile -echo 'eval "$(pyenv virtualenv-init -)"' >> ~/.bash_profile - -set +eu -source ~/.bash_profile -set -eu - -rm -rf ~/.pyenv/versions/pyb-$PYTHON_VERSION || true -rm -rf ~/.pyenv/versions/$PYTHON_VERSION/envs/pyb-$PYTHON_VERSION || true - -pyenv update -pyenv install $PYTHON_VERSION -s -pyenv virtualenv $PYTHON_VERSION pyb-$PYTHON_VERSION - -set +eu -pyenv activate pyb-$PYTHON_VERSION -set -eu - -which python -which pip -pip install -U pip setuptools pybuilder -python --version -pip --version -pyb --version diff --git a/travis/travis_shim.py b/travis/travis_shim.py deleted file mode 100644 index 15aceb7..0000000 --- a/travis/travis_shim.py +++ /dev/null @@ -1,61 +0,0 @@ -import os -import subprocess -import sys -from os.path import join as jp, dirname, abspath, normcase as nc, expanduser - -SUFFIXES = {"osx": ".sh", - "linux": ".sh", - "windows": ".cmd"} - -if __name__ == "__main__": - environ = os.environ - os_name = environ["TRAVIS_OS_NAME"] - - if os_name == "windows": - environ["PYTHON_PACKAGE"] = "python%s" % (environ["PYTHON_VERSION"][0]) - environ["PYTHON_BIN"] = abspath("\\Python%s%s" % - (environ["PYTHON_VERSION"][0], environ["PYTHON_VERSION"][2])) - venv_bin_dir = nc(abspath("\\venv\\Scripts")) - environ["VENV_DIR"] = venv_bin_dir - else: - venv_bin_dir = nc(jp(expanduser("~"), ".pyenv", "versions", - "pyb-%s" % environ["PYTHON_VERSION"], - "bin")) - environ["VENV_DIR"] = venv_bin_dir - - script_dir = nc(abspath(dirname(sys.modules["__main__"].__file__))) - if sys.argv[1] == "install": - script = nc(jp(script_dir, "travis_%s%s" % (sys.argv[1], SUFFIXES[os_name]))) - print("Executing script %r" % script) - subprocess.check_call([script], env=environ) - elif sys.argv[1] == "build": - pyb_args = environ["PYB_ARGS"].split() - deploy_oses = environ["DEPLOY_OSES"].split() - deploy_pythons = environ["DEPLOY_PYTHONS"].split() - deploy_branches = environ["DEPLOY_BRANCHES"].split() - - is_production = environ["TRAVIS_PULL_REQUEST"] == "false" - if is_production: - print("Running Production build!") - if (environ["TRAVIS_OS_NAME"] in deploy_oses and - environ["PYTHON_VERSION"] in deploy_pythons and - environ["TRAVIS_BRANCH"] in deploy_branches): - print("This build will be deployed!") - pyb_args.append("upload") - else: - print("Running PR build!") - - project_dir = dirname(script_dir) - if os_name == "windows": - exec_name = jp(venv_bin_dir, "pyb.exe") - else: - exec_name = jp(venv_bin_dir, "pyb") - - environ["PATH"] = venv_bin_dir + os.pathsep + environ["PATH"] - cmd_args = [exec_name] + pyb_args - - print("Will run PyBuilder build with the following args: %r" % cmd_args) - - sys.stdout.flush() - - subprocess.check_call(cmd_args, env=environ)