[fedocal] master: Add first version of installer (e5c7e60)
by Pierre-YvesChibon
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit e5c7e6083df966ddab45dc2abc837da18ca04b09
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Tue Feb 12 15:13:18 2013 +0100
Add first version of installer
This commits adds the first version of the setup.py script and its
corresponding MANIFEST.in file providing the list of files and folders
that should be included in the sources when making a release.
>---------------------------------------------------------------
MANIFEST.in | 5 +++++
setup.py | 25 +++++++++++++++++++++++++
2 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..c16cce6
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,5 @@
+include LICENSE README.rst *.sample fedocal.wsgi requirements.txt
+include run_tests.sh createdb createdb.py
+recursive-include alembic *
+include doc/*
+
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..8c48269
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,25 @@
+#!/usr/bin/env python
+
+"""
+Setup script
+"""
+
+from setuptools import setup, find_packages
+from fedocal import __version__
+
+setup(
+ name = 'fedocal',
+ description = 'fedocal is a web based calendar application for Fedora.',
+ version = __version__,
+ author = 'Pierre-Yves Chibon',
+ author_email = 'pingou(a)pingoured.fr',
+ maintainer = 'Pierre-Yves Chibon',
+ maintainer_email = 'pingou(a)pingoured.fr',
+ license = 'GPLv3+',
+ download_url = 'https://fedorahosted.org/releases/f/e/fedocal/',
+ url = 'https://fedorahosted.org/fedocal/',
+ packages=['fedocal'],
+ include_package_data = True,
+ exclude_package_data={'': ['tests/*']},
+ install_requires=['Flask']
+ )
11 years, 2 months
[fedocal] master: Reorganize the import, add a __version__ and import the config file is one is provided (690a001)
by Pierre-YvesChibon
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit 690a00118d910eb4e38a9311a149247f24c10665
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Tue Feb 12 15:06:15 2013 +0100
Reorganize the import, add a __version__ and import the config file is one is provided
>---------------------------------------------------------------
fedocal/__init__.py | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/fedocal/__init__.py b/fedocal/__init__.py
index bf79ee6..9fcfe52 100644
--- a/fedocal/__init__.py
+++ b/fedocal/__init__.py
@@ -28,14 +28,15 @@
__requires__ = ['SQLAlchemy >= 0.7', 'jinja2 >= 2.4']
import pkg_resources
+__version__ = '0.1.0'
import datetime
-from dateutil.relativedelta import relativedelta
-import vobject
-from sqlalchemy.exc import SQLAlchemyError
-
import flask
+import os
+import vobject
+from dateutil.relativedelta import relativedelta
from flask_fas import FAS, cla_plus_one_required
+from sqlalchemy.exc import SQLAlchemyError
import forms as forms
import fedocal.fedocallib as fedocallib
@@ -48,10 +49,14 @@ APP = flask.Flask(__name__)
# set up FAS
FAS = FAS(APP)
APP.config.from_object('fedocal.default_config')
-APP.config.from_envvar('FEDOCAL_CONFIG')
+
+if 'FEDOCAL_CONFIG' in os.environ:
+ APP.config.from_envvar('FEDOCAL_CONFIG')
+
SESSION = fedocallib.create_session(APP.config['DB_URL'])
+
import fedocal.api
11 years, 2 months
[fedocal] master: Add --cover-erase to make sure we have up to date stats on the coverage (5e913c4)
by Pierre-YvesChibon
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit 5e913c404ec8ffd253436a4f98a9de2d9ad1cb09
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Tue Feb 12 11:02:57 2013 +0100
Add --cover-erase to make sure we have up to date stats on the coverage
>---------------------------------------------------------------
run_tests.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/run_tests.sh b/run_tests.sh
index e5b8373..06434b8 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -1,2 +1,2 @@
#!/bin/bash
-FEDOCAL_CONFIG=tests/fedocal_test.cfg PYTHONPATH=fedocal nosetests --with-coverage --cover-package=fedocal $*
+FEDOCAL_CONFIG=tests/fedocal_test.cfg PYTHONPATH=fedocal nosetests --with-coverage --cover-erase --cover-package=fedocal $*
11 years, 2 months
[fedocal] master: Extend flask tests (bd741e5)
by Pierre-YvesChibon
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit bd741e52795b6e47ce182ee3a470941392696efd
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Mon Feb 11 13:14:23 2013 +0100
Extend flask tests
>---------------------------------------------------------------
fedocal/tests/test_flask.py | 50 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 50 insertions(+), 0 deletions(-)
diff --git a/fedocal/tests/test_flask.py b/fedocal/tests/test_flask.py
index 40524c8..ba4525a 100644
--- a/fedocal/tests/test_flask.py
+++ b/fedocal/tests/test_flask.py
@@ -137,6 +137,42 @@ class Flasktests(Modeltests):
self.assertTrue(' <a href="/test_calendar2/">' in output.data)
self.assertTrue(' <a href="/test_calendar4/">' in output.data)
+ def test_calendar_list(self):
+ """ Test the calendar_list function. """
+ self.__setup_db()
+
+ today = date.today()
+ output = self.app.get('/list/test_calendar/%s/%s/%s/' % (
+ today.year, today.month, today.day))
+ self.assertEqual(output.status_code, 200)
+ self.assertTrue(
+ '<title> test_calendar - Fedocal</title>' in output.data)
+ self.assertTrue(' <a href="/test_calendar/">' in output.data)
+ self.assertTrue(' <a href="/test_calendar2/">' in output.data)
+ self.assertTrue(' <a href="/test_calendar4/">' in output.data)
+
+ output = self.app.get('/list/test_calendar/%s/%s/%s' % (
+ today.year, today.month, today.day))
+ self.assertEqual(output.status_code, 301)
+
+ output = self.app.get('/list/test_calendar/%s/%s/%s/' % (
+ today.year, today.month, today.day), follow_redirects=True)
+ self.assertEqual(output.status_code, 200)
+ self.assertTrue(
+ '<title> test_calendar - Fedocal</title>' in output.data)
+ self.assertTrue(' <a href="/test_calendar/">' in output.data)
+ self.assertTrue(' <a href="/test_calendar2/">' in output.data)
+ self.assertTrue(' <a href="/test_calendar4/">' in output.data)
+
+ output = self.app.get('/list/test_calendar/%s/%s/' % (
+ today.year, today.month), follow_redirects=True)
+ self.assertEqual(output.status_code, 200)
+ self.assertTrue(
+ '<title> test_calendar - Fedocal</title>' in output.data)
+ self.assertTrue(' <a href="/test_calendar/">' in output.data)
+ self.assertTrue(' <a href="/test_calendar2/">' in output.data)
+ self.assertTrue(' <a href="/test_calendar4/">' in output.data)
+
def test_ical_out(self):
""" Test the ical_out function. """
self.__setup_db()
@@ -151,6 +187,20 @@ class Flasktests(Modeltests):
self.assertEqual(output.data.count('BEGIN:VEVENT'), 45)
self.assertEqual(output.data.count('END:VEVENT'), 45)
+ def test_ical_all(self):
+ """ Test the ical_all function. """
+ self.__setup_db()
+
+ output = self.app.get('/ical/')
+ self.assertEqual(output.status_code, 200)
+ self.assertTrue('BEGIN:VCALENDAR' in output.data)
+ self.assertTrue('SUMMARY:test-meeting2' in output.data)
+ self.assertTrue('DESCRIPTION:This is a test meeting with '\
+ 'recursion' in output.data)
+ self.assertTrue('ORGANIZER:pingou' in output.data)
+ self.assertEqual(output.data.count('BEGIN:VEVENT'), 50)
+ self.assertEqual(output.data.count('END:VEVENT'), 50)
+
def test_view_meeting(self):
""" Test the view_meeting function. """
self.__setup_db()
11 years, 2 months