Skip to content

Fix wheel builds for Windows #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wbarnha merged 14 commits into from
Dec 9, 2022
Merged

Fix wheel builds for Windows #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5bafe54
test build results of changing module name back to cchardet
wbarnha Dec 8, 2022
3939d34
Revert "test build results of changing module name back to cchardet"
wbarnha Dec 8, 2022
641df07
remove hardcoded chardet version limit
wbarnha Dec 8, 2022
b807ef2
use os.path.join to properly pass file paths
wbarnha Dec 9, 2022
7c81390
add forgotten separator
wbarnha Dec 9, 2022
ce5834e
try windows-2019
wbarnha Dec 9, 2022
1ee47a0
try changing extension name
wbarnha Dec 9, 2022
283ac2c
Revert "try changing extension name"
wbarnha Dec 9, 2022
ce26403
add CIBW_BEFORE_BUILD_WINDOWS call
wbarnha Dec 9, 2022
a9bac98
remove pipfiles and update requirements-dev.txt
wbarnha Dec 9, 2022
1b2fa48
Revert "remove pipfiles and update requirements-dev.txt"
wbarnha Dec 9, 2022
9aeefdb
Revert "add CIBW_BEFORE_BUILD_WINDOWS call"
wbarnha Dec 9, 2022
245295c
force pip installs and stop building 32 bit wheels
wbarnha Dec 9, 2022
eafa930
enable windows builds in main build and upload workflow
wbarnha Dec 9, 2022
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
5 changes: 2 additions & 3 deletions .github/workflows/build-and-upload-to-pypi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
# Windows builds currently broken
#os: [ubuntu-20.04, windows-2019, macos-11]
os: [ubuntu-20.04, macos-11]
os: [ubuntu-20.04, windows-2019, macos-11]

steps:
- uses: actions/checkout@v3
Expand All @@ -31,6 +29,7 @@ jobs:
CIBW_ARCHS: auto64
CIBW_BUILD: 'cp3*'
CIBW_SKIP: '*-musllinux_*'
CIBW_BEFORE_BUILD_WINDOWS: make pip

- uses: actions/upload-artifact@v3
with:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/test-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
build_wheels:
name: Build wheel on Windows ${{ matrix.config.arch }}
runs-on: windows-latest
runs-on: windows-2019
strategy:
matrix:
config:
Expand Down Expand Up @@ -98,3 +98,4 @@ jobs:
env:
CIBW_BUILD: cp37-* cp38-* cp39-* cp310-* cp311-*
CIBW_ARCHS: auto64
CIBW_BEFORE_BUILD_WINDOWS: make pip
2 changes: 0 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@ install: clean
python setup.py install

build-wheels-on-manylinux2014:
docker pull quay.io/pypa/manylinux2014_i686
docker pull quay.io/pypa/manylinux2014_x86_64
docker run --rm -ti -v `pwd`:/project -w /project quay.io/pypa/manylinux2014_i686 bash dockerfiles/buildwheel.sh
docker run --rm -ti -v `pwd`:/project -w /project quay.io/pypa/manylinux2014_x86_64 bash dockerfiles/buildwheel.sh

build: clean pip test sdist build-wheels-on-manylinux2014
2 changes: 1 addition & 1 deletion requirements-dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
chardet==3.0.4
chardet>=3.0.4
pytest==6.2.5
tox==3.20.1
Cython==0.29.32
Expand Down
62 changes: 31 additions & 31 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
except ImportError:
have_cython = False

cchardet_dir = 'src/cchardet/'
uchardet_dir = 'src/ext/uchardet/src'
cchardet_dir = os.path.join("src", "cchardet") + os.path.sep
uchardet_dir = os.path.join("src", "ext", "uchardet", "src")

if have_cython:
pyx_sources = glob.glob(cchardet_dir + '*.pyx')
Expand All @@ -35,35 +35,35 @@
uchardet_sources = [
os.path.join(uchardet_dir, 'CharDistribution.cpp'),
os.path.join(uchardet_dir, 'JpCntx.cpp'),
os.path.join(uchardet_dir, 'LangModels/LangArabicModel.cpp'),
os.path.join(uchardet_dir, 'LangModels/LangBulgarianModel.cpp'),
os.path.join(uchardet_dir, 'LangModels/LangCroatianModel.cpp'),
os.path.join(uchardet_dir, 'LangModels/LangCzechModel.cpp'),
os.path.join(uchardet_dir, 'LangModels/LangEsperantoModel.cpp'),
os.path.join(uchardet_dir, 'LangModels/LangEstonianModel.cpp'),
os.path.join(uchardet_dir, 'LangModels/LangFinnishModel.cpp'),
os.path.join(uchardet_dir, 'LangModels/LangFrenchModel.cpp'),
os.path.join(uchardet_dir, 'LangModels/LangDanishModel.cpp'),
os.path.join(uchardet_dir, 'LangModels/LangGermanModel.cpp'),
os.path.join(uchardet_dir, 'LangModels/LangGreekModel.cpp'),
os.path.join(uchardet_dir, 'LangModels/LangHungarianModel.cpp'),
os.path.join(uchardet_dir, 'LangModels/LangHebrewModel.cpp'),
os.path.join(uchardet_dir, 'LangModels/LangIrishModel.cpp'),
os.path.join(uchardet_dir, 'LangModels/LangItalianModel.cpp'),
os.path.join(uchardet_dir, 'LangModels/LangLithuanianModel.cpp'),
os.path.join(uchardet_dir, 'LangModels/LangLatvianModel.cpp'),
os.path.join(uchardet_dir, 'LangModels/LangMalteseModel.cpp'),
os.path.join(uchardet_dir, 'LangModels/LangPolishModel.cpp'),
os.path.join(uchardet_dir, 'LangModels/LangPortugueseModel.cpp'),
os.path.join(uchardet_dir, 'LangModels/LangRomanianModel.cpp'),
os.path.join(uchardet_dir, 'LangModels/LangRussianModel.cpp'),
os.path.join(uchardet_dir, 'LangModels/LangSlovakModel.cpp'),
os.path.join(uchardet_dir, 'LangModels/LangSloveneModel.cpp'),
os.path.join(uchardet_dir, 'LangModels/LangSwedishModel.cpp'),
os.path.join(uchardet_dir, 'LangModels/LangSpanishModel.cpp'),
os.path.join(uchardet_dir, 'LangModels/LangThaiModel.cpp'),
os.path.join(uchardet_dir, 'LangModels/LangTurkishModel.cpp'),
os.path.join(uchardet_dir, 'LangModels/LangVietnameseModel.cpp'),
os.path.join(uchardet_dir, 'LangModels','LangArabicModel.cpp'),
os.path.join(uchardet_dir, 'LangModels','LangBulgarianModel.cpp'),
os.path.join(uchardet_dir, 'LangModels','LangCroatianModel.cpp'),
os.path.join(uchardet_dir, 'LangModels','LangCzechModel.cpp'),
os.path.join(uchardet_dir, 'LangModels','LangEsperantoModel.cpp'),
os.path.join(uchardet_dir, 'LangModels','LangEstonianModel.cpp'),
os.path.join(uchardet_dir, 'LangModels','LangFinnishModel.cpp'),
os.path.join(uchardet_dir, 'LangModels','LangFrenchModel.cpp'),
os.path.join(uchardet_dir, 'LangModels','LangDanishModel.cpp'),
os.path.join(uchardet_dir, 'LangModels','LangGermanModel.cpp'),
os.path.join(uchardet_dir, 'LangModels','LangGreekModel.cpp'),
os.path.join(uchardet_dir, 'LangModels','LangHungarianModel.cpp'),
os.path.join(uchardet_dir, 'LangModels','LangHebrewModel.cpp'),
os.path.join(uchardet_dir, 'LangModels','LangIrishModel.cpp'),
os.path.join(uchardet_dir, 'LangModels','LangItalianModel.cpp'),
os.path.join(uchardet_dir, 'LangModels','LangLithuanianModel.cpp'),
os.path.join(uchardet_dir, 'LangModels','LangLatvianModel.cpp'),
os.path.join(uchardet_dir, 'LangModels','LangMalteseModel.cpp'),
os.path.join(uchardet_dir, 'LangModels','LangPolishModel.cpp'),
os.path.join(uchardet_dir, 'LangModels','LangPortugueseModel.cpp'),
os.path.join(uchardet_dir, 'LangModels','LangRomanianModel.cpp'),
os.path.join(uchardet_dir, 'LangModels','LangRussianModel.cpp'),
os.path.join(uchardet_dir, 'LangModels','LangSlovakModel.cpp'),
os.path.join(uchardet_dir, 'LangModels','LangSloveneModel.cpp'),
os.path.join(uchardet_dir, 'LangModels','LangSwedishModel.cpp'),
os.path.join(uchardet_dir, 'LangModels','LangSpanishModel.cpp'),
os.path.join(uchardet_dir, 'LangModels','LangThaiModel.cpp'),
os.path.join(uchardet_dir, 'LangModels','LangTurkishModel.cpp'),
os.path.join(uchardet_dir, 'LangModels','LangVietnameseModel.cpp'),
os.path.join(uchardet_dir, 'nsHebrewProber.cpp'),
os.path.join(uchardet_dir, 'nsCharSetProber.cpp'),
os.path.join(uchardet_dir, 'nsBig5Prober.cpp'),
Expand Down