Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
cython
Commits
53f29f6b
Commit
53f29f6b
authored
6 years ago
by
Stefan Behnel
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
git+ssh://github.com/cython/cython
parents
c3332126
cd72257c
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
11 additions
and
7 deletions
+11
-7
docs/conf.py
docs/conf.py
+1
-1
docs/src/reference/compilation.rst
docs/src/reference/compilation.rst
+2
-1
docs/src/tutorial/numpy.rst
docs/src/tutorial/numpy.rst
+2
-1
docs/src/userguide/numpy_tutorial.rst
docs/src/userguide/numpy_tutorial.rst
+2
-1
docs/src/userguide/wrapping_CPlusPlus.rst
docs/src/userguide/wrapping_CPlusPlus.rst
+2
-1
runtests.py
runtests.py
+1
-1
tests/run/simpcall.pyx
tests/run/simpcall.pyx
+1
-1
No files found.
docs/conf.py
View file @
53f29f6b
...
...
@@ -127,7 +127,7 @@ pygments_style = 'sphinx'
todo_include_todos
=
True
# intersphinx for standard :keyword:s (def, for, etc.)
intersphinx_mapping
=
{
'python'
:
(
'http://docs.python.org/3/'
,
None
)}
intersphinx_mapping
=
{
'python'
:
(
'http
s
://docs.python.org/3/'
,
None
)}
# If true, keep warnings as "system message" paragraphs in the built documents.
#keep_warnings = False
...
...
This diff is collapsed.
Click to expand it.
docs/src/reference/compilation.rst
View file @
53f29f6b
...
...
@@ -51,7 +51,8 @@ system, for example, it might look similar to this::
(``gcc`` will need to have paths to your included header files and paths
to libraries you want to link with.)
After compilation, a ``yourmod.so`` file is written into the target directory
After compilation, a ``yourmod.so`` (:file:`yourmod.pyd` for Windows)
file is written into the target directory
and your module, ``yourmod``, is available for you to import as with any other
Python module. Note that if you are not relying on ``cythonize`` or distutils,
you will not automatically benefit from the platform specific file extension
...
...
This diff is collapsed.
Click to expand it.
docs/src/tutorial/numpy.rst
View file @
53f29f6b
...
...
@@ -23,7 +23,8 @@ the Cython version -- Cython uses ".pyx" as its file suffix.
.. literalinclude:: ../../examples/tutorial/numpy/convolve_py.py
This should be compiled to produce :file:`yourmod.so` (for Linux systems). We
This should be compiled to produce :file:`yourmod.so` (for Linux systems, on Windows
systems, it will be :file:`yourmod.pyd`). We
run a Python session to test both the Python version (imported from
``.py``-file) and the compiled Cython module.
...
...
This diff is collapsed.
Click to expand it.
docs/src/userguide/numpy_tutorial.rst
View file @
53f29f6b
...
...
@@ -147,7 +147,8 @@ Cython version -- Cython uses ".pyx" as its file suffix.
.. literalinclude:: ../../examples/userguide/numpy_tutorial/convolve_py.py
:linenos:
This should be compiled to produce :file:`convolve_cy.so` (for Linux systems). We
This should be compiled to produce :file:`convolve_cy.so` (for Linux systems,
on Windows systems, this will be a ``.pyd`` file). We
run a Python session to test both the Python version (imported from
``.py``-file) and the compiled Cython module.
...
...
This diff is collapsed.
Click to expand it.
docs/src/userguide/wrapping_CPlusPlus.rst
View file @
53f29f6b
...
...
@@ -533,7 +533,8 @@ possible to declare them in the :file:`setup.py` file::
Cython will generate and compile the :file:`rect.cpp` file (from
:file:`rect.pyx`), then it will compile :file:`Rectangle.cpp`
(implementation of the ``Rectangle`` class) and link both object files
together into :file:`rect.so`, which you can then import in Python using
together into :file:`rect.so` on Linux, or :file:`rect.pyd` on windows,
which you can then import in Python using
``import rect`` (if you forget to link the :file:`Rectangle.o`, you will
get missing symbols while importing the library in Python).
...
...
This diff is collapsed.
Click to expand it.
runtests.py
View file @
53f29f6b
...
...
@@ -618,7 +618,7 @@ class TestBuilder(object):
test_class = CythonUnitTestCase
else:
test_class = CythonRunTestCase
elif mode in ['compile', 'error'
, 'test'
]:
elif mode in ['compile', 'error']:
test_class = CythonCompileTestCase
else:
raise KeyError('Invalid test mode: ' + mode)
...
...
This diff is collapsed.
Click to expand it.
tests/run/simpcall.pyx
View file @
53f29f6b
# mode:
test
# mode:
run
def
f
(
x
,
y
):
x
=
y
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment