Atualização para IFRN/17.2 - 10/2017
Dados gerais
| Branch Criada no IFCE | atualizacao_ifrn_10_2017 |
| Tag Base do IFRN | master |
| Data de início da atualização | 10/2017 |
| Tag criada | ifce2017_10_1 |
Pacotes (/opt/suap/deploy/requirements.txt)
Passo 1
Comandos iniciais
git checkout -b atualizacao_ifrn_10_2017 git remote add suapifrn http://gitlab.ifrn.edu.br/cosinf/suap.git
Passo 2
Baixar as atualizações do IFRN
git fetch suapifrn
Username for 'https://gitlab.ifrn.edu.br':
Password for 'https://ifce@gitlab.ifrn.edu.br':
Git fetch
From http://gitlab.ifrn.edu.br/cosinf/suap * [new branch] RH_Pessoa -> suapifrn/RH_Pessoa 7c69371..e423009 accesscontrol -> suapifrn/accesscontrol * [new branch] ae-permissions -> suapifrn/ae-permissions * [new branch] ae_2991 -> suapifrn/ae_2991 * [new branch] ae_readonly -> suapifrn/ae_readonly caaafcf..18ba468 afastamento_parcial -> suapifrn/afastamento_parcial * [new branch] ajustes-rsc-pagamento -> suapifrn/ajustes-rsc-pagamento * [new branch] autocomplete_error -> suapifrn/autocomplete_error * [new branch] central-servicos-ajustes -> suapifrn/central-servicos-ajustes * [new branch] central-servicos-bug-ckeditor -> suapifrn/central-servicos-bug-ckeditor * [new branch] chamado-44096 -> suapifrn/chamado-44096 * [new branch] chamado-45621-reaberto -> suapifrn/chamado-45621-reaberto * [new branch] chamado-47077 -> suapifrn/chamado-47077 * [new branch] chamado-48274 -> suapifrn/chamado-48274 * [new branch] chamado-48471 -> suapifrn/chamado-48471 * [new branch] chamado-49060 -> suapifrn/chamado-49060 b4dd3b5..b87f36a chamado_39251 -> suapifrn/chamado_39251 * [new branch] chamado_48467 -> suapifrn/chamado_48467 * [new branch] ckeditor_processo_eletronico -> suapifrn/ckeditor_processo_eletronico e7b8e92..ef626cf compensa_ch -> suapifrn/compensa_ch * [new branch] compensa_rh_greve -> suapifrn/compensa_rh_greve a977dfa..35c0640 corrigir-suap-enap -> suapifrn/corrigir-suap-enap * [new branch] criacao_numero_processo -> suapifrn/criacao_numero_processo * [new branch] demanda-307 -> suapifrn/demanda-307 * [new branch] demanda-311 -> suapifrn/demanda-311 * [new branch] demanda-370 -> suapifrn/demanda-370 7836feb..3578caa demanda-95 -> suapifrn/demanda-95 91fe6df..9a1b47e demanda_136 -> suapifrn/demanda_136 * [new branch] demanda_1_novo -> suapifrn/demanda_1_novo * [new branch] demanda_219 -> suapifrn/demanda_219 * [new branch] demanda_279 -> suapifrn/demanda_279 * [new branch] demanda_385 -> suapifrn/demanda_385 12b14ab..66e8946 demanda_44 -> suapifrn/demanda_44 * [new branch] demanda_50 -> suapifrn/demanda_50 b25b545..333c587 demanda_6 -> suapifrn/demanda_6 * [new branch] edu-ajustes-pit -> suapifrn/edu-ajustes-pit 90ddd98..bed19c2 edu-correcao-jubilamento -> suapifrn/edu-correcao-jubilamento 909684e..afe7078 edu-demanda-238 -> suapifrn/edu-demanda-238 * [new branch] edu-demanda-324 -> suapifrn/edu-demanda-324 * [new branch] edu-demanda-324-backup -> suapifrn/edu-demanda-324-backup * [new branch] edu-exportacao-dados-thiago-medeiros -> suapifrn/edu-exportacao-dados-thiago-medeiros * [new branch] edu-qrcode-mobile -> suapifrn/edu-qrcode-mobile cd7ac95..c09cf62 edu-solange -> suapifrn/edu-solange 590ee1e..6d6c049 edu_plano_ensino -> suapifrn/edu_plano_ensino * [new branch] etiqueta_processo -> suapifrn/etiqueta_processo 8b3f9c4..2710cbf eventos -> suapifrn/eventos a149f44..a884373 gitlab-test -> suapifrn/gitlab-test * [new branch] importador_novo_siafi -> suapifrn/importador_novo_siafi * [new branch] integra-orcid -> suapifrn/integra-orcid * [new branch] interessado_processo_restrito -> suapifrn/interessado_processo_restrito * [new branch] ladp-view-aluno -> suapifrn/ladp-view-aluno * [new branch] layout -> suapifrn/layout 2c9f5b3..ce7d0b0 master -> suapifrn/master * [new branch] numero_protocolo_antigo -> suapifrn/numero_protocolo_antigo * [new branch] patrim-conferencia-sala -> suapifrn/patrim-conferencia-sala * [new branch] patrim-reavaliacao -> suapifrn/patrim-reavaliacao * [new branch] patrim-relatorio-anual-depreciacao -> suapifrn/patrim-relatorio-anual-depreciacao * [new branch] pessoa-fisica-booleanos -> suapifrn/pessoa-fisica-booleanos * [new branch] processo_eletronico_1.3 -> suapifrn/processo_eletronico_1.3 * [new branch] processo_eletronico_1.4 -> suapifrn/processo_eletronico_1.4 * [new branch] processo_eletronico_caixa_despacho -> suapifrn/processo_eletronico_caixa_despacho * [new branch] processo_eletronico_ckeditor_melhorias -> suapifrn/processo_eletronico_ckeditor_melhorias * [new branch] processo_eletronico_demanda_342 -> suapifrn/processo_eletronico_demanda_342 * [new branch] processo_eletronico_nup17 -> suapifrn/processo_eletronico_nup17 * [new branch] processo_eletronico_processo_setor_criacao_escolha -> suapifrn/processo_eletronico_processo_setor_criacao_escolha * [new branch] processo_eletronico_remocao_autocomplete_modelo_doc -> suapifrn/processo_eletronico_remocao_autocomplete_modelo_doc * [new branch] processo_eletronico_visualizacao_despacho -> suapifrn/processo_eletronico_visualizacao_despacho db74bcd..68ff4d3 rh-pessoa-unica -> suapifrn/rh-pessoa-unica * [new branch] rh-pessoafisica-users -> suapifrn/rh-pessoafisica-users * [new branch] rh-webservice-siape -> suapifrn/rh-webservice-siape * [new branch] signal -> suapifrn/signal * [new branch] suap-ajustes-planilha-demanda-v2 -> suapifrn/suap-ajustes-planilha-demanda-v2 4ecb74b..8847c62 suap-enap -> suapifrn/suap-enap * [new branch] suap-enap-ajustada -> suapifrn/suap-enap-ajustada * [new branch] suap-enap-ajustes-relatorios -> suapifrn/suap-enap-ajustes-relatorios * [new branch] suap-enap-atualizada -> suapifrn/suap-enap-atualizada * [new branch] suap-enap-calendario-academico-matricula -> suapifrn/suap-enap-calendario-academico-matricula * [new branch] suap-enap-calendario-academico2 -> suapifrn/suap-enap-calendario-academico2 * [new branch] suap-enap-customizacoes -> suapifrn/suap-enap-customizacoes * [new branch] suap-enap-join -> suapifrn/suap-enap-join * [new branch] suap-enap-lps -> suapifrn/suap-enap-lps * [new branch] suap-enap-m -> suapifrn/suap-enap-m * [new branch] suap-enap-merge -> suapifrn/suap-enap-merge * [new branch] suap-enap-permissoes -> suapifrn/suap-enap-permissoes * [new branch] suap-enap-ponto -> suapifrn/suap-enap-ponto * [new branch] suap-enap-servicos -> suapifrn/suap-enap-servicos * [new branch] suap-redis -> suapifrn/suap-redis * [new branch] suap-visitor -> suapifrn/suap-visitor * [new branch] suap_gestao_situacao_matricula -> suapifrn/suap_gestao_situacao_matricula * [new branch] timeout_autocomplete -> suapifrn/timeout_autocomplete * [new branch] webservice_protocolo_integrado -> suapifrn/webservice_protocolo_integrado
Passo 3
Fazer o merge da tag “suapifrn/17.2” com a branch “atualizacao_ifrn_06_2017” do IFCE e resolver os conflitos.
git merge suapifrn/master
Saída:
Auto-merging suap/settings_sample.py Auto-merging suap/settings_base.py CONFLICT (content): Merge conflict in suap/settings_base.py Auto-merging rh/views.py CONFLICT (content): Merge conflict in rh/views.py Auto-merging rh/urls.py CONFLICT (content): Merge conflict in rh/urls.py Auto-merging rh/permissions.xml CONFLICT (content): Merge conflict in rh/permissions.xml Auto-merging rh/models.py CONFLICT (content): Merge conflict in rh/models.py Auto-merging rh/menu.json Auto-merging rh/importador.py Auto-merging rh/forms.py CONFLICT (content): Merge conflict in rh/forms.py Removing rh/cracha/o-.jpg Removing rh/cracha/o+.jpg Removing rh/cracha/cracha_estagiario.jpg Removing rh/cracha/cracha_cefetrn.jpg Removing rh/cracha/cracha.jpg Removing rh/cracha/b-.jpg Removing rh/cracha/b+.jpg Removing rh/cracha/ab-.jpg Removing rh/cracha/ab+.jpg Removing rh/cracha/a-.jpg Removing rh/cracha/a+.jpg Auto-merging rh/admin.py CONFLICT (content): Merge conflict in rh/admin.py Auto-merging protocolo/views.py Auto-merging protocolo/models.py Auto-merging projetos/views.py Auto-merging projetos/templates/relatorio_projeto.html Auto-merging projetos/templates/plano_trabalho_participante.html CONFLICT (content): Merge conflict in projetos/templates/plano_trabalho_participante.html Auto-merging projetos/templates/imprimir_projeto.html Auto-merging projetos/templates/emitir_declaracao_orientacao_pdf.html Auto-merging projetos/templates/emitir_certificado_extensao_pdf.html Auto-merging projetos/forms.py CONFLICT (content): Merge conflict in projetos/forms.py Auto-merging processo_eletronico/views.py Removing processo_eletronico/templates/processo_eletronico/tramite.html Auto-merging ponto/views.py CONFLICT (content): Merge conflict in ponto/views.py Auto-merging ponto/urls.py Auto-merging ponto/permissions.xml Auto-merging ponto/menu.json CONFLICT (content): Merge conflict in ponto/menu.json Auto-merging ponto/forms.py Auto-merging planejamento/views.py CONFLICT (content): Merge conflict in planejamento/views.py Auto-merging planejamento/tests.py Auto-merging planejamento/permissions.xml CONFLICT (content): Merge conflict in planejamento/permissions.xml Auto-merging planejamento/menu.json Auto-merging pesquisa/migrations/0034_auto_20170602_1414.py Auto-merging patrimonio/views.py CONFLICT (content): Merge conflict in patrimonio/views.py Auto-merging patrimonio/urls.py Auto-merging patrimonio/templates/inventario.html Auto-merging patrimonio/relatorio.py CONFLICT (content): Merge conflict in patrimonio/relatorio.py Auto-merging patrimonio/permissions.xml CONFLICT (content): Merge conflict in patrimonio/permissions.xml Auto-merging patrimonio/models.py CONFLICT (content): Merge conflict in patrimonio/models.py Auto-merging patrimonio/menu.json CONFLICT (content): Merge conflict in patrimonio/menu.json Auto-merging patrimonio/forms.py CONFLICT (content): Merge conflict in patrimonio/forms.py Auto-merging patrimonio/admin.py CONFLICT (content): Merge conflict in patrimonio/admin.py Auto-merging ldap_backend/views.py Auto-merging ldap_backend/utils.py Auto-merging ldap_backend/models.py CONFLICT (content): Merge conflict in ldap_backend/models.py Auto-merging frota/views.py CONFLICT (content): Merge conflict in frota/views.py Auto-merging frota/relatorio.py Auto-merging frota/permissions.xml Auto-merging frota/models.py Auto-merging frota/forms.py CONFLICT (content): Merge conflict in frota/forms.py Auto-merging frota/admin.py Auto-merging financeiro/importador.py Auto-merging etep/perms.py Auto-merging estagios/models.py CONFLICT (content): Merge conflict in estagios/models.py Removing estagios/management/commands/estagios_verificar_matricula_inregular.py Auto-merging estagios/forms.py CONFLICT (content): Merge conflict in estagios/forms.py Auto-merging edu/q_academico.py CONFLICT (content): Merge conflict in edu/q_academico.py Auto-merging edu/migrations/0189_merge_20170613_0905.py Auto-merging edu/management/commands/edu_notificar_responsaveis_certificacao_enem.py Auto-merging documento_eletronico/utils.py CONFLICT (content): Merge conflict in documento_eletronico/utils.py Auto-merging documento_eletronico/permissions.xml Auto-merging documento_eletronico/menu.json Auto-merging djtools/utils.py CONFLICT (content): Merge conflict in djtools/utils.py Auto-merging djtools/templatetags/tags.py CONFLICT (content): Merge conflict in djtools/templatetags/tags.py Auto-merging djtools/templatetags/filters.py CONFLICT (content): Merge conflict in djtools/templatetags/filters.py Auto-merging djtools/static/ckeditor/ckeditor/plugins/base64image/icons/hidpi/base64image.png Auto-merging djtools/static/ckeditor/ckeditor/plugins/base64image/icons/base64image.png Auto-merging djtools/forms/__init__.py Auto-merging djtools/formfields.py Auto-merging deploy/requirements.txt CONFLICT (content): Merge conflict in deploy/requirements.txt Removing demandas/templates/relatorio_atualizacoes.html Auto-merging demandas/models.py Auto-merging demandas/menu.json CONFLICT (content): Merge conflict in demandas/menu.json Auto-merging contratos/views.py Auto-merging contratos/permissions.xml Auto-merging contratos/models.py Auto-merging contratos/menu.json Auto-merging contratos/forms.py CONFLICT (content): Merge conflict in contratos/forms.py Auto-merging comum/views.py CONFLICT (content): Merge conflict in comum/views.py Auto-merging comum/utils.py Auto-merging comum/templates/login.html CONFLICT (content): Merge conflict in comum/templates/login.html Auto-merging comum/templates/gerenciamento_grupo.html CONFLICT (content): Merge conflict in comum/templates/gerenciamento_grupo.html Auto-merging comum/templates/admin/base.html Auto-merging comum/templates/500.html Removing comum/static/comum/img/snow3.png Removing comum/static/comum/img/snow2.png Removing comum/static/comum/img/snow1.png Removing comum/static/comum/img/snow-tree.png Removing comum/static/comum/img/menu-seta.png Removing comum/static/comum/img/icons/iconlist-user.png Removing comum/static/comum/img/icons/iconlist-money.png Removing comum/static/comum/img/icons/iconlist-calendar.png Removing comum/static/comum/img/icons/icon-support.png Removing comum/static/comum/img/icons/icon-settings.png Removing comum/static/comum/img/icons/icon-setores.png Removing comum/static/comum/img/icons/icon-servidores.png Removing comum/static/comum/img/icons/icon-rss.png Removing comum/static/comum/img/icons/icon-protocolo.png Removing comum/static/comum/img/icons/icon-phones.png Removing comum/static/comum/img/icons/icon-microsoft.png Removing comum/static/comum/img/icons/icon-macro.png Removing comum/static/comum/img/icons/icon-machines.png Removing comum/static/comum/img/icons/icon-logout.png Removing comum/static/comum/img/icons/icon-home.png Removing comum/static/comum/img/favicon-notification.png Removing comum/static/comum/img/background_relatorio.png Auto-merging comum/static/comum/css/login.css Auto-merging comum/static/comum/css/estilo.css CONFLICT (content): Merge conflict in comum/static/comum/css/estilo.css Auto-merging comum/permissions.xml Auto-merging comum/models.py CONFLICT (content): Merge conflict in comum/models.py Auto-merging comum/importador.py Auto-merging comum/forms.py Auto-merging comum/admin.py Auto-merging chaves/views.py Auto-merging centralservicos/views.py CONFLICT (content): Merge conflict in centralservicos/views.py Auto-merging centralservicos/urls.py CONFLICT (content): Merge conflict in centralservicos/urls.py Auto-merging centralservicos/models.py Auto-merging centralservicos/menu.json Removing centralservicos/management/commands/centralservicos_remover_atendentes_inativos.py Removing centralservicos/management/commands/centralservicos_fechar_chamados.py Auto-merging centralservicos/forms.py Auto-merging centralservicos/admin.py CONFLICT (content): Merge conflict in centralservicos/admin.py Auto-merging almoxarifado/views.py Auto-merging almoxarifado/validacao.py Auto-merging almoxarifado/urls.py Auto-merging almoxarifado/templates/tela_requisicao_detalhe.html CONFLICT (content): Merge conflict in almoxarifado/templates/tela_requisicao_detalhe.html Auto-merging almoxarifado/templates/entrada.html Auto-merging almoxarifado/relatorio.py CONFLICT (content): Merge conflict in almoxarifado/relatorio.py Auto-merging almoxarifado/permissions.xml CONFLICT (content): Merge conflict in almoxarifado/permissions.xml Auto-merging almoxarifado/models.py CONFLICT (content): Merge conflict in almoxarifado/models.py Auto-merging almoxarifado/menu.json CONFLICT (content): Merge conflict in almoxarifado/menu.json Auto-merging ae/webservice.py Auto-merging ae/views.py Auto-merging ae/management/commands/edu_inativar_participacao_ae.py Automatic merge failed; fix conflicts and then commit the result.
Passo 4
Rodar o sync e resolver os problemas das migrations no banco
delete from django_migrations where app = 'patrimonio' and name = '0025_auto_20161027_1316'; delete from django_migrations where app = 'patrimonio' and name = '0026_auto_20161122_0905'; delete from django_migrations where app = 'patrimonio' and name = '0027_merge'; delete from django_migrations where app = 'patrimonio' and name = '0028_auto_20170315_0940'; delete from django_migrations where app = 'patrimonio' and name = '0029_auto_20170411_1037'; delete from django_migrations where app = 'patrimonio' and name = '0030_bensetiquetadosifce_data_atesto_nota_fiscal'; delete from django_migrations where app = 'patrimonio' and name = '0031_auto_20170623_1356'; delete from django_migrations where app = 'patrimonio' and name = '0032_inventario_tombamento_anterior'; delete from django_migrations where app = 'almoxarifado' and name = '0014_auto_20170620_1435'; delete from django_migrations where app = 'almoxarifado' and name = '0013_auto_20170620_1416'; delete from django_migrations where app = 'rh' and name = '0064_auto_20170629_1531'; delete from django_migrations where app = 'rh' and name = '0065_emailsetorial'; delete from django_migrations where app = 'rh' and name = '0066_auto_20171004_1325'; delete from django_migrations where app = 'rh' and name = '0067_auto_20171004_1334'; delete from django_migrations where app = 'rh' and name = '0068_emailsetorial_criado_no_gmail'; delete from django_migrations where app = 'frota' and name = '0024_auto_20170810_1134'; delete from django_migrations where app = 'frota' and name = '0023_auto_20170727_1212'; delete from django_migrations where app = 'frota' and name = '0022_viagem_custo_viagem_estimado'; delete from django_migrations where app = 'frota' and name = '0021_auto_20170725_1040'; delete from django_migrations where app = 'frota' and name = '0020_viatura_ativo'; delete from django_migrations where app = 'contratos' and name = '0007_auto_20170202_1612';
Resolver o problema de email secundario despadronizado
update pessoa set email_secundario = '' where email_secundario not like '%@%' and email_secundario <> '';
Para resolver os problemas do Edu/QAcademico
truncate edu_situacaomatriculaperiodo, edu_historicosituacaomatriculaperiodo, edu_matriculaperiodo, edu_aproveitamentocomponente, edu_aproveitamentoestudo, edu_certificacaoconhecimento, edu_creditoespecial, edu_matriculadiario, edu_matriculadiarioresumida, edu_pedidomatricula, edu_procedimentomatricula, edu_projetofinal, edu_registrohistorico, edu_aproveitamentocomponente_matriculas_diario, edu_aproveitamentocomponente_matriculas_diario_resumidas, edu_aproveitamentocomponente_registros_historico, edu_estagiodocente, edu_falta, edu_notaavaliacao, edu_pedidomatriculadiario, edu_visitaestagiodocente;
E depois:
python manage.py sync