diff options
| -rw-r--r-- | .hgignore | 1 | ||||
| -rw-r--r-- | MANIFEST.in | 2 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | allkits.cmd | 15 | ||||
| -rw-r--r-- | notsource.txt | 1 | ||||
| -rw-r--r-- | setup.py | 10 | ||||
| -rw-r--r-- | three.cmd | 9 |
7 files changed, 18 insertions, 22 deletions
@@ -15,7 +15,6 @@ coverage.egg-info dist
htmlcov
MANIFEST
-py3k
setuptools-*.egg
three
diff --git a/MANIFEST.in b/MANIFEST.in index 5a7dcabe..ce340f66 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -2,8 +2,6 @@ include coverage.egg-info/*.* include coverage/*.py include coverage/htmlfiles/*.* -include py3k/*.py -include py3k/htmlfiles/*.* include ez_setup.py include setup.py include README.txt @@ -7,7 +7,7 @@ TEST_ZIP = test/zipmods.zip clean: python test/test_farm.py clean - -rm -rf build coverage.egg-info dist htmlcov py3k three + -rm -rf build coverage.egg-info dist htmlcov three -rm -f *.pyd */*.pyd -rm -f *.pyc */*.pyc */*/*.pyc */*/*/*.pyc */*/*/*/*.pyc */*/*/*/*/*.pyc -rm -f *.pyo */*.pyo */*/*.pyo */*/*/*.pyo */*/*/*/*.pyo */*/*/*/*/*.pyo diff --git a/allkits.cmd b/allkits.cmd index 1e4fe221..a83cac7b 100644 --- a/allkits.cmd +++ b/allkits.cmd @@ -8,19 +8,18 @@ python setup.py bdist_wininst call \ned\bin\switchpy 26
python setup.py bdist_wininst
-@REM Source kit: Py2k in "coverage", Py3k in "py3k"
-del /q py3k\*.*
-mkdir py3k
-xcopy /s/h/i/e /exclude:notsource.txt three\coverage\*.py py3k
set TAR_OPTIONS=--group=100
python setup.py sdist --formats=gztar
set TAR_OPTIONS=
-@REM py3k windows kit: code still needs to be in py3k, so move it.
+@REM Py3k
cd three
call \ned\bin\switchpy 31
-xcopy /s/h/i/e coverage py3k
python setup.py bdist_wininst
-rmdir/s/q py3k
+
+set TAR_OPTIONS=--group=100
+python setup.py sdist --formats=gztar
+set TAR_OPTIONS=
+
cd ..
-copy three\dist\*.exe dist
+copy three\dist\*.* dist
diff --git a/notsource.txt b/notsource.txt index f75dec4f..240f6644 100644 --- a/notsource.txt +++ b/notsource.txt @@ -3,6 +3,5 @@ \.hg\
\build\
\dist\
-\py3k\
\three\
.egg-info
@@ -24,7 +24,7 @@ Topic :: Software Development :: Testing """ # Pull in the tools we need. -import sys +import os, sys if sys.hexversion < 0x03000000: # In Py 2.x, use setuptools. @@ -34,6 +34,7 @@ if sys.hexversion < 0x03000000: from setuptools import setup from distutils.core import Extension + package_name = 'coverage' # The 2.x sources are in coverage coverage_dir = "coverage" @@ -51,8 +52,9 @@ else: # No setuptools yet for Py 3.x, so do without. from distutils.core import setup, Extension - # The 3.x sources are in py3k - coverage_dir = "py3k" + package_name = 'coverage3k' + # The 3.x sources are in coverage + coverage_dir = "coverage" more_setup_args = dict( scripts = [ @@ -80,7 +82,7 @@ classifier_list.append("Development Status :: " + devstat) # Set it up! setup( - name = 'coverage', + name = package_name, version = __version__, packages = [ @@ -5,18 +5,17 @@ xcopy /s/h/i/e /exclude:notsource.txt . ..\three move ..\three .
cd three
call switchpy 31
-python \python31\Tools\Scripts\2to3.py -w coverage test mock.py
+python \python31\Tools\Scripts\2to3.py --write --nobackups --no-diffs coverage test mock.py
+
make clean
make testdata
-@REM We run coverage out of the source directory, so put built stuff there.
-python setup.py build
-copy build\lib.win32-3.1\coverage\tracer.pyd coverage
+python setup.py install
@REM Run both modes of tracer
set COVERAGE_TEST_TRACER=c
python \python31\Scripts\nosetests3 %1
-del coverage\tracer.pyd
+del \python31\lib\site-packages\coverage\tracer.pyd
set COVERAGE_TEST_TRACER=py
python \python31\Scripts\nosetests3 %1
|