From 9f815a077e2c6406593a5a1c1e81fa7b7cf01653 Mon Sep 17 00:00:00 2001 From: tjvr Date: Mon, 19 Sep 2016 15:28:18 +0200 Subject: [PATCH 01/15] ask travis to use GH releases --- .travis.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 31a768c..3fe9655 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: python python: - '2.7' +sudo: true install: - sudo add-apt-repository -y ppa:texlive-backports/ppa - sudo apt-get update @@ -8,14 +9,9 @@ install: script: - (cd sheets; LATEX_OPTS="-interaction=nonstopmode -shell-escape" make pdfrelease) deploy: - provider: s3 - access_key_id: AKIAJNGHJWMQEU6QAIPQ - secret_access_key: - secure: tviNwD7V1A4WRzCwnRGXTHUf6kdbEG+7X7AxnTnSEf+ar1iXl/1aplLKFccc9vwzlGy0sUVqv0wg0kmQkIMhUhdZovOD4gUnOARUZzkTHj9L0apIb2gxLyEyYHCRFiIKLT6Vto8iPbU3ALCoQAhk2oQwM+dznQb6lg+U5HpRK8U= - bucket: livewires-worksheets + provider: releases local-dir: release - upload-dir: "$TRAVIS_BUILD_NUMBER" - acl: !ruby/string:HighLine::String public_read skip_cleanup: true on: repo: livewires/python + tags: true From c9fd304399201bd9a27b2ab23f3a14479b07584c Mon Sep 17 00:00:00 2001 From: tjvr Date: Mon, 19 Sep 2016 15:42:18 +0200 Subject: [PATCH 02/15] maybe this is quicker --- .travis.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3fe9655..2d57d13 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,16 +2,15 @@ language: python python: - '2.7' sudo: true -install: -- sudo add-apt-repository -y ppa:texlive-backports/ppa -- sudo apt-get update -- sudo apt-get install texlive make +before_install: +- sudo apt-get update && sudo apt-get install --no-install-recommends texlive-fonts-recommended + texlive-latex-extra texlive-fonts-extra texlive-latex-recommended dvipng script: - (cd sheets; LATEX_OPTS="-interaction=nonstopmode -shell-escape" make pdfrelease) deploy: provider: releases - local-dir: release - skip_cleanup: true + api_key: + secure: cONhoGDyJTI1AB3N52EXNKoP6VivURket/NZEIzEpLgg2iiXzvevTZehOIJmdB67fdW0cHqkgpsD2kxxJ/BkoJN7atOPdmnIOeKD2GX8ntT33Fcvs3Co2drVPLtpriWQhnY7qNVBsYpm4kuyRZ+gAjFkQus6JC3+YF+O3U29lGTR/CFBmZMgIR+LLUVZMOYlugAOe/6aIYAKhw7jG2B4Do1s/gPM/l9fexqYr5B+4iiTRDZgDo9PcwhyzTEU7XsHhEHf3JQWxWE5U1XybBvvb826EIEj3ak/TaTvF5xe2uIuTGU9Hx5GAvJEOjuB3s/WAhVTGLm50y58ipmLiTg54Ya6tkdLZzsArX+wAexjW58kAlGDiFIvQcmvcdbLBfgtnlAR7MsZEksaJ5TWVZohGMAK0+umIlmJ7sqnQu2g5x11BxAM2TEW5TyTTtlQL1u4Tbc11UGCkVdzqPTBrEJis0b7WTrWawpDlqi22GXeHPl2jI372TMXT5crdIZAgC1zJdF7B+cpxE2bJLrm4JUnAqKtZWs/nmwKMDZ0Z5kG9AtL9aFQhgCr3C7SG+f6HBTiylYRZtucrXWzjU7r8vU9Bc64efvcQr/KFFo9xjLxDRpEyG0t/0q3LUKQdrDpNdVmMXJqYL/cWLHqEoev+LngeIuRhpvX9eeqXdaR0p+E688= + file: release/livewires-pdfs.tar.gz on: - repo: livewires/python - tags: true + repo: tjvr/livewires From 26fd4777a34c77970812dfc2a315ac238202941b Mon Sep 17 00:00:00 2001 From: tjvr Date: Mon, 19 Sep 2016 16:02:43 +0200 Subject: [PATCH 03/15] party? --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2d57d13..e6dc60c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,7 @@ python: - '2.7' sudo: true before_install: -- sudo apt-get update && sudo apt-get install --no-install-recommends texlive-fonts-recommended - texlive-latex-extra texlive-fonts-extra texlive-latex-recommended dvipng +- sudo apt-get install --no-install-recommends texlive-fonts-recommended texlive-latex-extra texlive-fonts-extra texlive-latex-recommended dvipng texlive-extra-utils script: - (cd sheets; LATEX_OPTS="-interaction=nonstopmode -shell-escape" make pdfrelease) deploy: From d723c8ec732ce0f37677075379f94211df813873 Mon Sep 17 00:00:00 2001 From: tjvr Date: Mon, 19 Sep 2016 16:06:56 +0200 Subject: [PATCH 04/15] oh fine --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e6dc60c..6c5c8ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ python: - '2.7' sudo: true before_install: -- sudo apt-get install --no-install-recommends texlive-fonts-recommended texlive-latex-extra texlive-fonts-extra texlive-latex-recommended dvipng texlive-extra-utils +- sudo apt-get install --install-recommends texlive-fonts-recommended texlive-latex-extra texlive-fonts-extra texlive-latex-recommended dvipng texlive-extra-utils script: - (cd sheets; LATEX_OPTS="-interaction=nonstopmode -shell-escape" make pdfrelease) deploy: From 330b220573ff2e1f32f94309be042bec0ad23d06 Mon Sep 17 00:00:00 2001 From: tjvr Date: Mon, 19 Sep 2016 16:11:22 +0200 Subject: [PATCH 05/15] argh --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6c5c8ac..b67c059 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ python: - '2.7' sudo: true before_install: -- sudo apt-get install --install-recommends texlive-fonts-recommended texlive-latex-extra texlive-fonts-extra texlive-latex-recommended dvipng texlive-extra-utils +- sudo apt-get install texlive script: - (cd sheets; LATEX_OPTS="-interaction=nonstopmode -shell-escape" make pdfrelease) deploy: From 86d070f909283ff4dc7078f546cdf8067b0e85e4 Mon Sep 17 00:00:00 2001 From: tjvr Date: Mon, 19 Sep 2016 16:20:36 +0200 Subject: [PATCH 06/15] ooh! use containers --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index b67c059..eeac508 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,10 @@ language: python python: - '2.7' -sudo: true -before_install: -- sudo apt-get install texlive +addons: + apt: + packages: + - texlive script: - (cd sheets; LATEX_OPTS="-interaction=nonstopmode -shell-escape" make pdfrelease) deploy: From f46184a15ee7959ffd61578fa79fabbb46ddbe4c Mon Sep 17 00:00:00 2001 From: tjvr Date: Mon, 19 Sep 2016 20:11:34 +0200 Subject: [PATCH 07/15] help --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index eeac508..6bda946 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,10 @@ python: addons: apt: packages: - - texlive + - texlive-fonts-recommended + - texlive-latex-extra + - texlive-font-utils + - texlive-latex-recommended script: - (cd sheets; LATEX_OPTS="-interaction=nonstopmode -shell-escape" make pdfrelease) deploy: From a8cbae8aff1f704f65f32766fda24eee38f03bb6 Mon Sep 17 00:00:00 2001 From: tjvr Date: Mon, 19 Sep 2016 20:18:20 +0200 Subject: [PATCH 08/15] please --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 6bda946..26fd959 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ addons: - texlive-latex-extra - texlive-font-utils - texlive-latex-recommended + - texlive-generic-recommended script: - (cd sheets; LATEX_OPTS="-interaction=nonstopmode -shell-escape" make pdfrelease) deploy: From 04ce626f67a70d428cf36353f1905603f1cf1427 Mon Sep 17 00:00:00 2001 From: tjvr Date: Mon, 19 Sep 2016 20:20:17 +0200 Subject: [PATCH 09/15] hmm --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 26fd959..b666014 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ addons: - texlive-latex-recommended - texlive-generic-recommended script: +- apt list --installed - (cd sheets; LATEX_OPTS="-interaction=nonstopmode -shell-escape" make pdfrelease) deploy: provider: releases From 8729e77bc73a6d3e3e390745634dff28ec257ce5 Mon Sep 17 00:00:00 2001 From: tjvr Date: Mon, 19 Sep 2016 20:23:26 +0200 Subject: [PATCH 10/15] dvipng? --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index b666014..57a1729 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ addons: - texlive-font-utils - texlive-latex-recommended - texlive-generic-recommended + - dvipng script: - apt list --installed - (cd sheets; LATEX_OPTS="-interaction=nonstopmode -shell-escape" make pdfrelease) From aa2df31ef97a403fa82de2da5492cfd5d0cf254c Mon Sep 17 00:00:00 2001 From: tjvr Date: Mon, 19 Sep 2016 20:26:42 +0200 Subject: [PATCH 11/15] literally start throwing things --- .travis.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 57a1729..60c3efe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,12 +4,7 @@ python: addons: apt: packages: - - texlive-fonts-recommended - - texlive-latex-extra - - texlive-font-utils - - texlive-latex-recommended - - texlive-generic-recommended - - dvipng + - texlive-full script: - apt list --installed - (cd sheets; LATEX_OPTS="-interaction=nonstopmode -shell-escape" make pdfrelease) From e8160ea4c791ed4f3c5f612f9e5428ce267b2b8b Mon Sep 17 00:00:00 2001 From: tjvr Date: Mon, 19 Sep 2016 20:40:34 +0200 Subject: [PATCH 12/15] surely one of these --- .travis.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 60c3efe..66b61af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,9 +4,19 @@ python: addons: apt: packages: - - texlive-full + - texlive-latex-recommended + - texlive-latex-extra + - texlive-fonts-recommended + - texlive-font-utils + - texlive-generic-recommended + - psutils + - ps2eps + - dvidvi + - purifyeps script: - apt list --installed +- epstopdf +- dvips - (cd sheets; LATEX_OPTS="-interaction=nonstopmode -shell-escape" make pdfrelease) deploy: provider: releases From cdcf269f816604f6af27009a390043f8f1f42c98 Mon Sep 17 00:00:00 2001 From: tjvr Date: Mon, 19 Sep 2016 20:45:30 +0200 Subject: [PATCH 13/15] argh --- .travis.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.travis.yml b/.travis.yml index 66b61af..1afb9e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,15 @@ addons: - ps2eps - dvidvi - purifyeps + - t1utils + - dot2tex + - texlive-luatex + - lmodern + - tipa + - prosper + - latex-beamer + - latex-xcolor + - pgf script: - apt list --installed - epstopdf From 523d222b4e483bd761cc21d2e5793aa01c0bb05e Mon Sep 17 00:00:00 2001 From: tjvr Date: Wed, 2 Aug 2017 17:10:24 +0100 Subject: [PATCH 14/15] Some typos which suspiciously are already fixed on the sheet i have right here --- sheets/games/minesweeper.ltx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sheets/games/minesweeper.ltx b/sheets/games/minesweeper.ltx index bc261f2..a25bc5e 100755 --- a/sheets/games/minesweeper.ltx +++ b/sheets/games/minesweeper.ltx @@ -231,6 +231,9 @@ Now we get on to our boxes on the screen. \begin{program} class GridBox(boards.GameCell): def __init__(self, screen, i, j): + self.init_gridbox(screen, i, j) + + def init_gridbox(self, screen, i, j): self.init_gamecell(screen, i, j) self.flagged = 0 self.shown = 0 @@ -264,9 +267,9 @@ so that it can be seen. The following code will do the trick: \begin{program} class Mine(boards.Container, GridBox): - def __init(self, board, i, j): - self.init_gridbox(board, i, j) + def __init__(self, board, i, j): self.init_container(['image', 'flag']) + self.init_gridbox(board, i, j) def reveal_mine(self): self.set_colour(colour.red) From 9f67666b4f888242de8896df625ab051fab2a691 Mon Sep 17 00:00:00 2001 From: tjvr Date: Fri, 4 Aug 2017 14:53:38 +0100 Subject: [PATCH 15/15] Another typo --- sheets/games/tetris.ltx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sheets/games/tetris.ltx b/sheets/games/tetris.ltx index 5842abb..c666f76 100755 --- a/sheets/games/tetris.ltx +++ b/sheets/games/tetris.ltx @@ -619,8 +619,8 @@ tx, ty = self.cell_to_coords(WIDTH/2, -1) self.status_message = games.Text(self, tx, ty+BOX_SIZE/2, "TETRIS", TITLE_SIZE, colour.white) tx, ty = self.cell_to_coords(WIDTH/2, HEIGHT) -self.score_message = game.Text(self, tx, ty+BOX_SIZE/2, - "Score: 0", SCORE_SIZE, colour.white) +self.score_message = games.Text(self, tx, ty+BOX_SIZE/2, + "Score: 0", SCORE_SIZE, colour.white) self.score = 0 \end{program}