Permalink
Browse files

Change license description in setup file

  • Loading branch information...
1 parent afb771e commit eff9f9b5c15b9fe54265b47ab03d45eedcd1cd81 @kachayev committed Aug 4, 2011
Showing with 18 additions and 14 deletions.
  1. +4 −3 README.md
  2. +14 −11 setup.py
View
@@ -12,10 +12,10 @@ Gearoscope is designed with ideas of scalability in our minds.
### Demo
-View application [demo](http://codemehanika.org/gearoscope/)
+View application [demo](http://codemehanika.org/gearoscope/)
To enter admin panel, you can use this credentials:
-
+
user: gear
pass: scope
@@ -35,7 +35,7 @@ Prepate all necessary environments:
Install and run monitor daemon and visual interface for managing it:
- wget -O gearoscope.tar.gz https://github.com/kachayev/gearoscope/tarball/master
+ wget -O gearoscope.tar.gz https://github.com/kachayev/gearoscope/tarball/master
tar xvzf gearoscope.tar.gz
cd gearoscope
pip install -e ./
@@ -55,3 +55,4 @@ More information will be available soon.
- custom validation for host in server's model
- help text for most fields in Worker Model
+
View
@@ -1,21 +1,24 @@
#!/usr/bin/env python
#
-# Copyright 20011 Alexey S. Kachayev
+# Gearoscope is a gearman server monitoring and gearman worker management system
+# Copyright (C) 2011 Alexey S. Kachayev, Iurii Ogiienko
#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
import distutils.core
import sys, os
+
# Importing setuptools adds some features like "setup.py develop", but
# it's optional so swallow the error if it's not there.
try:
@@ -24,7 +27,7 @@
pass
kwargs = {}
-version = '0.0.11'
+version = '0.0.12'
with open(os.path.join(os.path.dirname(__file__), 'requirements.txt')) as f:
requirements = [line.strip() for line in f.readlines() if line.strip() != '' and line.strip()[:2] != '-e']

0 comments on commit eff9f9b

Please sign in to comment.