Skip to content

Commit

Permalink
remove pex build (#587)
Browse files Browse the repository at this point in the history
  • Loading branch information
ekneg54 authored May 16, 2024
1 parent 53f94da commit 8329dbf
Show file tree
Hide file tree
Showing 15 changed files with 3 additions and 252 deletions.
44 changes: 0 additions & 44 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,50 +8,6 @@ on:
types: [opened, synchronize]

jobs:
build-pex:
runs-on: ubuntu-22.04

strategy:
matrix:
python-version: ["3.10"]

steps:
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
cache: "pip"

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install ansible
pip install virtualenv
pip install wheel
pip install pex
pip install pip-tools
pip-compile -o requirements.txt
- name: Repack confluent-kafka wheel
run: |
rm -rf tmp_pip_cache &&
mkdir tmp_pip_cache &&
cd tmp_pip_cache &&
python -m pip download $(cat ../requirements.txt | grep confluent-kafka) &&
unzip * &&
rm *.whl &&
python -m wheel pack .
- name: Build Pex File
run: |
pex . -r requirements.txt -o ./logprep.pex -c logprep --pex-root=tmp_pip_cache
- name: Upload PEX
uses: actions/upload-artifact@v3
with:
name: Logprep
path: logprep.pex

test:
runs-on: ubuntu-22.04
Expand Down
44 changes: 0 additions & 44 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,50 +6,6 @@ on:
branches: [main]

jobs:
build-pex:
runs-on: ubuntu-22.04

strategy:
matrix:
python-version: ["3.10"]

steps:
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
cache: "pip"

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install ansible
pip install virtualenv
pip install wheel
pip install pex
pip install pip-tools
pip-compile -o requirements.txt
- name: Repack confluent-kafka wheel
run: |
rm -rf tmp_pip_cache &&
mkdir tmp_pip_cache &&
cd tmp_pip_cache &&
python -m pip download $(cat ../requirements.txt | grep confluent-kafka) &&
unzip * &&
rm *.whl &&
python -m wheel pack .
- name: Build Pex File
run: |
pex . -r requirements.txt -o ./logprep.pex -c logprep --pex-root=tmp_pip_cache
- name: Upload PEX
uses: actions/upload-artifact@v2
with:
name: Logprep
path: logprep.pex

test:
runs-on: ubuntu-22.04
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ __pycache__/
htmlcov/
doc/build/
doc/source/module_reference/
*.pex
*.out
.coverage*
tests/testdata/external/
Expand Down
42 changes: 0 additions & 42 deletions create_pex.yml

This file was deleted.

5 changes: 0 additions & 5 deletions doc/source/user_manual/verification.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,4 @@ The following command can be used to verify the configuration without running Lo
logprep test config $CONFIG
.. code-block:: bash
:caption: With PEX file
logprep.pex test config $CONFIG
Where :code:`$CONFIG` is the path to a configuration file (see :ref:`configuration`).
5 changes: 0 additions & 5 deletions logprep/util/auto_rule_tester/auto_rule_tester.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,6 @@
logprep test unit $CONFIG
.. code-block:: bash
:caption: With PEX file
logprep.pex test unit $CONFIG
Where :code:`$CONFIG` is the path to a configuration file
(see :ref:`configuration`).
Expand Down
12 changes: 3 additions & 9 deletions logprep/util/rule_dry_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@
logprep test dry-run $CONFIG $EVENTS
.. code-block:: bash
:caption: With a PEX file
logprep.pex test dry-run $CONFIG $EVENTS
Where :code:`$CONFIG` is the path to a configuration file
(see :ref:`configuration`).
The only required section in the configuration is :code:`pipeline`
Expand All @@ -29,14 +24,14 @@
(beginning with `[` and ending with `]`).
For multiple events it must be a list wrapped inside brackets, while each log object separated by a
comma.
By specifying the parameter :code:`--dry-run-input-type jsonl` a list of JSON lines can be used
By specifying the parameter :code:`--input-type jsonl` a list of JSON lines can be used
instead.
Additional output, like pseudonyms, will be printed if :code:`--dry-run-full-output` is added.
Additional output, like pseudonyms, will be printed if :code:`--full-output` is added.
.. code-block:: bash
:caption: Example for execution with a JSON lines file (dry-run-input-type jsonl) printing all results, including pseudonyms (dry-run-full-output)
logprep.pex tests/testdata/config/config-dry-run.yml --dry-run tests/testdata/input_logdata/wineventlog_raw.jsonl --dry-run-input-type jsonl --dry-run-full-output
logprep test dry-run ./tests/testdata/config/config.yml tests/testdata/input_logdata/wineventlog_raw.jsonl --input-type jsonl --full-output 1
"""

import json
Expand All @@ -46,7 +41,6 @@
from copy import deepcopy
from difflib import ndiff
from functools import cached_property
from pathlib import Path

from colorama import Back, Fore
from ruamel.yaml import YAML
Expand Down
Empty file removed tests/ci/__init__.py
Empty file.
33 changes: 0 additions & 33 deletions tests/ci/kafka-service/Dockerfile

This file was deleted.

4 changes: 0 additions & 4 deletions tests/ci/kafka-service/supervisor_conf/kafka.conf

This file was deleted.

4 changes: 0 additions & 4 deletions tests/ci/kafka-service/supervisor_conf/zookeeper.conf

This file was deleted.

28 changes: 0 additions & 28 deletions tests/ci/runner-image/Dockerfile

This file was deleted.

Empty file removed tests/ci/runner-image/__init__.py
Empty file.
Empty file.
33 changes: 0 additions & 33 deletions tests/ci/runner-image/scripts/compare_json.py

This file was deleted.

0 comments on commit 8329dbf

Please sign in to comment.