Commits

Lynn Rees  committed 69e4441

- fix infrastructure

  • Participants
  • Parent commits 4599f69
  • Tags 0.5.4

Comments (0)

Files changed (12)

+What's new in 0.5.4
+===================
+
+* remove compatibility imports to separate packages
+
 What's new in 0.5.3
 ===================
 
 include LICENSE.txt
 include MANIFEST.in
 include README.rst
-include knife/requirements.txt
 include setup.cfg
+include depends/requirements.txt
 recursive-include knife *.py
   >>> one.original().minmax().pipe(two).merge().back().max().get()
   1000
   >>> one.original().minmax().pipe(two).merge().back().sum().get()
-  1002
-
-What's new in 0.5.2
-===================
-
-* verify PyPy 1.8, CPython 3.1 compatibility
-* made randomizing methods lazier
-* memoize some routines
+  1002

File depends/dev_requirements.txt

-stuf>=0.8.14
+stuf>=0.8.16
 parse>=1.4.1
 tox
 sphinx

File depends/docs_requirements.txt

 sphinx
 sphinxcontrib.spelling
-stuf>=0.8.14
+stuf>=0.8.16
 parse>=1.4.1

File depends/fabfile.py

-# -*- coding: utf-8 -*-
-'''knife fabfile'''
-
-from fabric.api import prompt, local, settings, env, lcd
-
-regup = '../setup.py register sdist --format=bztar,gztar,zip upload'
-nodist = 'rm -rf ../dist'
-sphinxup = '../setup.py upload_sphinx'
-
-
-def _promptup():
-    prompt('Enter tag: ', 'tag')
-    with settings(warn_only=True):
-        local('hg tag "%(tag)s"' % env)
-        local('hg push ssh://hg@bitbucket.org/lcrees/knife')
-        local('hg push github')
-
-
-def _test(val):
-    truth = val in ['py26', 'py27', 'py31', 'py32', 'pypy']
-    if truth is False:
-        raise KeyError(val)
-    return val
-
-
-def tox():
-    '''test knife'''
-    with lcd('../'):
-        local('tox')
-
-
-def docs():
-    with lcd('../docs/'):
-        local('make clean')
-        local('make html')
-        local('make linkcheck')
-        local('make doctest')
-
-
-def update_docs():
-    docs()
-    with settings(warn_only=True):
-        local('hg ci -m docmerge')
-        local('hg push ssh://hg@bitbucket.org/lcrees/knife')
-        local('hg push github')
-    local(sphinxup)
-
-
-def tox_recreate():
-    '''recreate knife test env'''
-    with lcd('../'):
-        prompt(
-            'Enter testenv: [py26, py27, py31, py32, pypy]',
-            'testenv',
-            validate=_test,
-        )
-        local('tox --recreate -e %(testenv)s' % env)
-
-
-def release():
-    '''release knife'''
-    docs()
-    local('hg update pu')
-    local('hg update next')
-    local('hg merge pu; hg ci -m automerge')
-    local('hg update maint')
-    local('hg merge default; hg ci -m automerge')
-    local('hg update default')
-    local('hg merge next; hg ci -m automerge')
-    local('hg update pu')
-    local('hg merge default; hg ci -m automerge')
-    _promptup()
-    local(regup)
-    local(sphinxup)
-    local(nodist)
-
-
-def releaser():
-    '''knife releaser'''
-    docs()
-    _promptup()
-    local(regup)
-    local(sphinxup)
-    local(nodist)
-
-
-def inplace():
-    '''in-place knife'''
-    docs()
-    with settings(warn_only=True):
-        local('hg push ssh://hg@bitbucket.org/lcrees/knife')
-        local('hg push github')
-    local('../setup.py sdist --format=bztar,gztar,zip upload')
-    local(sphinxup)
-    local(nodist)
-
-
-def release_next():
-    '''release knife from next branch'''
-    docs()
-    local('hg update maint')
-    local('hg merge default; hg ci -m automerge')
-    local('hg update default')
-    local('hg merge next; hg ci -m automerge')
-    local('hg update next')
-    local('hg merge default; hg ci -m automerge')
-    _promptup()
-    local(regup)
-    local(sphinxup)
-    local(nodist)

File depends/requirements.txt

-stuf>=0.8.14
+stuf>=0.8.16
 parse>=1.4.1

File docs/index.rst

   >>> one.original().minmax().pipe(two).merge().back().sum().get()
   1002
 
-What's new in 0.5.2
-===================
-
-* verify PyPy 1.8, CPython 3.1 compatibility
-* made randomizing methods lazier
-* memoize some routines
-
 Lazy knives
 ===========
 
+# -*- coding: utf-8 -*-
+'''knife fabfile'''
+
+from fabric.api import prompt, local, settings, env, lcd
+
+regup = './setup.py register sdist --format=bztar,gztar,zip upload'
+nodist = 'rm -rf ./dist'
+sphinxup = './setup.py upload_sphinx'
+
+
+def _promptup():
+    prompt('Enter tag: ', 'tag')
+    with settings(warn_only=True):
+        local('hg tag "%(tag)s"' % env)
+        local('hg push ssh://hg@bitbucket.org/lcrees/knife')
+        local('hg push github')
+
+
+def _test(val):
+    truth = val in ['py26', 'py27', 'py31', 'py32', 'pypy']
+    if truth is False:
+        raise KeyError(val)
+    return val
+
+
+def tox():
+    '''test knife'''
+    local('tox')
+
+
+def docs():
+    with lcd('docs/'):
+        local('make clean')
+        local('make html')
+        local('make linkcheck')
+        local('make doctest')
+
+
+def update_docs():
+    docs()
+    with settings(warn_only=True):
+        local('hg ci -m docmerge')
+        local('hg push ssh://hg@bitbucket.org/lcrees/knife')
+        local('hg push github')
+    local(sphinxup)
+
+
+def tox_recreate():
+    '''recreate knife test env'''
+    prompt(
+        'Enter testenv: [py26, py27, py31, py32, pypy]',
+        'testenv',
+        validate=_test,
+    )
+    local('tox --recreate -e %(testenv)s' % env)
+
+
+def release():
+    '''release knife'''
+    docs()
+    local('hg update pu')
+    local('hg update next')
+    local('hg merge pu; hg ci -m automerge')
+    local('hg update maint')
+    local('hg merge default; hg ci -m automerge')
+    local('hg update default')
+    local('hg merge next; hg ci -m automerge')
+    local('hg update pu')
+    local('hg merge default; hg ci -m automerge')
+    _promptup()
+    local(regup)
+    local(sphinxup)
+    local(nodist)
+
+
+def releaser():
+    '''knife releaser'''
+    docs()
+    _promptup()
+    local(regup)
+    local(sphinxup)
+    local(nodist)
+
+
+def inplace():
+    '''in-place knife'''
+    docs()
+    with settings(warn_only=True):
+        local('hg push ssh://hg@bitbucket.org/lcrees/knife')
+        local('hg push github')
+    local('./setup.py sdist --format=bztar,gztar,zip upload')
+    local(sphinxup)
+    local(nodist)
+
+
+def release_next():
+    '''release knife from next branch'''
+    docs()
+    local('hg update maint')
+    local('hg merge default; hg ci -m automerge')
+    local('hg update default')
+    local('hg merge next; hg ci -m automerge')
+    local('hg update next')
+    local('hg merge default; hg ci -m automerge')
+    _promptup()
+    local(regup)
+    local(sphinxup)
+    local(nodist)

File knife/version.py

 # -*- coding: utf-8 -*-
 
-__version__ = (0, 5, 3)
+__version__ = (0, 5, 4)
     from distutils.core import setup
 
 install_requires = list(l.strip() for l in open(
-    join(getcwd(), 'requirements.txt'), 'r',
+    join(getcwd(), 'depends/requirements.txt'), 'r',
 ).readlines())
 
 setup(
     name='knife',
-    version='0.5.3',
+    version='0.5.4',
     description='Pythonic remix of underscore.js: Things go in. Things get '
         'knifed. Things go out.',
     long_description=open(join(getcwd(), '../README.rst'), 'r').read(),
 
 [testenv:py32]
 deps=
-  hg+ssh://hg@bitbucket.org/lcrees/stuf@pu#egg=recipe
+  hg+ssh://hg@bitbucket.org/lcrees/stuf@pu#egg=stuf
   nose
   coverage
 commands=
   
 [testenv:pypy]
 deps=
-  hg+ssh://hg@bitbucket.org/lcrees/stuf@pu#egg=recipe
+  hg+ssh://hg@bitbucket.org/lcrees/stuf@pu#egg=stuf
   nose
   coverage
 commands=