summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-11-14 17:21:38 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-11-14 17:21:38 (GMT)
commit0efc419d4a82f6cb748baf59d1debcd1f933aaa7 (patch)
tree2363261912d7c6b458e9cd0677cbe5c3c904fc64
parentbfc972974ba24f2849c8ab6367cdd4f2e3cad225 (diff)
downloadcpython-0efc419d4a82f6cb748baf59d1debcd1f933aaa7.zip
cpython-0efc419d4a82f6cb748baf59d1debcd1f933aaa7.tar.gz
cpython-0efc419d4a82f6cb748baf59d1debcd1f933aaa7.tar.bz2
Adapt test and example after e39d1b6f0856.
Tarek’s commit fixed the way packaging configuration file markers are split under Windows, but these two files were not edited.
-rw-r--r--Doc/packaging/setupcfg.rst2
-rw-r--r--Lib/packaging/tests/test_config.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/packaging/setupcfg.rst b/Doc/packaging/setupcfg.rst
index 9b09a4c..a381017 100644
--- a/Doc/packaging/setupcfg.rst
+++ b/Doc/packaging/setupcfg.rst
@@ -779,7 +779,7 @@ needs to have its options defined in a dedicated section. Here's an example::
extra_compile_args =
-fPIC -O2
-DGECODE_VERSION=$(./gecode_version) -- sys.platform != 'win32'
- /DGECODE_VERSION='win32' -- sys.platform == 'win32'
+ /DGECODE_VERSION=win32 -- sys.platform == 'win32'
The section name must start with ``extension:``; the right-hand part is used as
the full name (including a parent package, if any) of the extension. Whitespace
diff --git a/Lib/packaging/tests/test_config.py b/Lib/packaging/tests/test_config.py
index a0e96d0..613d493 100644
--- a/Lib/packaging/tests/test_config.py
+++ b/Lib/packaging/tests/test_config.py
@@ -119,7 +119,7 @@ include_dirs = /usr/include/gecode
/usr/include/blitz
extra_compile_args = -fPIC -O2
-DGECODE_VERSION=$(./gecode_version) -- sys.platform != 'win32'
- /DGECODE_VERSION='win32' -- sys.platform == 'win32'
+ /DGECODE_VERSION=win32 -- sys.platform == 'win32'
language = cxx
# corner case: if the parent package of an extension is declared but