min branch merge to staging branch

[pwhipp]

Min - are you able to handle this merge?

[webstar0025]

Should I download 2 branches on my local, merge and then make another pull request?

From: Paul Whipp [mailto:notifications@github.com] Sent: Thursday, November 06, 2014 11:37 AM To: cccs-web/core Cc: Min Wang Subject: Re: [core] min brach to staging branch (#190)

Min - are you able to handle this merge?

— Reply to this email directly or view it on GitHub https://github.com/cccs-web/core/pull/190#issuecomment-61922809 . https://github.com/notifications/beacon/AFlD-oCOCal6tSuaeSdk5ggiDnDSmklrks5nKuRwgaJpZM4C2zyT.gif

[webstar0025]

I don't have write permission right now.

[cccs-ip]

I think Min set the merge for us to absorb. His work is visible on the 'test' branch. The database integration seems to be working well for me, though I have some requests for how and where to visualize these relationships. I think the mere is therefore on us, Paul - to review Min's work and to ensure that you're happy with it

[cccs-ip]

Hey fellas,

I appear to have messed up staging when pulling in min's work and resetting the database:

cccs:~ $ workon staging
(staging)cccs:~/staging $ git pull
remote: Counting objects: 130, done.
remote: Compressing objects: 100% (94/94), done.
Receiving objects: 100% (130/130), 39.52 KiB | 0 bytes/s, done.
remote: Total 130 (delta 63), reused 65 (delta 29)
Resolving deltas: 100% (63/63), done.
From github.com:cccs-web/core
   e7dc025..059bfe1  staging    -> origin/staging
   9fca348..3cf8f6d  documents  -> origin/documents
   2f02b94..a22fd0b  master     -> origin/master
   2f02b94..2addcf5  min        -> origin/min
Updating e7dc025..059bfe1
Fast-forward
 core/settings/test.py                              |  25 ++
 cvs/admin.py                                       |  29 +-
 .../0016_auto__add_field_cvproject_subproject.py   | 344 +++++++++++++++++++++
 cvs/models.py                                      |  51 ++-
 cvs/templates/cvs/cv_detail.html                   |  18 +-
 cvs/templates/cvs/includes/cv_list.html            |  12 +-
 deploy/production/nginx_blog.conf                  |  14 +
 deploy/production/qgis_server/nginx.conf           |  14 +
 deploy/test/nginx.conf                             |  46 +++
 deploy/test/service_demon.sh                       |  10 +
 deploy/test/upstart.conf                           |  10 +
 projects/admin.py                                  |  88 +++++-
 ...bproject__add_unique_subproject_project_name.py | 174 +++++++++++
 projects/models.py                                 | 190 +++++++++++-
 projects/templates/projects/project_detail.html    |  55 +++-
 projects/templatetags/projects_tags.py             |   8 +
 projects/translation.py                            |   2 +-
 projects/views.py                                  |  13 +-
 qgis/projects/alaska_lakes.qgs                     | 312 +++++++++++++++++++
 theme/templates/base.html                          | 231 +++++++-------
 20 files changed, 1484 insertions(+), 162 deletions(-)
 create mode 100644 core/settings/test.py
 create mode 100644 cvs/migrations/0016_auto__add_field_cvproject_subproject.py
 create mode 100644 deploy/production/nginx_blog.conf
 create mode 100644 deploy/production/qgis_server/nginx.conf
 create mode 100644 deploy/test/nginx.conf
 create mode 100755 deploy/test/service_demon.sh
 create mode 100644 deploy/test/upstart.conf
 create mode 100644 projects/migrations/0011_auto__add_subproject__add_unique_subproject_project_name.py
 create mode 100644 qgis/projects/alaska_lakes.qgs
(staging)cccs:~/staging $ django migrate projects 0010 --fake
 - Soft matched migration 0010 to 0010_project_description_to_content.
Running migrations for projects:
- Nothing to migrate.
(staging)cccs:~/staging $ django migrate projects
Running migrations for projects:
 - Migrating forwards to 0011_auto__add_subproject__add_unique_subproject_project_name.
 > projects:0011_auto__add_subproject__add_unique_subproject_project_name
 - Loading initial data for projects.
Installed 0 object(s) from 0 fixture(s)
(staging)cccs:~/staging $ django migrate
Running migrations for projects:
- Nothing to migrate.
 - Loading initial data for projects.
Installed 0 object(s) from 0 fixture(s)
Running migrations for cvs:
 - Migrating forwards to 0016_auto__add_field_cvproject_subproject.
 > cvs:0016_auto__add_field_cvproject_subproject
FATAL ERROR - The following SQL query failed: ALTER TABLE "cvs_cvproject" ADD CONSTRAINT "subproject_id_refs_id_8a757c53" FOREIGN KEY ("subproject_id") REFERENCES "projects_subproject" ("id") DEFERRABLE INITIALLY DEFERRED;
The error was: relation "projects_subproject" does not exist

Error in migration: cvs:0016_auto__add_field_cvproject_subproject
Traceback (most recent call last):
  File "/home/cccs/.virtualenvs/staging/bin/django-admin.py", line 5, in <module>
    management.execute_from_command_line()
  File "/home/cccs/.virtualenvs/staging/local/lib/python2.7/site-packages/django/core/management/__init__.py", line 399, in execute_from_command_line
    utility.execute()
  File "/home/cccs/.virtualenvs/staging/local/lib/python2.7/site-packages/django/core/management/__init__.py", line 392, in execute
    self.fetch_command(subcommand).run_from_argv(self.argv)
  File "/home/cccs/.virtualenvs/staging/local/lib/python2.7/site-packages/django/core/management/base.py", line 242, in run_from_argv
    self.execute(*args, **options.__dict__)
  File "/home/cccs/.virtualenvs/staging/local/lib/python2.7/site-packages/django/core/management/base.py", line 285, in execute
    output = self.handle(*args, **options)
  File "/home/cccs/.virtualenvs/staging/local/lib/python2.7/site-packages/south/management/commands/migrate.py", line 111, in handle
    ignore_ghosts = ignore_ghosts,
  File "/home/cccs/.virtualenvs/staging/local/lib/python2.7/site-packages/south/migration/__init__.py", line 220, in migrate_app
    success = migrator.migrate_many(target, workplan, database)
  File "/home/cccs/.virtualenvs/staging/local/lib/python2.7/site-packages/south/migration/migrators.py", line 256, in migrate_many
    result = migrator.__class__.migrate_many(migrator, target, migrations, database)
  File "/home/cccs/.virtualenvs/staging/local/lib/python2.7/site-packages/south/migration/migrators.py", line 331, in migrate_many
    result = self.migrate(migration, database)
  File "/home/cccs/.virtualenvs/staging/local/lib/python2.7/site-packages/south/migration/migrators.py", line 133, in migrate
    result = self.run(migration, database)
  File "/home/cccs/.virtualenvs/staging/local/lib/python2.7/site-packages/south/migration/migrators.py", line 114, in run
    return self.run_migration(migration, database)
  File "/home/cccs/.virtualenvs/staging/local/lib/python2.7/site-packages/south/migration/migrators.py", line 85, in run_migration
    south.db.db.execute_deferred_sql()
  File "/home/cccs/.virtualenvs/staging/local/lib/python2.7/site-packages/south/db/generic.py", line 318, in execute_deferred_sql
    self.execute(sql)
  File "/home/cccs/.virtualenvs/staging/local/lib/python2.7/site-packages/south/db/generic.py", line 282, in execute
    cursor.execute(sql, params)
  File "/home/cccs/.virtualenvs/staging/local/lib/python2.7/site-packages/django/db/backends/util.py", line 69, in execute
    return super(CursorDebugWrapper, self).execute(sql, params)
  File "/home/cccs/.virtualenvs/staging/local/lib/python2.7/site-packages/django/db/backends/util.py", line 53, in execute
    return self.cursor.execute(sql, params)
  File "/home/cccs/.virtualenvs/staging/local/lib/python2.7/site-packages/django/db/utils.py", line 99, in __exit__
    six.reraise(dj_exc_type, dj_exc_value, traceback)
  File "/home/cccs/.virtualenvs/staging/local/lib/python2.7/site-packages/django/db/backends/util.py", line 53, in execute
    return self.cursor.execute(sql, params)
django.db.utils.ProgrammingError: relation "projects_subproject" does not exist

(staging)cccs:~/staging $ 

Staging now has reverted back to our old theme, and the menus are out of wack. Any help to correct would be appreciated.

[pwhipp]

Is this resolved now?

[cccs-ip]

Yes, this is sorted. Thank you. ... though oddly i don't see a function to 'close' the issue (except to delete the branch?)