removes DBNAME env var and force db name to 'concurrency'

saxix · Jul 21, 2014 · 658d4a1 · 658d4a1
1 parent 321da3e
commit 658d4a1
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,8 @@ services:
   - PostgreSQL
 python:
   - 2.7
+  - 3.2
+  - 3.3
 
 env:
   - DJANGO="1.4.x" DBENGINE=mysql

diff --git a/Makefile b/Makefile
@@ -6,7 +6,7 @@ DJANGO_15='django>=1.5,<1.6'
 DJANGO_16='django>=1.6,>1.7'
 DJANGO_17='https://www.djangoproject.com/download/1.7c1/tarball/'
 DJANGO_DEV=git+git://github.com/django/django.git
-DBNAME=concurrency
+
 
 
 
@@ -27,12 +27,12 @@ locale:
 
 
 init-db:
-	@sh -c "if [ '${DBENGINE}' = 'mysql' ]; then mysql -e 'DROP DATABASE IF EXISTS ${DBNAME};'; fi"
+	@sh -c "if [ '${DBENGINE}' = 'mysql' ]; then mysql -e 'DROP DATABASE IF EXISTS concurrency;'; fi"
 	@sh -c "if [ '${DBENGINE}' = 'mysql' ]; then pip install  MySQL-python; fi"
-	@sh -c "if [ '${DBENGINE}' = 'mysql' ]; then mysql -e 'CREATE DATABASE IF NOT EXISTS ${DBNAME};'; fi"
+	@sh -c "if [ '${DBENGINE}' = 'mysql' ]; then mysql -e 'CREATE DATABASE IF NOT EXISTS concurrency;'; fi"
 
-	@sh -c "if [ '${DBENGINE}' = 'pg' ]; then psql -c 'DROP DATABASE IF EXISTS ${DBNAME};' -U postgres; fi"
-	@sh -c "if [ '${DBENGINE}' = 'pg' ]; then psql -c 'CREATE DATABASE ${DBNAME};' -U postgres; fi"
+	@sh -c "if [ '${DBENGINE}' = 'pg' ]; then psql -c 'DROP DATABASE IF EXISTS concurrency;' -U postgres; fi"
+	@sh -c "if [ '${DBENGINE}' = 'pg' ]; then psql -c 'CREATE DATABASE concurrency;' -U postgres; fi"
 	@sh -c "if [ '${DBENGINE}' = 'pg' ]; then pip install -q psycopg2; fi"
 
 

diff --git a/README.rst b/README.rst
@@ -12,7 +12,7 @@ Django Concurrency
 
 django-concurrency is an optimistic lock [1]_ implementation for Django.
 
-Tested with: 1.4.x, 1.5.x, 1.6.x, trunk.
+Tested with: 1.4.x, 1.5.x, 1.6.x, 1.7rc1 trunk.
 
 It prevents users from doing concurrent editing in Django both from UI and from a
 django command.
@@ -44,9 +44,9 @@ Other projects that handle concurrent editing are `django-optimistic-lock`_ and
 
  * can be applied to any model; not only your code (ie. django.contrib.auth.Group)
  * works with django 1.4 and 1.5
- * handle `list-editable`_ ChangeList. (solves `#11313 <https://code.djangoproject.com/ticket/11313>`_)
- * handle concurrency in admin's actions
- * can intercept changes performend out of the django app (ie using pgAdmin, phpMyAdmin, Toads)
+ * handle `list-editable`_ ChangeList. (handle `#11313 <https://code.djangoproject.com/ticket/11313>`_)
+ * manage concurrency conflicts in admin's actions
+ * can intercept changes performend out of the django app (ie using pgAdmin, phpMyAdmin, Toads) (using `TriggerVersionField_`
 
 
 Links
@@ -96,5 +96,7 @@ Links
 
 .. _django-optimistic-lock: https://github.com/gavinwahl/django-optimistic-lock
 
+.. _TriggerVersionField: https://django-concurrency.readthedocs.org/en/latest/fields.html#triggerversionfield
+
 .. [1] http://en.wikipedia.org/wiki/Optimistic_concurrency_control
 
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -11,11 +11,11 @@ def pytest_configure(config):
     if not settings.configured:
         os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.settings'
 
-    from concurrency.api import apply_concurrency_check
-    from django.contrib.auth.models import Permission
-    from concurrency.fields import IntegerVersionField
-
-    apply_concurrency_check(Permission, 'version', IntegerVersionField)
+    # from concurrency.api import apply_concurrency_check
+    # from django.contrib.auth.models import Permission
+    # from concurrency.fields import IntegerVersionField
+    #
+    # apply_concurrency_check(Permission, 'version', IntegerVersionField)
 
     try:
         from django.apps import AppConfig  # noqa

diff --git a/tests/settings.py b/tests/settings.py
@@ -78,14 +78,13 @@
     }
 }
 
-DBNAME = os.environ.get('DBNAME', 'concurrency')
 db = os.environ.get('DBENGINE', None)
 if db == 'pg':
     DATABASES = {
         'default': {
             # 'ENGINE': 'django.db.backends.postgresql_psycopg2',
             'ENGINE': 'concurrency.db.backends.postgresql_psycopg2',
-            'NAME': DBNAME,
+            'NAME': 'concurrency',
             'HOST': '127.0.0.1',
             'PORT': '',
             'USER': 'postgres',
@@ -95,7 +94,7 @@
         'default': {
             # 'ENGINE': 'django.db.backends.mysql',
             'ENGINE': 'concurrency.db.backends.mysql',
-            'NAME': DBNAME,
+            'NAME': 'concurrency',
             'HOST': '127.0.0.1',
             'PORT': '',
             'USER': 'root',
@@ -108,6 +107,6 @@
     DATABASES = {
         'default': {
             'ENGINE': 'concurrency.db.backends.sqlite3',
-            'NAME': '%s.sqlite' % DBNAME,
+            'NAME': 'concurrency.sqlite',
             'HOST': '',
             'PORT': ''}}