From b221a8b7f6644e8f6ac9294e9b0e508b94dd2f35 Mon Sep 17 00:00:00 2001 From: Iacopo Spalletti Date: Thu, 14 Aug 2014 08:35:55 +0200 Subject: [PATCH 1/2] Cleanup --- djangocms_installer/__main__.py | 2 +- djangocms_installer/config/__init__.py | 5 +++-- djangocms_installer/config/internal.py | 2 +- djangocms_installer/install/__init__.py | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/djangocms_installer/__main__.py b/djangocms_installer/__main__.py index 52d7e3d..d294f64 100644 --- a/djangocms_installer/__main__.py +++ b/djangocms_installer/__main__.py @@ -5,4 +5,4 @@ if __name__ == '__main__': status = execute() if status: - sys.exit(status) \ No newline at end of file + sys.exit(status) diff --git a/djangocms_installer/config/__init__.py b/djangocms_installer/config/__init__.py index 3fd4519..07d5a2a 100644 --- a/djangocms_installer/config/__init__.py +++ b/djangocms_installer/config/__init__.py @@ -91,8 +91,9 @@ def parse(args): # First of all, check if the project name is valid if not validate_project(args.project_name): - sys.stderr.write("Project name '%s' is not a valid app name. Please use only numbers, letters and underscores.\n" - % args.project_name) + sys.stderr.write("Project name '%s' is not a valid app name. " + "Please use only numbers, letters and underscores.\n" + % args.project_name) sys.exit(3) for item in data.CONFIGURABLE_OPTIONS: diff --git a/djangocms_installer/config/internal.py b/djangocms_installer/config/internal.py index 19587d0..ad14490 100644 --- a/djangocms_installer/config/internal.py +++ b/djangocms_installer/config/internal.py @@ -37,4 +37,4 @@ def validate_project(project_name): __import__(project_name) return None except ImportError: - return project_name \ No newline at end of file + return project_name diff --git a/djangocms_installer/install/__init__.py b/djangocms_installer/install/__init__.py index 626a051..551f901 100644 --- a/djangocms_installer/install/__init__.py +++ b/djangocms_installer/install/__init__.py @@ -62,4 +62,4 @@ def requirements(requirements, is_file=False): exit_status = pip.main(args) if exit_status != SUCCESS: raise InstallationError("Error while installing requirements. Check pip log file for error details.") - return True \ No newline at end of file + return True From 010aa14ab53f5bf81f07e301e0c6aad56d883215 Mon Sep 17 00:00:00 2001 From: Iacopo Spalletti Date: Thu, 14 Aug 2014 08:29:30 +0200 Subject: [PATCH 2/2] Version bump --- AUTHORS.rst | 3 ++- HISTORY.rst | 6 ++++++ djangocms_installer/__init__.py | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/AUTHORS.rst b/AUTHORS.rst index 3c92019..732b8f9 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -12,8 +12,9 @@ Development Lead Contributors ------------ +* Carlo Ascani * Aaron Boman * Henning Sprang * Nick Moore * Enkel Mitrushi -* Jonas Obrist \ No newline at end of file +* Jonas Obrist diff --git a/HISTORY.rst b/HISTORY.rst index ee65f4e..58dd0a4 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -3,6 +3,12 @@ History ------- +0.5.4 (2014-08-14) +++++++++++++++++++ + +* Fix reversion version selection for older Django versions +* Berter project name validation + 0.5.3 (2014-07-23) ++++++++++++++++++ diff --git a/djangocms_installer/__init__.py b/djangocms_installer/__init__.py index 1529811..1a1a4c1 100644 --- a/djangocms_installer/__init__.py +++ b/djangocms_installer/__init__.py @@ -2,4 +2,4 @@ # -*- coding: utf-8 -*- __author__ = 'Iacopo Spalletti' __email__ = 'i.spalletti@nephila.it' -__version__ = '0.5.3' +__version__ = '0.5.4'