Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/hamperbot/hamper
Browse files Browse the repository at this point in the history
  • Loading branch information
mythmon committed Oct 29, 2014
2 parents 1acad25 + 476a5be commit e6bae41
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 18 deletions.
2 changes: 1 addition & 1 deletion Procfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
irc: python scripts/hamper
irc: hamper
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ $ source venv/bin/activate
$ python setup.py install
$ cp hamper.conf.dist hamper.conf
$ vim hamper.conf
$ ./scripts/hamper
$ hamper
```


Expand Down
7 changes: 2 additions & 5 deletions docs/quickstart.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,10 @@ forward, but if you want more details, read

## Running

The main entry point for Hamper is `scripts/hamper`, which imports the bot,
tries to set up the Python path if needed, and runs the main function.
You will need to tell Python where to find packages for now.
The main entry point for Hamper is the command `hamper` which starts the bot.

```bash
$ export PYTHONPATH=.
$ scripts/hamper
$ hamper
```

If all you configured the bot correctly, it should start up, load any
Expand Down
7 changes: 0 additions & 7 deletions scripts/hamper

This file was deleted.

8 changes: 4 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@

from hamper import version

#requires = open('requirements.txt').read().split('\n')
#requires = [dep for dep in requires if 'psycopg' not in dep]
requires = []
requires = open('requirements.txt').read().split('\n')

setup(
name='hamper',
Expand All @@ -17,8 +15,10 @@
author_email='mythmon@gmail.com',
url='https://www.github.com/hamperbot/hamper',
packages=find_packages(),
scripts=['scripts/hamper'],
entry_points = {
'console_scripts': [
'hamper = hamper.commander:main',
],
'hamperbot.plugins': [
'karma = hamper.plugins.karma:Karma',
'friendly = hamper.plugins.friendly:Friendly',
Expand Down

0 comments on commit e6bae41

Please sign in to comment.