Skip to content

Commit bc4f4d5

Browse files
memoryn-oden
andauthored
v1.9.4 (#22)
- drop support for python 3.8, which is EOLed - add official support for python 3.13 - ...which sadly requires using a fork of PGPy; see discussion at: - SecurityInnovation/PGPy#462 - SecurityInnovation/PGPy#443 - update zstandard library, addressing #21 - update other libraries: - cryptography - ruff - mypy - remove use of openssl@1.1 from the macos/darwin tooling in the Makefile - include type hints (#20); thank you @tim25651! Co-authored-by: Nathan J. Mehl <n@oden.io>
1 parent dcdc461 commit bc4f4d5

4 files changed

Lines changed: 282 additions & 174 deletions

File tree

.github/workflows/pr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ jobs:
99
strategy:
1010
matrix:
1111
python-version:
12-
- "3.8"
1312
- "3.9"
1413
- "3.10"
1514
- "3.11"
1615
- "3.12"
16+
- "3.13"
1717

1818
steps:
1919
- uses: actions/checkout@v2

Makefile

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ RST=\033[0m
1111

1212
NAME := pydpkg
1313
PYMAJOR := 3
14-
PYREV := 11
15-
PYPATCH := 8
14+
PYREV := 13
15+
PYPATCH := 2
1616
PYVERSION := ${PYMAJOR}.${PYREV}.${PYPATCH}
1717
PYENV := ${HOME}/.pyenv/versions/${PYVERSION}
1818
VENV_NAME := ${NAME}-${PYVERSION}
@@ -31,28 +31,23 @@ uname_s := $(shell uname -s)
3131

3232
ifeq ($(uname_s),Darwin)
3333
PYENV_BIN := /usr/local/bin/pyenv
34-
BREW_SSL := /usr/local/opt/openssl@1.1
3534
BREW_READLINE := /usr/local/opt/readline
36-
export LDFLAGS = -L${BREW_SSL}/lib -L${BREW_READLINE}/lib
37-
export CFLAGS = -I${BREW_SSL}/include -I${BREW_READLINE}/include
38-
export CPPFLAGS = -I${BREW_SSL}/include -I${BREW_READLINE}/include
35+
export LDFLAGS = -L${BREW_READLINE}/lib
36+
export CFLAGS = -I${BREW_READLINE}/include
37+
export CPPFLAGS = -I${BREW_READLINE}/include
3938

4039
ifeq ($(uname_m),arm64)
4140
ARCH_PREFIX := arch -x86_64
4241
endif
4342

4443
${BREW_READLINE}:
4544
${ARCH_PREFIX} brew install readline
46-
47-
${BREW_SSL}:
48-
${ARCH_PREFIX} brew install openssl@1.1
4945
else
5046
PYENV_BIN := ${HOME}/.pyenv/bin/pyenv
5147
${BREW_READLINE}: .PHONY
52-
${BREW_SSL}: .PHONY
5348
endif
5449

55-
${PYENV}: ${BREW_SSL} ${BREW_READLINE} ${PYENV_BIN}
50+
${PYENV}: ${BREW_READLINE} ${PYENV_BIN}
5651
${ARCH_PREFIX} ${PYENV_BIN} install -s ${PYVERSION}
5752

5853
${VENV}: ${PYENV}
@@ -82,7 +77,7 @@ nuke: clean
8277
@echo -e "${RED}*** Nuking your virtualenv: ${WHITE}${VENV_NAME}${RST}"
8378
rm -f .python-version
8479
${PYENV_BIN} uninstall -f ${VENV_NAME}
85-
rm -rf ${VENV_DIR}
80+
rm -rf ${VENV}
8681

8782
# usually there's no reason to uninstall python itself, and reinstalling
8883
# it is so very very slow

0 commit comments

Comments
 (0)