[Python-modules-commits] [django-uwsgi] 01/07: Import django-uwsgi_0.1.6.orig.tar.gz
Michael Fladischer
fladi at moszumanska.debian.org
Wed Oct 19 10:24:24 UTC 2016
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch master
in repository django-uwsgi.
commit 65c13515bc8aa8ef032720ce5f8936fd501718fd
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Wed Oct 19 11:51:36 2016 +0200
Import django-uwsgi_0.1.6.orig.tar.gz
---
.editorconfig | 12 ---
.gitignore | 93 ------------------------
LICENSE | 2 +-
MANIFEST.in | 1 +
PKG-INFO | 10 +--
README.rst | 4 +-
django_uwsgi.egg-info/PKG-INFO | 10 +--
django_uwsgi.egg-info/SOURCES.txt | 9 ++-
django_uwsgi.egg-info/pbr.json | 1 -
django_uwsgi/.DS_Store | Bin 0 -> 8196 bytes
django_uwsgi/__init__.py | 2 +-
django_uwsgi/emperor/apps.py | 2 +-
django_uwsgi/emperor/migrations/0001_initial.py | 37 ++++++++++
django_uwsgi/emperor/migrations/__init__.py | 0
django_uwsgi/management/.DS_Store | Bin 0 -> 6148 bytes
django_uwsgi/stats.py | 2 +-
django_uwsgi/templates/.DS_Store | Bin 0 -> 6148 bytes
django_uwsgi/templates/uwsgi/panel.html | 18 ++++-
django_uwsgi/urls.py | 6 +-
docs/emperor.rst | 20 +++++
docs/index.rst | 1 +
docs/todo.rst | 3 +
setup.cfg | 2 +-
setup.py | 4 +-
24 files changed, 105 insertions(+), 134 deletions(-)
diff --git a/.editorconfig b/.editorconfig
deleted file mode 100755
index 2792d4b..0000000
--- a/.editorconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-# editorconfig.org
-root = true
-
-[*]
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.{py,rst,ini}]
-indent_style = space
-indent_size = 4
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
deleted file mode 100755
index b92b877..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,93 +0,0 @@
-public/uploads/
-public/assets/
-
-*~
-.DS_Store
-.AppleDouble
-.LSOverride
-.idea
-atlassian-ide-plugin.xml
-# Icon must ends with two \r.
-#Icon
-
-
-# Thumbnails
-._*
-
-# Files that might appear on external disk
-.Spotlight-V100
-.Trashes
-
-*.sublime-workspace
-*.sublime-project
-
-# Virtualenv
-# http://iamzed.com/2009/05/07/a-primer-on-virtualenv/
-.Python
-[Bb]in
-[Ii]nclude
-[Ll]ib
-[Ss]cripts
-
-
-
-local_settings.py
-.idea
-
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-env/
-#bin/
-build/
-develop-eggs/
-dist/
-eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-*.egg-info/
-.installed.cfg
-*.egg
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-.tox/
-.coverage
-.cache
-nosetests.xml
-coverage.xml
-
-# Translations
-*.mo
-
-# Mr Developer
-.mr.developer.cfg
-.project
-.pydevproject
-
-# Rope
-.ropeproject
-
-# Django stuff:
-*.log
-*.pot
-
-# Sphinx documentation
-docs/_build/
-
-.env
-*.db
-*.sqlite
-*.sqlite3
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
index b1a448c..2cdf655 100755
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
The MIT License (MIT)
-Copyright (c) 2014 unbit
+Copyright (c) 2016 unbit
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/MANIFEST.in b/MANIFEST.in
index f53c0a7..711cc50 100755
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,5 @@
include CONTRIBUTORS LICENSE *.rst
recursive-include django_uwsgi *
+recursive-include docs Makefile conf.py requirements-docs.txt *.rst *.png
recursive-exclude * __pycache__
recursive-exclude * *.py[cod]
diff --git a/PKG-INFO b/PKG-INFO
index 984d8e4..5847f72 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,10 +1,10 @@
Metadata-Version: 1.1
Name: django-uwsgi
-Version: 0.1.3
+Version: 0.1.6
Summary: uWSGI stuff for Django projects
Home-page: http://github.com/unbit/django-uwsgi
Author: Eugene MechanisM
-Author-email: eugene at mechanism.name
+Author-email: eugene at mechanism.pro
License: MIT
Description: django-uwsgi
~~~~~~~~~~~~
@@ -34,12 +34,12 @@ Description: django-uwsgi
Contributors
~~~~~~~~~~~~
- See `CONTRIBUTORS <https://github.com/unbit/django-uwsgi/CONTRIBUTORS>`_
+ See `CONTRIBUTORS <https://github.com/unbit/django-uwsgi/raw/master/CONTRIBUTORS>`_
License
~~~~~~~
- `MIT <https://github.com/unbit/django-uwsgi/LICENSE>`_
+ `MIT <https://github.com/unbit/django-uwsgi/raw/master/LICENSE>`_
Keywords: uwsgi,django,mail,cache,template
Platform: UNKNOWN
@@ -51,7 +51,7 @@ Classifier: License :: OSI Approved :: MIT License
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python
Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
Classifier: Topic :: Software Development :: Libraries :: Python Modules
Classifier: Topic :: Internet :: WWW/HTTP :: WSGI
Classifier: Topic :: Internet :: WWW/HTTP :: WSGI :: Application
diff --git a/README.rst b/README.rst
index 0956710..7234d46 100755
--- a/README.rst
+++ b/README.rst
@@ -26,9 +26,9 @@ Documentation
Contributors
~~~~~~~~~~~~
-See `CONTRIBUTORS <https://github.com/unbit/django-uwsgi/CONTRIBUTORS>`_
+See `CONTRIBUTORS <https://github.com/unbit/django-uwsgi/raw/master/CONTRIBUTORS>`_
License
~~~~~~~
-`MIT <https://github.com/unbit/django-uwsgi/LICENSE>`_
+`MIT <https://github.com/unbit/django-uwsgi/raw/master/LICENSE>`_
diff --git a/django_uwsgi.egg-info/PKG-INFO b/django_uwsgi.egg-info/PKG-INFO
index 984d8e4..5847f72 100644
--- a/django_uwsgi.egg-info/PKG-INFO
+++ b/django_uwsgi.egg-info/PKG-INFO
@@ -1,10 +1,10 @@
Metadata-Version: 1.1
Name: django-uwsgi
-Version: 0.1.3
+Version: 0.1.6
Summary: uWSGI stuff for Django projects
Home-page: http://github.com/unbit/django-uwsgi
Author: Eugene MechanisM
-Author-email: eugene at mechanism.name
+Author-email: eugene at mechanism.pro
License: MIT
Description: django-uwsgi
~~~~~~~~~~~~
@@ -34,12 +34,12 @@ Description: django-uwsgi
Contributors
~~~~~~~~~~~~
- See `CONTRIBUTORS <https://github.com/unbit/django-uwsgi/CONTRIBUTORS>`_
+ See `CONTRIBUTORS <https://github.com/unbit/django-uwsgi/raw/master/CONTRIBUTORS>`_
License
~~~~~~~
- `MIT <https://github.com/unbit/django-uwsgi/LICENSE>`_
+ `MIT <https://github.com/unbit/django-uwsgi/raw/master/LICENSE>`_
Keywords: uwsgi,django,mail,cache,template
Platform: UNKNOWN
@@ -51,7 +51,7 @@ Classifier: License :: OSI Approved :: MIT License
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python
Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
Classifier: Topic :: Software Development :: Libraries :: Python Modules
Classifier: Topic :: Internet :: WWW/HTTP :: WSGI
Classifier: Topic :: Internet :: WWW/HTTP :: WSGI :: Application
diff --git a/django_uwsgi.egg-info/SOURCES.txt b/django_uwsgi.egg-info/SOURCES.txt
index 3cbd085..12ce79b 100644
--- a/django_uwsgi.egg-info/SOURCES.txt
+++ b/django_uwsgi.egg-info/SOURCES.txt
@@ -1,10 +1,9 @@
-.editorconfig
-.gitignore
CONTRIBUTORS
LICENSE
MANIFEST.in
README.rst
setup.py
+django_uwsgi/.DS_Store
django_uwsgi/__init__.py
django_uwsgi/apps.py
django_uwsgi/cache.py
@@ -21,16 +20,19 @@ django_uwsgi.egg-info/PKG-INFO
django_uwsgi.egg-info/SOURCES.txt
django_uwsgi.egg-info/dependency_links.txt
django_uwsgi.egg-info/not-zip-safe
-django_uwsgi.egg-info/pbr.json
django_uwsgi.egg-info/requires.txt
django_uwsgi.egg-info/top_level.txt
django_uwsgi/emperor/__init__.py
django_uwsgi/emperor/admin.py
django_uwsgi/emperor/apps.py
django_uwsgi/emperor/models.py
+django_uwsgi/emperor/migrations/0001_initial.py
+django_uwsgi/emperor/migrations/__init__.py
+django_uwsgi/management/.DS_Store
django_uwsgi/management/__init__.py
django_uwsgi/management/commands/__init__.py
django_uwsgi/management/commands/runuwsgi.py
+django_uwsgi/templates/.DS_Store
django_uwsgi/templates/uwsgi/panel.html
django_uwsgi/templates/uwsgi/uwsgi.html
django_uwsgi/templates/uwsgi/wagtail_dashboard_item.html
@@ -44,6 +46,7 @@ docs/configuration.rst
docs/contributing.rst
docs/decorators.rst
docs/email.rst
+docs/emperor.rst
docs/features.rst
docs/index.rst
docs/installation.rst
diff --git a/django_uwsgi.egg-info/pbr.json b/django_uwsgi.egg-info/pbr.json
deleted file mode 100644
index 8835774..0000000
--- a/django_uwsgi.egg-info/pbr.json
+++ /dev/null
@@ -1 +0,0 @@
-{"git_version": "46db2ae", "is_release": false}
\ No newline at end of file
diff --git a/django_uwsgi/.DS_Store b/django_uwsgi/.DS_Store
new file mode 100644
index 0000000..ee4949b
Binary files /dev/null and b/django_uwsgi/.DS_Store differ
diff --git a/django_uwsgi/__init__.py b/django_uwsgi/__init__.py
index de8fad8..5120a41 100755
--- a/django_uwsgi/__init__.py
+++ b/django_uwsgi/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '0.1.3'
+__version__ = '0.1.6'
try:
diff --git a/django_uwsgi/emperor/apps.py b/django_uwsgi/emperor/apps.py
index e9d4eb9..c60d48b 100755
--- a/django_uwsgi/emperor/apps.py
+++ b/django_uwsgi/emperor/apps.py
@@ -3,5 +3,5 @@ from django.apps import AppConfig
class EmperorConfig(AppConfig):
name = 'django_uwsgi.emperor'
- label = 'uwsgi_emperor'
+ label = 'emperor'
verbose_name = 'uWSGI Emperor'
diff --git a/django_uwsgi/emperor/migrations/0001_initial.py b/django_uwsgi/emperor/migrations/0001_initial.py
new file mode 100644
index 0000000..4052ec0
--- /dev/null
+++ b/django_uwsgi/emperor/migrations/0001_initial.py
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.2 on 2016-10-17 20:17
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ initial = True
+
+ dependencies = [
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='Vassal',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('title', models.CharField(max_length=250, verbose_name='Name')),
+ ('name', models.CharField(db_column='name', editable=False, help_text='Name of uwsgi config file', max_length=255, verbose_name='Filename')),
+ ('extension', models.CharField(choices=[('.ini', 'INI file'), ('.yml', 'YAML file'), ('.xml', 'XML file'), ('.json', 'JSON file')], default=('.ini', 'INI file'), max_length=4, verbose_name='Extension')),
+ ('config', models.TextField(db_column='config', help_text='Config file blob', verbose_name='Config')),
+ ('ts', models.FloatField(db_column='ts', editable=False, help_text='A number representing the modification time of this row in UNIX format', verbose_name='Unix Timestamp')),
+ ('uid', models.PositiveSmallIntegerField(blank=True, db_column='uid', help_text='Required in Tyrant mode (secure multi-user hosting) mode only.', null=True, verbose_name='The UID of the vassal instance')),
+ ('gid', models.PositiveSmallIntegerField(blank=True, db_column='gid', help_text='Required in Tyrant mode (secure multi-user hosting) mode only.', null=True, verbose_name='The GID of the vassal instance')),
+ ('created', models.DateTimeField(auto_now_add=True, verbose_name='Created at')),
+ ('updated', models.DateTimeField(auto_now=True, null=True, verbose_name='Updated')),
+ ('enabled', models.BooleanField(default=True, verbose_name='Enabled')),
+ ],
+ options={
+ 'verbose_name': "Emperor's Vassal",
+ 'verbose_name_plural': "Emperor's Vassals",
+ 'db_table': 'vassals',
+ },
+ ),
+ ]
diff --git a/django_uwsgi/emperor/migrations/__init__.py b/django_uwsgi/emperor/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/django_uwsgi/management/.DS_Store b/django_uwsgi/management/.DS_Store
new file mode 100644
index 0000000..e686aaf
Binary files /dev/null and b/django_uwsgi/management/.DS_Store differ
diff --git a/django_uwsgi/stats.py b/django_uwsgi/stats.py
index 343d556..a7c4083 100755
--- a/django_uwsgi/stats.py
+++ b/django_uwsgi/stats.py
@@ -14,7 +14,7 @@ def get_uwsgi_stats():
w['load'] = w['running_time'] / total_load / 10 / len(workers)
w['last_spawn'] = datetime.fromtimestamp(w['last_spawn'])
jobs = []
- if uwsgi.opt['spooler']:
+ if uwsgi.opt.get('spooler'):
spooler_jobs = uwsgi.spooler_jobs()
for j in spooler_jobs:
jobs.append({'file': j, 'env': uwsgi.parsefile(j)})
diff --git a/django_uwsgi/templates/.DS_Store b/django_uwsgi/templates/.DS_Store
new file mode 100644
index 0000000..cd0cb03
Binary files /dev/null and b/django_uwsgi/templates/.DS_Store differ
diff --git a/django_uwsgi/templates/uwsgi/panel.html b/django_uwsgi/templates/uwsgi/panel.html
index 0f91ccc..20417bd 100755
--- a/django_uwsgi/templates/uwsgi/panel.html
+++ b/django_uwsgi/templates/uwsgi/panel.html
@@ -4,6 +4,17 @@
{% else %}
+<style>
+ body.app-django_uwsgi .submit-row a.button {
+ display: inline-block;
+ }
+
+ #djDebug .submit-row {
+ padding-top: 5px;
+ padding-bottom: 5px;
+ }
+</style>
+
<div id="content-main" class="inline-related tabular">
<div class="module">
<h4>{% trans 'Status' %}</h4>
@@ -37,7 +48,8 @@
{% for key, value in options %}
<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
<td><a href="http://uwsgi-docs.readthedocs.org/en/latest/Options.html#{{ key }}">{{ key }}</a></td>
- <td>{{ value }}</td>
+ {# uWSGI allows to use options without values if value = true #}
+ <td>{% if value %}{{ value }}{% else %}true{% endif %}</td>
</tr>
{% endfor %}
</tbody>
@@ -141,8 +153,8 @@
{% if masterpid %}
<div class="submit-row">
- <a href="{% url 'uwsgi_reload' %}">{% trans 'Gracefully reload uWSGI' %}</a>
- <a href="{% url 'uwsgi_cache_clear' %}">{% trans 'Clear uWSGI cache' %}</a>
+ <a href="{% url 'uwsgi_reload' %}" class="button">{% trans 'Gracefully reload uWSGI' %}</a>
+ <a href="{% url 'uwsgi_cache_clear' %}" class="button">{% trans 'Clear uWSGI cache' %}</a>
</div>
{% endif %}
diff --git a/django_uwsgi/urls.py b/django_uwsgi/urls.py
index fc5eb56..dd3eab8 100755
--- a/django_uwsgi/urls.py
+++ b/django_uwsgi/urls.py
@@ -1,8 +1,8 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
from . import views
-urlpatterns = patterns('',
+urlpatterns = [
url(r'^$', views.UwsgiStatus.as_view(), name='uwsgi_index'),
url(r'^reload/$', views.UwsgiReload.as_view(), name='uwsgi_reload'),
url(r'^clear_cache/$', views.UwsgiCacheClear.as_view(), name='uwsgi_cache_clear'),
-)
+]
diff --git a/docs/emperor.rst b/docs/emperor.rst
new file mode 100644
index 0000000..1cba313
--- /dev/null
+++ b/docs/emperor.rst
@@ -0,0 +1,20 @@
+Emperor
+=======
+
+you can use `django_uwsgi.emperor` module if you want to store vassals configs in PostgreSQL database.
+
+Simply add `'django_uwsgi.emperor',` into `INSTALLED_APPS`
+
+.. code-block:: py
+
+ INSTALLED_APPS += ('django_uwsgi.emperor',)
+
+
+Populate vassals via django admin interface and start uwsgi with command like:
+
+.. code-block:: sh
+
+ uwsgi --plugin emperor_pg --emperor "pg://host=127.0.0.1 user=foobar dbname=emperor;SELECT name,config,ts FROM vassals"
+
+
+Each time vassal added/removed or updated - uwsgi will start/stop it or reload.
\ No newline at end of file
diff --git a/docs/index.rst b/docs/index.rst
index 2564040..53da109 100755
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -14,6 +14,7 @@ You can view the code of this project or fork it (please, send pull requests), a
email
cache
command
+ emperor
integrations
screenshots
todo
diff --git a/docs/todo.rst b/docs/todo.rst
index 29ee246..1b6c1c2 100755
--- a/docs/todo.rst
+++ b/docs/todo.rst
@@ -5,6 +5,9 @@ Todo
* uWSGI config generator
* Improve `Docs <http://django-uwsgi.rtfd.org>`_
* Translations?
+* Good cache panel
+* Ability to add cronjobs/filemonitors via admin interface
+* Options for sendfile if uwsgi serving files
Some code is borrowed from projects I did earlier and some code is still not added yet, but does exists in my projects.
diff --git a/setup.cfg b/setup.cfg
index 6bc2ff3..861a9f5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
[egg_info]
-tag_date = 0
tag_build =
+tag_date = 0
tag_svn_revision = 0
diff --git a/setup.py b/setup.py
index c63c5f6..bfc2372 100755
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@ setup(
long_description=open('README.rst').read(),
url='http://github.com/unbit/django-uwsgi',
author='Eugene MechanisM',
- author_email='eugene at mechanism.name',
+ author_email='eugene at mechanism.pro',
license='MIT',
zip_safe=False,
classifiers=[
@@ -30,7 +30,7 @@ setup(
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 2.7',
- 'Programming Language :: Python :: 3.4',
+ 'Programming Language :: Python :: 3.5',
'Topic :: Software Development :: Libraries :: Python Modules',
'Topic :: Internet :: WWW/HTTP :: WSGI',
'Topic :: Internet :: WWW/HTTP :: WSGI :: Application',
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-uwsgi.git
More information about the Python-modules-commits
mailing list