Skip to content

Commit 7782be8

Browse files
cool-RRcool-RR
committed
-
1 parent 214eb27 commit 7782be8

File tree

19 files changed

+70
-107
lines changed

19 files changed

+70
-107
lines changed

‎docs/conf.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# -*- coding: utf-8 -*-
22
#
3-
# garlicsim documentation build configuration file, created by
3+
# python_toolbox documentation build configuration file, created by
44
# sphinx-quickstart on Wed May 12 17:33:00 2010.
55
#
66
# This file is execfile()d with the current directory set to its containing dir.
@@ -37,7 +37,7 @@
3737
master_doc = 'index'
3838

3939
# General information about the project.
40-
project = u'garlicsim'
40+
project = u'python_toolbox'
4141
copyright = u'2009-2011, Ram Rachum'
4242

4343
# The version info for the project you're documenting, acts as replacement for
@@ -158,7 +158,7 @@
158158
#html_file_suffix = ''
159159

160160
# Output file base name for HTML help builder.
161-
htmlhelp_basename = 'garlicsimdoc'
161+
htmlhelp_basename = 'python_toolboxdoc'
162162

163163

164164
# -- Options for LaTeX output --------------------------------------------------
@@ -172,7 +172,7 @@
172172
# Grouping the document tree into LaTeX files. List of tuples
173173
# (source start file, target name, title, author, documentclass [howto/manual]).
174174
latex_documents = [
175-
('index', 'garlicsim.tex', u'garlicsim Documentation',
175+
('index', 'python_toolbox.tex', u'Python Toolbox Documentation',
176176
u'Ram Rachum', 'manual'),
177177
]
178178

‎docs/make.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ if "%1" == "qthelp" (
7474
echo.
7575
echo.Build finished; now you can run "qcollectiongenerator" with the ^
7676
.qhcp project file in %BUILDDIR%/qthelp, like this:
77-
echo.^> qcollectiongenerator %BUILDDIR%\qthelp\garlicsim.qhcp
77+
echo.^> qcollectiongenerator %BUILDDIR%\qthelp\python_toolbox.qhcp
7878
echo.To view the help file:
79-
echo.^> assistant -collectionFile %BUILDDIR%\qthelp\garlicsim.ghc
79+
echo.^> assistant -collectionFile %BUILDDIR%\qthelp\python_toolbox.ghc
8080
goto end
8181
)
8282

‎docs/misc/mailing-lists.txt‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,15 @@
1010
Mailing Lists
1111
=============
1212

13-
There are three GarlicSim groups, a.k.a. mailing lists:
13+
There are three Python Toolbox groups, a.k.a. mailing lists:
1414

15-
- If you need help with GarlicSim, post a message on `the GarlicSim Google Group
16-
<https://groups.google.com/forum/#!forum/garlicsim>`_. If you need any kind of
17-
help, or have anything to say, say it there. You'll get a quick response.
15+
- If you need help with Python Toolbox, post a message on `the Python Toolbox
16+
Google Group <https://groups.google.com/forum/#!forum/python-toolbox>`_.
1817

19-
- If you want to help on the development of GarlicSim itself, come say hello on
20-
`the GarlicSim-dev Google Group
21-
<https://groups.google.com/forum/#!forum/garlicsim-dev>`_.
18+
- If you want to help on the development of Python Toolbox itself, come say
19+
hello on `the python-toolbox-dev Google Group
20+
<https://groups.google.com/forum/#!forum/python-toolbox-dev>`_.
2221

23-
- If you want to be informed on new releases of GarlicSim, sign up for `the low-traffic
24-
GarlicSim-announce Google Group
25-
<https://groups.google.com/forum/#!forum/garlicsim-announce>`_.
22+
- If you want to be informed on new releases of the Python Toolbox, sign up for
23+
`the low-traffic python-toolbox-announce Google Group
24+
<https://groups.google.com/forum/#!forum/python-toolbox-announce>`_.

‎python_toolbox/address_tools/object_to_string.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@ def describe(obj, shorten=False, root=None, namespace={}):
4747
(Like 'email.encoders'.)
4848
4949
`shorten=True` would try to skip redundant intermediate nodes. For example,
50-
if asked to describe `garlicsim.synchronous_crunching.simulate` with
50+
if asked to describe blocktododoc `.synchronous_crunching.simulate` with
5151
`shorten` on, it will return 'garlicsim.simulate', because the `simulate`
5252
function is available at this shorter address as well.
5353
5454
The parameters `root` and `namespace` help shorten addresses some more.
5555
It's assumed we can express any address in relation to `root`, or in
5656
relation to an item in `namespace`. For example, if `root=garlicsim` or
5757
`namespace=garlicsim.__dict__`, we could describe `garlicsim.simulate` as
58-
simply 'simulate'.
58+
simply 'simulate'. blocktododoc
5959
'''
6060

6161
# If it's the easy case of a module/function/class or something like that,
@@ -257,7 +257,7 @@ def shorten_address(address, root=None, namespace={}):
257257
258258
For example, 'garlicsim.synchronous_crunching.simulate' could be shortened
259259
to 'garlicsim.simulate', because the `simulate` function is available at
260-
this shorter address as well.
260+
this shorter address as well. blocktododoc
261261
262262
Note: `root` and `namespace` are only provided in order to access the
263263
object. This function doesn't do root- or namespace-shortening.

‎python_toolbox/bootstrap/bootstrap.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This program is distributed under the LGPL2.1 license.
33

44
'''
5-
A bootstrap module for garlicsim.
5+
A bootstrap module for `python_toolbox`.
66
77
It checks all prerequisites are installed.
88
'''
@@ -27,7 +27,7 @@
2727

2828
def __check_prerequisites():
2929
'''
30-
Check that all modules required for `garlicsim` are installed.
30+
Check that all modules required for `python_toolbox` are installed.
3131
3232
Returns a list of some imported modules: A reference to this list should be
3333
kept alive so to prevent the imported modules from being garbage-collected,
@@ -101,7 +101,7 @@ def __check_problematic_psyco_version():
101101
if psyco.version_info[0] >= 2:
102102
import warnings
103103
warnings.warn("You seem to have Psyco version 2 (or newer) "
104-
"installed. It might conflict with `garlicsim`, so "
104+
"installed. It might conflict with `python_toolbox`, so "
105105
"you may want to avoid using it. Psyco version 1.6 "
106106
"is fine and recommended.")
107107

‎setup.cfg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[nosetests]
2-
where=test_garlicsim
2+
where=test_python_toolbox
33

44
verbosity=3
55
detailed-errors=1
66

77
with-xunit=1
88

99
cover-erase=1
10-
cover-package=garlicsim,garlicsim_lib,garlicsim_wx,test_garlicsim,test_garlicsim_lib,test_garlicsim_wx
10+
cover-package=python_toolbox,test_python_toolbox

‎setup.py‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Copyright 2009-2011 Ram Rachum.
44
# This program is distributed under the LGPL2.1 license.
55

6-
'''Setuptools setup file for garlicsim.'''
6+
'''Setuptools setup file for `python_toolbox`.'''
77

88
import os
99
import setuptools
@@ -22,51 +22,52 @@
2222
### Finished ensuring correct Python version. #################################
2323

2424

25-
def get_garlicsim_packages():
25+
def get_python_toolbox_packages():
2626
'''
27-
Get all the packages in `garlicsim`.
27+
Get all the packages in `python_toolbox`.
2828
2929
Returns something like:
3030
31-
['garlicsim', 'garlicsim.misc',
31+
['python_toolbox', 'python_toolbox.caching',
3232
'python_toolbox.nifty_collections', ... ]
3333
3434
'''
35-
return ['garlicsim.' + p for p in
36-
setuptools.find_packages('./garlicsim')] + \
37-
['garlicsim']
35+
return ['python_toolbox.' + p for p in
36+
setuptools.find_packages('./python_toolbox')] + \
37+
['python_toolbox']
3838

3939

40-
def get_test_garlicsim_packages():
40+
def get_test_python_toolbox_packages():
4141
'''
42-
Get all the packages in `test_garlicsim`.
42+
Get all the packages in `test_python_toolbox`.
4343
4444
Returns something like:
4545
46-
['test_garlicsim', 'test_garlicsim.test_misc',
47-
'test_garlicsim.test_general_misc.test_nifty_collections', ... ]
46+
['test_python_toolbox', 'test_python_toolbox.test_caching',
47+
'test_python_toolbox.test_nifty_collections', ... ]
4848
4949
'''
50-
return ['test_garlicsim.' + p for p in
51-
setuptools.find_packages('./test_garlicsim')] + \
52-
['test_garlicsim']
50+
return ['test_python_toolbox.' + p for p in
51+
setuptools.find_packages('./test_python_toolbox')] + \
52+
['test_python_toolbox']
5353

5454

5555
def get_packages():
5656
'''
57-
Get all the packages in `garlicsim` and `test_garlicsim`.
57+
Get all the packages in `python_toolbox` and `test_python_toolbox`.
5858
5959
Returns something like:
6060
61-
['test_garlicsim', 'garlicsim', 'garlicsim.misc',
62-
'test_garlicsim.test_general_misc.test_nifty_collections', ... ]
61+
['test_python_toolbox', 'python_toolbox', 'python_toolbox.caching',
62+
'test_python_toolbox.test_nifty_collections', ... ]
6363
6464
'''
65-
return get_garlicsim_packages() + get_test_garlicsim_packages()
65+
return get_python_toolbox_packages() + get_test_python_toolbox_packages()
6666

6767

6868
my_long_description = \
6969
'''\
70+
blocktododoc
7071
GarlicSim is a platform for writing, running and analyzing simulations.
7172
7273
It can handle any kind of simulation: Physics, game theory, epidemic spread,
@@ -89,19 +90,18 @@ def get_packages():
8990

9091

9192
setuptools.setup(
92-
name='garlicsim',
93-
version='0.6.3',
93+
name='python_toolbox',
94+
version='0.0.1',
9495
requires=['distribute'],
9596
test_suite='nose.collector',
9697
install_requires=['distribute'],
9798
tests_require=['nose>=1.0.0'],
9899
description='Pythonic framework for working with simulations',
99100
author='Ram Rachum',
100101
author_email='ram@rachum.com',
101-
url='http://garlicsim.org',
102+
url='http://python_toolbox.org',
102103
packages=get_packages(),
103-
scripts=['garlicsim/scripts/start_simpack.py',
104-
'test_garlicsim/scripts/_test_garlicsim.py'],
104+
scripts=['test_python_toolbox/scripts/_test_python_toolbox.py'],
105105
license='LGPL v2.1',
106106
long_description = my_long_description,
107107
classifiers = my_classifiers,

‎test_python_toolbox/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright 2009-2011 Ram Rachum.
22
# This program is distributed under the LGPL2.1 license.
33

4-
'''Testing package for `garlicsim`.'''
4+
'''Testing package for `python_toolbox`.'''
55

66
import sys
77
import os.path

‎test_python_toolbox/scripts/_test_garlicsim.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33
# Copyright 2009-2011 Ram Rachum.
44
# This program is distributed under the LGPL2.1 license.
55

6-
'''Script for launching `garlicsim` tests when installed in local Python.'''
6+
'''
7+
Script for launching `python_toolbox` tests when installed in local Python.
8+
'''
79

810

9-
import test_garlicsim
11+
import test_python_toolbox
1012

1113

1214
if __name__ == '__main__':
13-
test_garlicsim.invoke_nose()
15+
test_python_toolbox.invoke_nose()

‎test_python_toolbox/test_address_tools/test_describe.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ def test_stdlib():
146146

147147
def test_local_modules():
148148
'''Test `describe` on local, relatively-imported modules.'''
149-
import garlicsim
149+
import python_toolbox
150150

151151
from .sample_module_tree import w
152152

@@ -164,7 +164,7 @@ def test_local_modules():
164164
result = describe(z, shorten=True, root=w, namespace='email')
165165
assert result == 'w.y.z'
166166

167-
result = describe(z, shorten=True, root=garlicsim, namespace=w)
167+
result = describe(z, shorten=True, root=python_toolbox, namespace=w)
168168
assert result == 'y.z'
169169

170170
result = describe(z, shorten=True, root=w.x)
@@ -261,8 +261,8 @@ def test_bad_module_name():
261261

262262
def test_function_in_something():
263263
'''Test `describe` doesn't fail when describing `{1: sum}`.'''
264-
if garlicsim.__version_info__ <= (0, 6, 3):
265-
raise nose.SkipTest("This test doesn't pass in `garlicsim` version "
264+
if python_toolbox.__version_info__ <= (0, 6, 3):
265+
raise nose.SkipTest("This test doesn't pass in `python_toolbox` version "
266266
"0.6.3 and below.")
267267
assert describe({1: sum}) == '{1: sum}'
268268
assert describe((sum, sum, list, chr)) == '(sum, sum, list, chr)'

0 commit comments

Comments
 (0)