diff --git a/.github/workflows/miniupnpc_wheels.yml b/.github/workflows/miniupnpc_wheels.yml index 54dd5aa..1ee25c2 100644 --- a/.github/workflows/miniupnpc_wheels.yml +++ b/.github/workflows/miniupnpc_wheels.yml @@ -51,8 +51,8 @@ jobs: matrix: macos emoji: 🍎 runs-on: - arm: [macos-14] - intel: [macos-latest] + arm: [macos-latest] + intel: [macos-12] universal2: [macos-12] macosx-deployment-target: arm: 11.0 diff --git a/appveyor.yml b/appveyor.yml index e693425..04d01e6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -99,4 +99,4 @@ artifacts: deploy_script: - appveyor AddCompilationMessage "Deploying to PyPI" - '%PYTHON_VER%\\python.exe -m pip install twine' - - '%PYTHON_VER%\\python.exe -m twine upload -u %USER% -p %PASS% --skip-existing dist/*.whl' + - '%PYTHON_VER%\\python.exe -m twine upload -u %USER% -p %PASS% --skip-existing dist/*.whl dist/*.tar.gz' diff --git a/miniupnpc/Makefile b/miniupnpc/Makefile index 909e008..1d1aee7 100644 --- a/miniupnpc/Makefile +++ b/miniupnpc/Makefile @@ -3,7 +3,7 @@ # http://miniupnp.free.fr/ # https://miniupnp.tuxfamily.org/ # https://github.com/miniupnp/miniupnp -# (c) 2005-2023 Thomas Bernard +# (c) 2005-2024 Thomas Bernard # to install use : # $ make DESTDIR=/tmp/dummylocation install # or @@ -178,8 +178,11 @@ check: validateminixml validateminiwget validateupnpreplyparse \ everything: all $(EXECUTABLES_ADDTESTS) +# note : the python module "wheel" is required for bdist_wheel pythonmodule: $(LIBRARY) $(SRCDIR)/miniupnpcmodule.c setup.py MAKE=$(MAKE) python setup.py build + MAKE=$(MAKE) python setup.py sdist + MAKE=$(MAKE) python setup.py bdist_wheel --skip-build touch $@ installpythonmodule: pythonmodule diff --git a/miniupnpc/Makefile.mingw b/miniupnpc/Makefile.mingw index 9288aa5..d42ad6f 100644 --- a/miniupnpc/Makefile.mingw +++ b/miniupnpc/Makefile.mingw @@ -86,6 +86,7 @@ libminiupnpc.a: $(OBJS) pythonmodule: libminiupnpc.a $(PYTHON) setupmingw32.py build $(SETUP_COMPILER_FLAG) $(PYTHON) setupmingw32.py install --skip-build + $(PYTHON) setupmingw32.py sdist $(PYTHON) setupmingw32.py bdist_wheel --skip-build miniupnpc.dll: miniupnpc.def $(OBJSDLL)