From 9abb7a3cafaac213adae95897e8d92add4846496 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Thu, 27 Mar 2014 22:57:13 +0100 Subject: [PATCH] Updated CHANGELOG, README.rst, requirements.txt, requirements_production.txt and setup.py. --- CHANGELOG | 18 +++++++++++++----- README.rst | 22 ++++++++++++++-------- requirements.txt | 10 +++++----- requirements_production.txt | 4 ++-- setup.py | 7 +++---- tests/config/test_config.py | 4 ++-- 6 files changed, 39 insertions(+), 26 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 003a17712..770c39e8a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -8,16 +8,24 @@ Version 1.5.1 (unreleased) ========================== [https://github.com/OpenSlides/OpenSlides/issues?milestone=15] +Projector: +- Fixed path and config help text for logo on the projector. Agenda: -- Fixed permission error in list of speakers widget. +- Fixed permission error in the list of speakers widget. +- Fixed Item instance method is_active_slide(). +Motion: +- Fixed sorting of motions concerning the identifier. Used natsort and + DataTables Natural Sort Plugin. Participant: -- Added permission to see participants also to the manager group. +- Added permission to see participants to the manager group. +- Fixed user status view for use without Javascript. Files: -- Fixed error when a file was removed from filesystem. +- Fixed error when an uploaded file was removed from filesystem. Other: -- Used unicode font for circle in ballot pdf. Removed pillow dependency package. +- Set minimum Python version to 2.6.9. Fixed setup file for use with Python 2.6. +- Used unicode font for circle in ballot pdf. Removed Pillow dependency package. - Fixed http status code when requesting a non-existing static page using - Tordado web server. + Tornado web server. - Fixed error in main script when using other database engine. diff --git a/README.rst b/README.rst index abd945fb0..1e677959a 100644 --- a/README.rst +++ b/README.rst @@ -67,8 +67,8 @@ Installation on GNU/Linux or Mac OS X OpenSlides will install all required python packages (see requirements_production.txt). - When you use python 2.6 you have to add the argument '--allow-external - argparse' to pip. + If you use Python 2.6.x, you have to add the option `--allow-external + argparse` to the pip command:: $ pip install --allow-external argparse openslides @@ -86,10 +86,11 @@ portable version you should observe the following install steps.* and Setuptools on your system. a. Download and run the `Python 32-bit MSI installer - `_. Note + `_. Note that the 32-bit MSI installer is required even on a 64-bit Windows system. If you use the 64-bit MSI installer, step 3 of this - instruction will fail unless you installed the packages reportlab manually. + instruction will fail unless you installed the packages reportlab + manually. b. Add python directories to PATH (via Control Panel > System > Advanced): ``";C:\\Python27;C:\\Python27\\Scripts"``. Note that the path @@ -109,7 +110,7 @@ portable version you should observe the following install steps.* To install Virtual Python Environment builder, open command line (cmd) and run:: - > easy_install https://pypi.python.org/packages/source/v/virtualenv/virtualenv-1.10.1.tar.gz + > easy_install https://pypi.python.org/packages/source/v/virtualenv/virtualenv-1.11.4.tar.gz Create your OpenSlides directory, change to it, setup and activate the virtual environment:: @@ -213,6 +214,11 @@ Installation and start of the development version $ pip install -r requirements.txt + If you use Python 2.6.x, you have to add the option `--allow-external + argparse` to the pip command:: + + $ pip install --allow-external argparse -r requirements.txt + For Windows run:: > easy_install # Insert all packages from requirements.txt and requirements_production.txt here @@ -232,8 +238,7 @@ Coding Style ------------ You can find some information on the coding style in the `OpenSlides wiki -`_. +`_. VI. Used software @@ -275,7 +280,8 @@ OpenSlides uses the following projects or parts of them: * `Sphinx `_, License: BSD -* Sphinx extension `autoimage `_, License: MIT +* Sphinx extension `autoimage `_, + License: MIT * `Sphinx Bootstrap Theme `_, License: MIT diff --git a/requirements.txt b/requirements.txt index bee236a1d..002e67433 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,11 +2,11 @@ -r requirements_production.txt # Requirements for development and tests in alphabetical order -Fabric==1.8.0 -coverage==3.7 -flake8==2.0 +Fabric==1.8.3 +coverage==3.7.1 +flake8==2.1.0 mock==1.0.1 # Requirements for OpenSlides handbook/documentation in alphabetical order -Sphinx==1.2b3 -sphinx-bootstrap-theme==0.2.4 +Sphinx==1.2.2 +sphinx-bootstrap-theme==0.4.0 diff --git a/requirements_production.txt b/requirements_production.txt index 55703c1c0..53df7bd3b 100644 --- a/requirements_production.txt +++ b/requirements_production.txt @@ -4,10 +4,10 @@ beautifulsoup4>=4.3,<4.4 bleach>=1.2,<1.3 django-haystack>=2.1,<2.2 django-mptt>=0.6,<0.7 -natsort>=3.0,<3.1 +natsort>=3.1,<3.2 reportlab>=2.7,<2.8 sockjs-tornado>=1.0,<1.1 -tornado>=3.1,<3.2 +tornado>=3.1,<3.3 whoosh>=2.5,<2.6 # For Python 2.6 support diff --git a/setup.py b/setup.py index 2e3d64032..5d5a35d90 100644 --- a/setup.py +++ b/setup.py @@ -1,8 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -import sys import re +import sys from setuptools import setup, find_packages @@ -16,7 +16,7 @@ with open('README.rst') as readme: dependency_line = re.compile('[^#-]') with open('requirements_production.txt') as requirements_production: install_requires = [line for line in requirements_production.readlines() - if dependency_line.match(line)] + if dependency_line.match(line)] setup( @@ -31,11 +31,10 @@ setup( # http://pypi.python.org/pypi?%3Aaction=list_classifiers 'Development Status :: 5 - Production/Stable', 'Environment :: Web Environment', - 'Intended Audience :: Other Audience', 'Framework :: Django', 'License :: OSI Approved :: MIT License', 'Operating System :: OS Independent', - 'Programming Language :: Python', + 'Programming Language :: Python :: 2', ], license='MIT', packages=find_packages(exclude=['tests', 'tests.*']), diff --git a/tests/config/test_config.py b/tests/config/test_config.py index bb7dd79a4..9a48b4e5a 100644 --- a/tests/config/test_config.py +++ b/tests/config/test_config.py @@ -234,8 +234,8 @@ class ConfigWeightTest(TestCase): def test_order_of_config_pages_abstract(self): config_page_dict = {} - for receiver, config_page in config_signal.send(sender=self): - config_page_dict[receiver.__name__] = config_page + for signal_receiver, config_page in config_signal.send(sender=self): + config_page_dict[signal_receiver.__name__] = config_page self.assertGreater(config_page_dict['set_grouped_config_page'].weight, config_page_dict['set_simple_config_page'].weight) def test_order_of_config_pages_on_view(self):