Skip to content
Browse files

pep8, makefile: added pipcheckouttest

Signed-off-by: Armin Wieser <armin.wieser@gmail.com>
  • Loading branch information...
1 parent cbf3d8f commit d9bad21a7ca5b989a9a382f6eebcd09e13284a33 @awieser awieser committed
Showing with 30 additions and 19 deletions.
  1. +7 −0 Makefile
  2. +2 −1 memacs/ical.py
  3. +3 −3 memacs/photos.py
  4. +18 −15 setup.py
View
7 Makefile
@@ -44,3 +44,10 @@ countorgmodeentries:
upload:
python setup.py sdist upload
+
+pipcheckouttest:
+ mkdir -p /tmp/memacs-test
+ virtualenv /tmp/memacs-test --no-site-packages
+ source /tmp/memacs-test/bin/activate
+ pip install memacs
+ deactivate
View
3 memacs/ical.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-# Time-stamp: <2012-05-24 10:45:50 armin>
+# Time-stamp: <2012-05-24 10:59:01 armin>
import sys
import os
@@ -18,6 +18,7 @@
print e
sys.exit(3)
+
class CalendarMemacs(Memacs):
def _parser_add_arguments(self):
self._parser.add_argument("-c", "--calendar-url", dest="calendar_url",
View
6 memacs/photos.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-# Time-stamp: <2012-03-11 14:51:11 armin>
+# Time-stamp: <2012-05-24 10:59:20 armin>
import os
import logging
@@ -8,8 +8,8 @@
from lib.orgformat import OrgFormat
from lib.memacs import Memacs
from lib.orgproperty import OrgProperties
-import imghdr # TODO add to requirements
-from PIL import Image # TODO add to requirements
+import imghdr
+from PIL import Image
from PIL.ExifTags import TAGS
View
33 setup.py
@@ -2,18 +2,21 @@
import glob
setup(
- name = "memacs",
- packages = ["bin","memacs","memacs/lib", "memacs/lib/tests", "memacs/tests"],
- version = "0.0.14",
- description = "Memacs extracts metadata from many different existing data sources on your computer and generates files which are readable by GNU Emacs(Org-Mode).",
- author = "Karl Voit",
- author_email = "tools@Karl-Voit.at",
- url = "https://github.com/novoid/Memacs",
- download_url = "https://github.com/novoid/Memacs/zipball/master",
- keywords = ["org-mode", "org"],
- scripts = glob.glob("bin/memacs_*"),
- install_requires = ["PIL","icalendar>=3.0","feedparser"],
- classifiers = [
+ name="memacs",
+ packages=["bin", "memacs", "memacs/lib", "memacs/lib/tests",
+ "memacs/tests"],
+ version="0.0.15",
+ description="Memacs extracts metadata from many different existing " + \
+ " data sources on your computer and generates files which are readable" + \
+ " by GNU Emacs (Org-Mode).",
+ author="Karl Voit",
+ author_email="tools@Karl-Voit.at",
+ url="https://github.com/novoid/Memacs",
+ download_url="https://github.com/novoid/Memacs/zipball/master",
+ keywords=["org-mode", "org"],
+ scripts=glob.glob("bin/memacs_*"),
+ install_requires=["PIL", "icalendar>=3.0", "feedparser"],
+ classifiers=[
"Programming Language :: Python",
"Programming Language :: Python :: 2.7",
"Development Status :: 4 - Beta",
@@ -22,7 +25,7 @@
"License :: OSI Approved :: GNU General Public License (GPL)",
"Operating System :: OS Independent",
],
- long_description = """\
+ long_description="""\
Memacs
-----------------------------
*What were you doing* on February 14th of 2007? On *which tasks* were
@@ -35,6 +38,6 @@
Memacs extracts metadata (subjects, timestamps, contact information,
...) from many different existing data sources (file names, emails,
tweets, bookmarks, ...) on your computer and generates files which are
-readable by GNU Emacs with Org-mode.
+readable by GNU Emacs with Org-mode.
"""
-)
+)

0 comments on commit d9bad21

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