Skip to content

Commit

Permalink
Fix: #730 and #733 - Unable to build/install under Python 3.12 (#738)
Browse files Browse the repository at this point in the history
Co-authored-by: Thomas J. Fan <[email protected]>
  • Loading branch information
T1t4m1un and thomasjpfan authored Dec 5, 2023
1 parent e28b11a commit 2ee1e21
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 21,518 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
name: "Build ${{ matrix.pyver }} on ${{ matrix.os }}"
strategy:
matrix:
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
os: [ubuntu-latest, windows-latest]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -31,7 +31,7 @@ jobs:
name: "Build aarch64 ${{ matrix.pyver }}"
strategy:
matrix:
pyver: [cp37-cp37m, cp38-cp38, cp39-cp39, cp310-cp310, cp311-cp311]
pyver: [cp37-cp37m, cp38-cp38, cp39-cp39, cp310-cp310, cp311-cp311, cp312-cp312]
fail-fast: false
runs-on: ubuntu-latest
env:
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -224,4 +224,4 @@ dmypy.json
# End of https://www.gitignore.io/api/pycharm,python,visualstudiocode

# Custom rules (everything added below won't be overriden by 'Generate .gitignore File' if you use 'Update' option)

wordcloud/query_integral_image.c
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
matplotlib>=1.5.3
numpy>=1.6.1
pillow
cython
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import io
from setuptools import setup
from setuptools.extension import Extension
import versioneer

from Cython.Build import cythonize

with io.open('README.md', encoding='utf_8') as fp:
readme = fp.read()

Expand All @@ -18,8 +19,7 @@
long_description_content_type='text/markdown; charset=UTF-8',
license='MIT',
install_requires=['numpy>=1.6.1', 'pillow', 'matplotlib'],
ext_modules=[Extension("wordcloud.query_integral_image",
["wordcloud/query_integral_image.c"])],
ext_modules=cythonize("wordcloud/query_integral_image.pyx"),
entry_points={'console_scripts': ['wordcloud_cli=wordcloud.__main__:main']},
packages=['wordcloud'],
package_data={'wordcloud': ['stopwords', 'DroidSansMono.ttf']}
Expand Down
4 changes: 2 additions & 2 deletions versioneer.py
Original file line number Diff line number Diff line change
Expand Up @@ -339,9 +339,9 @@ def get_config_from_root(root):
# configparser.NoOptionError (if it lacks "VCS="). See the docstring at
# the top of versioneer.py for instructions on writing your setup.cfg .
setup_cfg = os.path.join(root, "setup.cfg")
parser = configparser.SafeConfigParser()
parser = configparser.ConfigParser()
with open(setup_cfg, "r") as f:
parser.readfp(f)
parser.read_file(f)
VCS = parser.get("versioneer", "VCS") # mandatory

def get(parser, name):
Expand Down
Loading

0 comments on commit 2ee1e21

Please sign in to comment.