Skip to content

Commit

Permalink
Re-enable windows
Browse files Browse the repository at this point in the history
  • Loading branch information
perklet committed Dec 31, 2023
1 parent f361e91 commit 946f7a7
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 14 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
# os: [ubuntu-22.04, macos-11, windows-2019]
os: [ubuntu-22.04, macos-11]
os: [ubuntu-22.04, macos-11, windows-2019]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
Expand Down Expand Up @@ -51,4 +50,3 @@ jobs:
- uses: pypa/[email protected]
with:
password: ${{ secrets.PYPI_TOKEN }}

4 changes: 1 addition & 3 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ on:
push:
branches:
- main
- master
- bugfix/*
- feature/*
jobs:
Expand All @@ -12,8 +11,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
# os: [ubuntu-22.04, macos-11, windows-2019]
os: [ubuntu-22.04, macos-11]
os: [ubuntu-22.04, macos-11, windows-2019]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
Expand Down
2 changes: 1 addition & 1 deletion curl_cffi/__version__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
# __description__ = metadata.metadata("curl_cffi")["Summary"]
# __version__ = metadata.version("curl_cffi")
__description__ = "libcurl ffi bindings for Python, with impersonation support"
__version__ = "0.6.0b4"
__version__ = "0.6.0b6"
__curl_version__ = Curl().version().decode()
8 changes: 2 additions & 6 deletions preprocess/download_so.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import os
import platform
import shutil
import sys
Expand Down Expand Up @@ -32,17 +31,14 @@ def reporthook(blocknum, blocksize, totalsize):
if uname.machine == "arm64":
# TODO Download my own build of libcurl-impersonate for M1 Mac
url = ""
filename = "./curl-impersonate.tar.gz"
else:
url = f"https:/yifeikong/curl-impersonate/releases/download/v{VERSION}/libcurl-impersonate-v{VERSION}.{uname.machine}-macos.tar.gz"
filename = "./curl-impersonate.tar.gz"
elif uname.system == "Windows":
url = f"https:/yifeikong/curl-impersonate-win/releases/download/v{VERSION}/curl-impersonate-chrome.tar.gz"
filename = "./curl-impersonate.tar.gz"
url = f"https:/yifeikong/curl-impersonate/releases/download/v{VERSION}/libcurl-impersonate-v{VERSION}.{uname.machine}-win32.tar.gz"
else:
url = f"https:/yifeikong/curl-impersonate/releases/download/v{VERSION}/libcurl-impersonate-v{VERSION}.{uname.machine}-linux-gnu.tar.gz"
filename = "./curl-impersonate.tar.gz"

filename = "./curl-impersonate.tar.gz"
if url:
print(f"Download libcurl-impersonate-chrome from {url}")
urlretrieve(url, filename, reporthook)
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "curl_cffi"
version = "0.6.0b4"
version = "0.6.0b6"
authors = [{ name = "Yifei Kong", email = "[email protected]" }]
description = "libcurl ffi bindings for Python, with impersonation support"
license = { file = "LICENSE" }
Expand Down

0 comments on commit 946f7a7

Please sign in to comment.