Skip to content

Commit

Permalink
extensions: use setuptools over distutils
Browse files Browse the repository at this point in the history
Problem: distutils was deprecated in Python 3.10 and removed in Python 3.12.

Use setuptools instead.

Adjust calls to setup.py in python Makefile.am as needed, re-autogen.

Fixes #65
  • Loading branch information
chu11 committed Aug 19, 2024
1 parent 2824c2c commit 46ed75d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions src/extensions/python/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ all: genderssetup.py libgendersmodule.c genders.py
$(PYTHON) genderssetup.py build

install:
$(PYTHON) genderssetup.py install --prefix=$(PYTHON_DESTDIR)$(prefix) --exec-prefix=$(PYTHON_DESTDIR)$(exec_prefix)
$(PYTHON) genderssetup.py install --single-version-externally-managed --root=/ --prefix=$(PYTHON_DESTDIR)$(prefix) --exec-prefix=$(PYTHON_DESTDIR)$(exec_prefix)

pure_install:
$(PYTHON) genderssetup.py install --prefix=$(PYTHON_DESTDIR)$(prefix) --exec-prefix=$(PYTHON_DESTDIR)$(exec_prefix)
$(PYTHON) genderssetup.py install --single-version-externally-managed --root=/ --prefix=$(PYTHON_DESTDIR)$(prefix) --exec-prefix=$(PYTHON_DESTDIR)$(exec_prefix)

install-data-local:
$(PYTHON) genderssetup.py install --prefix=$(PYTHON_DESTDIR)$(prefix) --exec-prefix=$(PYTHON_DESTDIR)$(exec_prefix)
$(PYTHON) genderssetup.py install --single-version-externally-managed --root=/ --prefix=$(PYTHON_DESTDIR)$(prefix) --exec-prefix=$(PYTHON_DESTDIR)$(exec_prefix)

clean:
rm -rf build
Expand Down
6 changes: 3 additions & 3 deletions src/extensions/python/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -489,13 +489,13 @@ uninstall-am:
@WITH_PYTHON_EXTENSIONS_TRUE@ $(PYTHON) genderssetup.py build

@WITH_PYTHON_EXTENSIONS_TRUE@install:
@WITH_PYTHON_EXTENSIONS_TRUE@ $(PYTHON) genderssetup.py install --prefix=$(PYTHON_DESTDIR)$(prefix) --exec-prefix=$(PYTHON_DESTDIR)$(exec_prefix)
@WITH_PYTHON_EXTENSIONS_TRUE@ $(PYTHON) genderssetup.py install --single-version-externally-managed --root=/ --prefix=$(PYTHON_DESTDIR)$(prefix) --exec-prefix=$(PYTHON_DESTDIR)$(exec_prefix)

@WITH_PYTHON_EXTENSIONS_TRUE@pure_install:
@WITH_PYTHON_EXTENSIONS_TRUE@ $(PYTHON) genderssetup.py install --prefix=$(PYTHON_DESTDIR)$(prefix) --exec-prefix=$(PYTHON_DESTDIR)$(exec_prefix)
@WITH_PYTHON_EXTENSIONS_TRUE@ $(PYTHON) genderssetup.py install --single-version-externally-managed --root=/ --prefix=$(PYTHON_DESTDIR)$(prefix) --exec-prefix=$(PYTHON_DESTDIR)$(exec_prefix)

@WITH_PYTHON_EXTENSIONS_TRUE@install-data-local:
@WITH_PYTHON_EXTENSIONS_TRUE@ $(PYTHON) genderssetup.py install --prefix=$(PYTHON_DESTDIR)$(prefix) --exec-prefix=$(PYTHON_DESTDIR)$(exec_prefix)
@WITH_PYTHON_EXTENSIONS_TRUE@ $(PYTHON) genderssetup.py install --single-version-externally-managed --root=/ --prefix=$(PYTHON_DESTDIR)$(prefix) --exec-prefix=$(PYTHON_DESTDIR)$(exec_prefix)

@WITH_PYTHON_EXTENSIONS_TRUE@clean:
@WITH_PYTHON_EXTENSIONS_TRUE@ rm -rf build
Expand Down
2 changes: 1 addition & 1 deletion src/extensions/python/genderssetup.py.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from distutils.core import setup, Extension
from setuptools import setup, Extension

libgendersmodule = Extension('libgenders',
include_dirs = ['../../../config', '../../libgenders'],
Expand Down

0 comments on commit 46ed75d

Please sign in to comment.