Update files from template

Author: jpmckinney

.gitignore

@@ -1,15 +1,12 @@
-*.ipynb_checkpoints
 *.mo
-*.pyc
 *.swp
 .cache
-.ropeproject
 .ve
-venv
 
 /build
 /cache.sqlite
 /chromedriver
 /chromedriver_linux64.zip
 /chromedriver_mac64.zip
 /chromedriver_win32.zip
+/docs/_static/patched

.travis.yml

@@ -27,5 +27,6 @@ install:
   - pip install -r requirements.txt
 script:
   - curl -s -S --retry 3 $BASEDIR/tests/script.sh | bash -
+  - if [ $TRAVIS_REPO_SLUG = 'open-contracting/standard_profile_template' ]; then python schema/build-profile.py; make extract; fi
   - make
-  - py.test -rs --tb=line
+  - py.test

Makefile

@@ -1,4 +1 @@
-# Update this file from a profile with:
-# curl -O https://raw.githubusercontent.com/open-contracting/standard_profile_template/master/Makefile
-
 include include/prologue.mk include/config.mk include/common.mk

include/common.mk

@@ -1,6 +1,3 @@
-# Update this file from a profile with:
-# curl https://raw.githubusercontent.com/open-contracting/standard_profile_template/master/include/common.mk -o include/common.mk
-
 # See https://github.com/datamade/data-making-guidelines
 
 # See http://clarkgrubb.com/makefile-style-guide#phony-target-arg

include/config.mk

@@ -15,7 +15,7 @@ LOCALE_DIR=standard/docs/locale
 # Directory in which to build documentation files.
 BUILD_DIR=build
 # Extra build files or directories. (These should match paths in .gitignore.)
-EXTRA_BUILD_FILES=/chromedriver*
+EXTRA_BUILD_FILES=chromedriver*
 # Files that are built and distributed (you may use Bash extended globbing).
 DIST_FILES=
 # Directory in which to build .pot files.

include/prologue.mk

@@ -1,6 +1,3 @@
-# Update this file from a profile with:
-# curl https://raw.githubusercontent.com/open-contracting/standard_profile_template/master/include/prologue.mk -o include/prologue.mk
-
 # See http://clarkgrubb.com/makefile-style-guide#prologue
 MAKEFLAGS += --warn-undefined-variables
 SHELL := bash

script/diff

@@ -0,0 +1,8 @@
+#!/bin/bash
+for f in .travis.yml docs/conf.py include/config.mk schema/build-profile.py; do
+  curl -sS https://raw.githubusercontent.com/open-contracting/standard_profile_template/master/$f | diff -u - $f
+done
+
+if [ -d standard -o -d schema/project-level ]; then
+  curl -sS https://raw.githubusercontent.com/open-contracting/standard_profile_template/master/.gitignore | diff -u - .gitignore
+fi

script/update

@@ -0,0 +1,24 @@
+#!/bin/bash
+set -e
+
+if [ -f standard ]; then
+  prefix=standard/
+else
+  prefix=
+fi
+
+mkdir -p script include ${prefix}tests
+
+for f in Makefile common-requirements.txt include/common.mk include/prologue.mk script/diff script/update; do
+  curl -sS -o $f https://raw.githubusercontent.com/open-contracting/standard_profile_template/master/$f
+done
+
+for f in tests/conftest.py tests/test_common.py; do
+  curl -sS -o $prefix$f https://raw.githubusercontent.com/open-contracting/standard_profile_template/master/$f
+done
+
+if [ ! -d standard -a ! -d schema/project-level ]; then
+  curl -sS -o .gitignore https://raw.githubusercontent.com/open-contracting/standard_profile_template/master/.gitignore
+fi
+
+chmod +x script/*

standard/tests/conftest.py

@@ -1,5 +1,3 @@
-# Update this file from a profile with:
-# curl https://raw.githubusercontent.com/open-contracting/standard_profile_template/master/tests/conftest.py -o tests/conftest.py # noqa
 import os
 from http.server import HTTPServer, SimpleHTTPRequestHandler
 from multiprocessing import Process

standard/tests/test_common.py

@@ -1,14 +1,23 @@
-# Update this file from a profile with:
-# curl https://raw.githubusercontent.com/open-contracting/standard_profile_template/master/tests/test_common.py -o tests/test_common.py # noqa
+import os
 import re
 import time
+import warnings
 
 import pytest
 import requests
 from selenium.common.exceptions import NoSuchElementException
 from selenium.webdriver.support.ui import Select
 
-from . import languages, test_basic_params, test_search_params
+from tests import languages, test_basic_params, test_search_params
+
+cwd = os.getcwd()
+
+
+def custom_warning_formatter(message, category, filename, lineno, line=None):
+    return str(message).replace(cwd + os.sep, '')
+
+
+warnings.formatwarning = custom_warning_formatter
 
 
 @pytest.mark.parametrize('lang,text', test_basic_params.items())
@@ -44,6 +53,7 @@ def test_broken_links(browser, server, lang):
     referrer = ''
     hrefs = set()
     browser.get('{}{}'.format(server, lang))
+    failures = []
     while True:
         for link in browser.find_elements_by_partial_link_text(''):
             href = re.sub(r'#.*$', '', link.get_attribute('href'))
@@ -58,9 +68,8 @@ def test_broken_links(browser, server, lang):
             hrefs.add(href)
 
             response = requests.get(href)
-            assert response.status_code == 200, 'expected 200, got {} for {} linked from {}'.format(
-                response.status_code, href, referrer)
-
+            if response.status_code != 200:
+                failures.append([response.status_code, href, referrer])
         try:
             # Scroll the link into view, to make it clickable.
             link = browser.find_element_by_link_text('Next')
@@ -69,3 +78,7 @@ def test_broken_links(browser, server, lang):
             link.click()
         except NoSuchElementException:
             break
+
+    for status_code, href, referrer in failures:
+        warnings.warn('expected 200, got {} for {} linked from {}\n'.format(status_code, href, referrer))
+    assert not failures, 'One or more links are broken. See warnings below.'