Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
ed4e761
Workaround missing ssl.PROTOCOL_TLS
fgsch Nov 19, 2020
43f663f
Bump version
fgsch Nov 19, 2020
f5741aa
Merge pull request #54 from coreruleset/fgsch/python-workaround
fgsch Nov 20, 2020
ca4d8b7
feat(py3): apply 2to3 to move away from py2 syntax where needed
fzipi Nov 24, 2020
ddc66b2
Merge pull request #55 from fzipi/change-syntax-py3
fzipi Nov 25, 2020
1a7da1a
Test against python versions 3.6 to 3.9
fgsch Nov 26, 2020
308a2bd
Fail hard
fgsch Nov 26, 2020
753121d
Revert import introduced in 2to3
fgsch Nov 26, 2020
dee41d0
Fix code style introduced during 2to3
fgsch Nov 26, 2020
4e3f47d
Update codestyle package
fgsch Nov 26, 2020
0c95bef
Limit flakes and codestyle to Python 3.9
fgsch Nov 26, 2020
1f0445d
Move this temporarily
fgsch Nov 26, 2020
c28e3ef
Merge pull request #57 from coreruleset/fgsch/improve-ci
fgsch Nov 26, 2020
376fbda
feat(six): remove six
fzipi Nov 25, 2020
270a9c7
feat(util): add ensure helper functions
fzipi Nov 25, 2020
cee9c0b
fix(build): remove six dependency
fzipi Nov 25, 2020
aed5864
fix(typo): fixes typo in class
fzipi Nov 25, 2020
fb59dad
fix(util): use isinstance instead of type
fzipi Nov 25, 2020
c19fad1
fix(util): remove empty line
fzipi Nov 25, 2020
ee2421c
fix(str): ensure we are using string
fzipi Nov 25, 2020
f0380f7
fix(util): fix introduced typo
fzipi Nov 25, 2020
678daf0
feat(ci): test with multiple python versions
fzipi Nov 25, 2020
f33677e
fix(http): remove pending iteritems
fzipi Nov 25, 2020
b0b455c
fix(http): add additional items from cookies
fzipi Nov 25, 2020
c8a1212
fix(style): split lines
fzipi Nov 25, 2020
96f0b38
fix(flake8): remove spurious empty spaces
fzipi Nov 26, 2020
7e2f59f
Merge pull request #56 from fzipi/remove-six
fzipi Nov 26, 2020
2fc2fa5
Rearrange imports and minor polish
fgsch Nov 26, 2020
a2b79da
Use single quotes consistently
fgsch Nov 26, 2020
60c727a
Merge pull request #58 from coreruleset/fgsch/tidy-up
fgsch Nov 26, 2020
83b210d
feat(pypi): adds publishing using twine
Nov 18, 2020
0b3ae37
Merge pull request #52 from fzipi/pypi-publish
fzipi Nov 26, 2020
bb57cac
fix(encoding): remove encoding for base64 encoded request
fzipi Mar 23, 2021
686beb7
Merge pull request #59 from fzipi/remove-encoding
fzipi Mar 24, 2021
328932d
build: use git tag for version release
fzipi Mar 24, 2021
0769e7f
Merge pull request #60 from fzipi/version-from-tag
fzipi Mar 24, 2021
db5c3c2
docs: enhance pypi documentation
fzipi Mar 25, 2021
614b248
Merge pull request #61 from fzipi/add-pyproject-readme-pypi
fzipi Mar 25, 2021
cc23968
Bump pyyaml from 4.2b1 to 5.4
dependabot[bot] Mar 25, 2021
2bcb2f5
Merge pull request #62 from coreruleset/dependabot/pip/pyyaml-5.4
fzipi Mar 26, 2021
7f907db
Made tests more reliable, enabled and fixed some tests
theseion Mar 8, 2022
5daacce
Merge pull request #71 from theseion/performance-improvement-updated-…
fzipi Mar 8, 2022
8872cab
Updated dependencies
theseion Mar 4, 2022
2ea3270
Merge pull request #69 from theseion/performance-improvement-dependen…
fzipi Mar 9, 2022
ca0a902
Added mark_start() and mark_end() to give the log checker the chance …
theseion Mar 4, 2022
b21f687
Improved test parameterization
theseion Mar 4, 2022
6ffa312
Updated deprecated SSL configuration to remove warnings from tests wi…
theseion Mar 10, 2022
8204a00
Merge pull request #70 from theseion/performance-improvement-improved…
fzipi Mar 10, 2022
5509b0e
Rewrote http.py to be faster, mainly by using select() instead of tim…
theseion Mar 4, 2022
3bff7d6
Use constant for socket timeout
theseion Mar 11, 2022
10a82e6
Merge pull request #68 from theseion/performance-improvement-http
fzipi Mar 29, 2022
4996d6d
fix: harden GitHub Actions workflows
fzipi Mar 16, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,36 @@ name: ci

on: [push, pull_request]

permissions:
contents: read

jobs:
test:

runs-on: ubuntu-latest

strategy:
matrix:
python-version: [ '2.x', '3.x' ]
python-version: [ '3.6', '3.7', '3.8', '3.9', '3.10' ]

steps:
- name: Checkout repo
uses: actions/checkout@v2
uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@e9aba2c848f5ebd159c070c61ea2c4e2b122355e # v2
with:
python-version: ${{ matrix.python-version }}
- name: Install requirements
run: |
python -m pip install -r requirements.txt
python -m pip install pytest-codestyle || true
python -m pip install pytest-flakes
python setup.py install
- name: Check source files
if: matrix.python-version == '3.10'
run: |
python -m pip install pytest-pycodestyle
python -m pip install pytest-flakes
py.test --pycodestyle ftw
py.test --flakes ftw
- name: Run tests
run: |
py.test test/unit
Expand All @@ -32,6 +40,3 @@ jobs:
py.test test/integration/test_http.py
py.test test/integration/test_cookie.py --rule=test/integration/COOKIEFIXTURE.yaml
py.test test/integration/test_runner.py --rule=test/integration/BASICFIXTURE.yaml
py.test --pycodestyle ftw || true
py.test --flakes ftw
continue-on-error: true
31 changes: 31 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Upload Python Package

on:
release:
types: [created]

permissions:
contents: read

jobs:
deploy:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2
- name: Set up Python
uses: actions/setup-python@e9aba2c848f5ebd159c070c61ea2c4e2b122355e # v2
with:
python-version: '3.x'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install setuptools wheel twine
- name: Build and publish
env:
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
run: |
python setup.py sdist bdist_wheel
twine upload dist/*
2 changes: 1 addition & 1 deletion ftw/errors.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
class TestError(Exception):
def __init___(self, msg, context_args):
Exception.__init__(self, "{0} {1}".format(msg, context_args))
Exception.__init__(self, '{0} {1}'.format(msg, context_args))
Loading
Loading