Skip to content

Commit 02efda8

Browse files
committed
Begin transition to Python 3.12, new macOS signing
1 parent 98ba69b commit 02efda8

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

GNUmakefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ CXFREEZE_EXT ?= win-$(CXFREEZE_ARCH)-$(CXFREEZE_VER)
3838
SIGNTOOL ?= "c:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x86\signtool.exe"
3939

4040

41-
# PY[3] is the target Python interpreter; require 3.9+. Detect if it is named python3 or python.
41+
# PY[3] is the target Python interpreter; require 3.11+. Detect if it is named python3 or python.
4242
PY3 ?= $(shell python3 --version >/dev/null 2>&1 && echo python3 || echo python )
4343
VERSION = $(shell $(PY3) -c 'exec(open("slip39/version.py").read()); print( __version__ )')
4444
PLATFORM ?= $(shell $(PY3) -c "import sys; print( sys.platform )" )
4545
ifeq ($(PLATFORM),darwin)
46-
INSTALLER := dmg
46+
INSTALLER := pkg
4747
else ifeq ($(PLATFORM),win32)
4848
INSTALLER := msi
4949
else
@@ -210,7 +210,7 @@ $(VENV_LOCAL)/$(VENV_NAME):
210210
@rm -rf $@ && $(PY3) -m venv $(VENV_OPTS) $@ \
211211
&& cd $@ && git clone $(GHUB_REPO) -b $(GHUB_BRCH) \
212212
&& . ./bin/activate \
213-
&& make -C $(GHUB_NAME) install-dev install
213+
&& make -C $(GHUB_NAME) install-tests install
214214

215215
# Activate a given VirtualEnv, and go to its python-slip39 installation
216216
# o Creates a custom venv-activate.sh script in the venv, and uses it start
@@ -237,8 +237,8 @@ dist/slip39-$(VERSION)-py3-none-any.whl: build-check FORCE
237237
install: dist/slip39-$(VERSION)-py3-none-any.whl FORCE
238238
$(PY3) -m pip install --force-reinstall $<[all]
239239

240-
install-dev:
241-
$(PY3) -m pip install --upgrade -r requirements-dev.txt
240+
install-tests:
241+
$(PY3) -m pip install --upgrade -r requirements-tests.txt
242242

243243
# Building / Signing / Notarizing and Uploading the macOS or win32 App
244244
# o TODO: no signed and notarized package yet accepted for upload by macOS App Store
@@ -303,7 +303,7 @@ dist/slip39-$(VERSION)-win64.msi: build/exe.$(CXFREEZE_EXT)/SLIP-39.exe # signin
303303
#
304304
dist/SLIP-39-$(VERSION).dmg: dist/SLIP-39.app
305305
@echo -e "\n\n*** Creating and signing DMG $@..."
306-
npx create-dmg --overwrite $<
306+
npx create-dmg -v --overwrite --identity "$(PKGID)" $< dist/
307307
mv "SLIP-39 $(VERSION).dmg" "$@"
308308
@echo "Checking signature..."; ./SLIP-39.metadata/check-signature $@
309309

slip39/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
__version_info__ = ( 11, 2, 1 )
1+
__version_info__ = ( 12, 0, 0 )
22
__version__ = '.'.join( map( str, __version_info__ ))

0 commit comments

Comments
 (0)