Skip to content

Commit 9e697a0

Browse files
authored
Merge pull request #52 from wdpypere/move
remove python 2
2 parents ceae793 + 3334a01 commit 9e697a0

File tree

5 files changed

+9
-13
lines changed

5 files changed

+9
-13
lines changed

.github/workflows/testpatterns.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
runs-on: ubuntu-latest
77
strategy:
88
matrix:
9-
python-version: [2.7, 3.6]
9+
python-version: 3.6
1010
steps:
1111
- name: add logstash repo
1212
uses: myci-actions/add-deb-repo@4
@@ -19,14 +19,15 @@ jobs:
1919
- name: add logstash to path
2020
run: echo "/usr/share/logstash/bin" >> $GITHUB_PATH
2121
- name: Checkout code
22-
uses: actions/checkout@v2
22+
uses: actions/checkout@v3
2323
- name: Set up Python ${{ matrix.python-version }}
24-
uses: actions/setup-python@v2
24+
uses: actions/setup-python@v4
2525
with:
2626
python-version: ${{ matrix.python-version }}
2727
- name: Install dependencies
2828
run: |
2929
python -m pip install --upgrade pip
30-
pip install tox tox-gh-actions
30+
pip install tox
31+
git remote add hpcugent https://github.com/hpcugent/vsc-install.git
3132
- name: run tests
3233
run: tox -v -c tox.ini

Jenkinsfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ node {
1616
}
1717

1818
stage('test') {
19-
sh 'python2.7 -V'
2019
sh 'pip3 install --ignore-installed --prefix $PWD/.vsc-tox tox'
2120
sh 'export PATH=$PWD/.vsc-tox/bin:$PATH && export PYTHONPATH=$PWD/.vsc-tox/lib/python$(python3 -c "import sys; print(\\"%s.%s\\" % sys.version_info[:2])")/site-packages:$PYTHONPATH && tox -v -c tox.ini'
2221
sh 'rm -r $PWD/.vsc-tox'

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import glob
3333

3434
setup(name="logstash-patterns",
35-
version="1.1.12",
35+
version="1.1.13",
3636
description="Grok patterns for logstash",
3737
long_description="""Grok patterns for parsing log messages with logstash.
3838

tox.ini

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,9 @@
33
# DO NOT EDIT MANUALLY
44

55
[tox]
6-
envlist = py27,py36
6+
envlist = py36
77
skipsdist = true
88

9-
[gh-actions]
10-
python =
11-
2.7: py27
12-
3.6: py36
13-
149
[testenv]
1510
commands_pre =
1611
pip install 'setuptools<42.0'

vsc-ci.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
[vsc-ci]
22
pip3_install_tox=1
3-
py3_tests_must_pass=1
3+
py3_tests_must_pass=1
4+
py3_only=1

0 commit comments

Comments
 (0)