Skip to content

Commit ec4c928

Browse files
authored
Merge pull request #41 from segevfiner/refresh
Refresh
2 parents f283880 + 3f5df41 commit ec4c928

5 files changed

Lines changed: 24 additions & 22 deletions

File tree

.github/workflows/build-and-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
python-version: ['3.9', '3.12', '3.13']
18+
python-version: ['3.9', '3.13', '3.14']
1919

2020
steps:
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v7
2222
- name: Set up Python ${{ matrix.python-version }}
23-
uses: actions/setup-python@v5
23+
uses: actions/setup-python@v7
2424
with:
2525
python-version: ${{ matrix.python-version }}
2626
- name: Install dependencies

.github/workflows/docs.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ jobs:
1717
runs-on: ubuntu-latest
1818

1919
steps:
20-
- uses: actions/checkout@v4
21-
- uses: actions/setup-python@v5
20+
- uses: actions/checkout@v7
21+
- uses: actions/setup-python@v7
2222
with:
2323
python-version: '3.13'
2424
- name: Setup Pages
25-
uses: actions/configure-pages@v5
25+
uses: actions/configure-pages@v6
2626
- name: Install dependencies
2727
run: |
2828
sudo apt update
@@ -35,7 +35,7 @@ jobs:
3535
make html
3636
working-directory: ./docs
3737
- name: Upload artifact
38-
uses: actions/upload-pages-artifact@v3
38+
uses: actions/upload-pages-artifact@v5
3939
with:
4040
path: ./docs/_build/html
4141

@@ -49,4 +49,4 @@ jobs:
4949
steps:
5050
- name: Deploy to GitHub Pages
5151
id: deployment
52-
uses: actions/deploy-pages@v4
52+
uses: actions/deploy-pages@v5

.github/workflows/wheels.yml

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,46 +15,47 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
os: [ubuntu-22.04, windows-2019, macOS-13]
18+
os: [ubuntu-22.04, windows-2022, macOS-14]
1919

2020
steps:
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v7
2222

23-
- uses: actions/setup-python@v5
23+
- uses: actions/setup-python@v7
2424
with:
2525
python-version: '3.13'
2626

2727
- name: Install dependencies (Windows)
2828
if: runner.os == 'Windows'
2929
run: |
30-
Invoke-WebRequest https://nmap.org/npcap/dist/npcap-sdk-1.15.zip -OutFile npcap-sdk.zip
30+
Invoke-WebRequest https://nmap.org/npcap/dist/npcap-sdk-1.16.zip -OutFile npcap-sdk.zip
3131
Expand-Archive npcap-sdk.zip
3232
echo "NPCAP_SDK=$(Resolve-Path npcap-sdk)" >> $env:GITHUB_ENV
3333
3434
- name: Build sdist
35-
if: matrix.os == 'ubuntu-20.04'
35+
if: matrix.os == 'ubuntu-22.04'
3636
run: |
3737
pip install build
3838
python -m build --sdist
3939
4040
- name: Build wheels
41-
uses: pypa/cibuildwheel@v2.23.3
41+
uses: pypa/cibuildwheel@v4.2.0
4242
env:
43-
CIBW_SKIP: 'pp* *-musllinux*'
43+
CIBW_SKIP: '*t-* *-musllinux*'
4444
CIBW_ARCHS_MACOS: universal2
4545
CIBW_BEFORE_ALL_LINUX: >
4646
yum install -y flex bison libnl3-devel bluez-libs-devel &&
47-
curl https://www.tcpdump.org/release/libpcap-1.10.5.tar.gz -O &&
48-
tar xf libpcap-1.10.5.tar.gz &&
49-
cd libpcap-1.10.5 &&
47+
curl https://www.tcpdump.org/release/libpcap-1.10.6.tar.gz -O &&
48+
tar xf libpcap-1.10.6.tar.gz &&
49+
cd libpcap-1.10.6 &&
5050
./configure &&
5151
make -j2 &&
5252
make install
5353
CIBW_ENVIRONMENT_WINDOWS: NPCAP_SDK=$NPCAP_SDK
54+
CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: delvewheel repair -w {dest_dir} -v {wheel} --exclude wpcap.dll
5455
with:
5556
output-dir: dist
5657

57-
- uses: actions/upload-artifact@v4
58+
- uses: actions/upload-artifact@v7
5859
with:
5960
name: wheels-${{ matrix.os }}
6061
path: dist
@@ -74,7 +75,7 @@ jobs:
7475
url: https://pypi.org/p/cypcap
7576

7677
steps:
77-
- uses: actions/download-artifact@v4
78+
- uses: actions/download-artifact@v8
7879
with:
7980
pattern: wheels-*
8081
merge-multiple: true
@@ -86,6 +87,6 @@ jobs:
8687
packages-dir: dist
8788

8889
- name: Release
89-
uses: softprops/action-gh-release@v2
90+
uses: softprops/action-gh-release@v3
9091
with:
9192
files: dist

cypcap/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
from ._cypcap import *
66

77

8-
__version__ = u"0.6.2"
8+
__version__ = u"0.6.3"

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ def run(self):
194194
"Programming Language :: Python :: 3.11",
195195
"Programming Language :: Python :: 3.12",
196196
"Programming Language :: Python :: 3.13",
197+
"Programming Language :: Python :: 3.14",
197198
],
198199
keywords="libpcap pcap",
199200
zip_safe=False,

0 commit comments

Comments
 (0)