Skip to content
Browse files

Changes to build process

  • Loading branch information...
1 parent f6b7a64 commit 6405949f43ab3ea5ed4c45808389716d039a31b1 J�rgen Stenarson committed Feb 16, 2012
Showing with 10 additions and 36 deletions.
  1. +2 −1 .gitignore
  2. +3 −0 buildit.bat
  3. +3 −12 pyreadline/release.py
  4. +0 −3 setup.cfg
  5. +2 −20 setup.py
View
3 .gitignore
@@ -2,4 +2,5 @@ build
dist
pyreadline.egg-info/
__pycache__/
-*.bak
+*.bak
+MANIFEST
View
3 buildit.bat
@@ -0,0 +1,3 @@
+python setup.py build bdist_wininst --plat-name=win32
+python setup.py build bdist_wininst --plat-name=win-amd64
+python setup.py build sdist
View
15 pyreadline/release.py
@@ -23,7 +23,7 @@
branch = ''
-version = '2.0'
+version = '2.0-dev1'
revision = '$Revision$'
@@ -35,12 +35,7 @@
it is based on the ctypes based UNC readline package by Gary Bishop.
It is not complete. It has been tested for use with windows 2000 and windows xp.
-Version 1.7.1 includes fixes for 64-bit windows, thanks to Christoph Gohlke for
-helping out.
-
-Version 1.7 will be the last release with compatibility with 2.4 and 2.5. The next
-major release will target 2.6, 2.7 and 3.x. The 1.7 series will only receive bugfixes
-from now on.
+Version 2.0 runs on Python 2.6, 2.7, and 3.2 using the same code.
Features:
* keyboard text selection and copy/paste
@@ -66,7 +61,7 @@
'Jack': ('Jack Trainor', ''),
}
-url = 'http://ipython.scipy.org/moin/PyReadline/Intro'
+url = 'http://http://ipython.org/pyreadline.html'
download_url = 'https://launchpad.net/pyreadline/+download'
@@ -80,11 +75,7 @@
'Environment :: Console',
'Operating System :: Microsoft :: Windows',
'License :: OSI Approved :: BSD License',
- 'Programming Language :: Python :: 2.4',
- 'Programming Language :: Python :: 2.5',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.2',
]
-
-
View
3 setup.cfg
@@ -1,3 +0,0 @@
-[egg_info]
-tag_build=.dev
-tag_svn_revision=1
View
22 setup.py
@@ -11,30 +11,13 @@
import os
import sys
import glob
+from distutils.core import setup
# BEFORE importing distutils, remove MANIFEST. distutils doesn't properly
# update it when the contents of directories change.
if os.path.exists('MANIFEST'): os.remove('MANIFEST')
#
-extra = {}
-_distribute = False
-
-try:
- import setuptools
- setup = setuptools.setup
- _distribute = getattr(setuptools, '_distribute', False)
-except ImportError:
- from distutils.core import setup
-
-if sys.version_info >= (3, 0):
- if _distribute == False:
- raise RuntimeError('You must installed `distribute` to setup pyreadline with Python3')
-
- extra.update(
- use_2to3=True
- )
-
exec(compile(open('pyreadline/release.py').read(), 'pyreadline/release.py', 'exec'))
try:
@@ -67,7 +50,6 @@
packages = packages,
package_data = {'pyreadline':['configuration/*']},
data_files = [],
- cmdclass = cmd_class,
- **extra
+ cmdclass = cmd_class
)

0 comments on commit 6405949

Please sign in to comment.
Something went wrong with that request. Please try again.