Skip to content

Commit

Permalink
Merge pull request #206 from alexmv/no-bleeding-edge-cython
Browse files Browse the repository at this point in the history
Stop requiring a bleeding-edge Cython.
  • Loading branch information
Erotemic committed Mar 4, 2023
2 parents 6ee9f63 + 152c0d4 commit 6ffb10d
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 7 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
Changes
=======

4.0.3
~~~~
* FIX: Stop requiring bleeding-edge Cython unless necesasry (for Python 3.12). #206

4.0.2
~~~~~
* FIX: AttributeError on certain methods. #191
Expand Down
5 changes: 2 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ To check out the development sources, you can use Git_::
You may also download source tarballs of any snapshot from that URL.

Source releases will require a C compiler in order to build `line_profiler`.
In addition, git checkouts will also require Cython_ >= 0.10. Source releases
In addition, git checkouts will also require Cython. Source releases
on PyPI should contain the pregenerated C sources, so Cython should not be
required in that case.

Expand Down Expand Up @@ -381,8 +381,7 @@ Frequently Asked Questions
It should contain the generated C sources already. If you are running into
problems, that may be a bug; let me know. If you are building from
a git checkout or snapshot, you will need Cython to generate the
C sources. You will probably need version 0.10 or higher. There is a bug in
some earlier versions in how it handles NULL PyObject* pointers.
C sources.

As of version ``3.0.0`` manylinux wheels containing the binaries are
available on pypi. Work is still needed to publish osx and win32 wheels.
Expand Down
2 changes: 1 addition & 1 deletion kernprof.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

# NOTE: This version needs to be manually maintained with the line_profiler
# __version__ for now.
__version__ = '4.0.2'
__version__ = '4.0.3'

# Guard the import of cProfile such that 3.x people
# without lsprof can still use this script.
Expand Down
2 changes: 1 addition & 1 deletion line_profiler/line_profiler.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
f'Has it been compiled? Underlying error is ex={ex!r}'
)

__version__ = '4.0.2'
__version__ = '4.0.3'


def load_ipython_extension(ip):
Expand Down
6 changes: 5 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
[build-system]
requires = ["setuptools>=41.0.1", "Cython>=3.0.0a11"]
requires = [
"setuptools>=41.0.1",
"Cython==3.0.0a11 ; python_version < '4.0' and python_version >= '3.12' ",
"Cython>=0.29.24,<=3.0.0a11 ; python_version < '3.12' ",
]
build-backend = "setuptools.build_meta" # comment out to disable pep517

[tool.coverage.run]
Expand Down
4 changes: 3 additions & 1 deletion requirements/build.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Cython is the only hard requirement
Cython>=3.0.0a11
Cython==3.0.0a11 ; python_version < '4.0' and python_version >= '3.12' # Python 3.12+
Cython>=0.29.24,<=3.0.0a11 ; python_version < '3.12' # Python 3.6 - 3.11

scikit-build>=0.11.1
cmake>=3.21.2
ninja>=1.10.2
Expand Down

0 comments on commit 6ffb10d

Please sign in to comment.