Merge branch 'master' into patch-3

This commit is contained in:
Kyle Altendorf 2024-05-09 12:59:49 -04:00 committed by GitHub
commit 91707d1a14
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 4 deletions

View File

@ -51,8 +51,8 @@ jobs:
matrix: macos matrix: macos
emoji: 🍎 emoji: 🍎
runs-on: runs-on:
arm: [macos-14] arm: [macos-latest]
intel: [macos-latest] intel: [macos-12]
universal2: [macos-12] universal2: [macos-12]
macosx-deployment-target: macosx-deployment-target:
arm: 11.0 arm: 11.0

View File

@ -99,4 +99,4 @@ artifacts:
deploy_script: deploy_script:
- appveyor AddCompilationMessage "Deploying to PyPI" - appveyor AddCompilationMessage "Deploying to PyPI"
- '%PYTHON_VER%\\python.exe -m pip install twine' - '%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'

View File

@ -3,7 +3,7 @@
# http://miniupnp.free.fr/ # http://miniupnp.free.fr/
# https://miniupnp.tuxfamily.org/ # https://miniupnp.tuxfamily.org/
# https://github.com/miniupnp/miniupnp # https://github.com/miniupnp/miniupnp
# (c) 2005-2023 Thomas Bernard # (c) 2005-2024 Thomas Bernard
# to install use : # to install use :
# $ make DESTDIR=/tmp/dummylocation install # $ make DESTDIR=/tmp/dummylocation install
# or # or
@ -178,8 +178,11 @@ check: validateminixml validateminiwget validateupnpreplyparse \
everything: all $(EXECUTABLES_ADDTESTS) everything: all $(EXECUTABLES_ADDTESTS)
# note : the python module "wheel" is required for bdist_wheel
pythonmodule: $(LIBRARY) $(SRCDIR)/miniupnpcmodule.c setup.py pythonmodule: $(LIBRARY) $(SRCDIR)/miniupnpcmodule.c setup.py
MAKE=$(MAKE) python setup.py build MAKE=$(MAKE) python setup.py build
MAKE=$(MAKE) python setup.py sdist
MAKE=$(MAKE) python setup.py bdist_wheel --skip-build
touch $@ touch $@
installpythonmodule: pythonmodule installpythonmodule: pythonmodule

View File

@ -86,6 +86,7 @@ libminiupnpc.a: $(OBJS)
pythonmodule: libminiupnpc.a pythonmodule: libminiupnpc.a
$(PYTHON) setupmingw32.py build $(SETUP_COMPILER_FLAG) $(PYTHON) setupmingw32.py build $(SETUP_COMPILER_FLAG)
$(PYTHON) setupmingw32.py install --skip-build $(PYTHON) setupmingw32.py install --skip-build
$(PYTHON) setupmingw32.py sdist
$(PYTHON) setupmingw32.py bdist_wheel --skip-build $(PYTHON) setupmingw32.py bdist_wheel --skip-build
miniupnpc.dll: miniupnpc.def $(OBJSDLL) miniupnpc.dll: miniupnpc.def $(OBJSDLL)