Merge branch 'main' into master

Author: hjwp

.git-blame-ignore-revs

@@ -1,92 +1,38 @@
+---
 name: Book tests
 
-on: [push]
+on:
+  push:
+    branches:
+      main
+  pull_request:
 
 jobs:
-  tests:
-
+  chapter-tests:
     runs-on: ubuntu-latest
-    
-    env:
-      MOZ_HEADLESS: 1
-      LC_ALL: en_GB.UTF-8
-      LANG: en_GB.UTF8
-      LANGUAGE: "en_GB:en"
-
+    strategy:
+      fail-fast: false
+      matrix:
+        test_chapter: [
+          test_chapter_01,
+          test_chapter_02_unittest,
+          test_chapter_03_unit_test_first_view,
+          test_chapter_04_philosophy_and_refactoring,
+          test_chapter_05_post_and_database,
+          test_chapter_06_explicit_waits_1,
+          test_chapter_07_working_incrementally,
+          test_chapter_08_prettification,
+          # test_chapter_09_docker,
+          # test_chapter_10_production_readiness,
+          # test_chapter_11_ansible,
+          test_chapter_12_organising_test_files,
+          test_chapter_13_database_layer_validation,
+          test_chapter_14_simple_form,
+          unit-test
+        ]
     steps:
-    - uses: actions/checkout@v1
-    
-    - name: checkout submodules
-      run: |
-        sed -i '[email protected]:_https://github.com/_' .gitmodules
-        git submodule update --init --recursive
-
-    - name: setup git user
-      run: |
-        git config --global user.email "[email protected]"
-        git config --global user.name "Elspeth See-Eye"
-    
-    - name: Set up Python 3.11
-      uses: actions/setup-python@v1
-      with:
-        python-version: 3.11
-
-    - name: Install apt stuff and other dependencies
-      run: |
-        sudo apt update -y
-        sudo apt install -y asciidoctor language-pack-en ruby-coderay firefox tree locales
-        sudo locale-gen en_GB.UTF-8 
-
-    # - name: Install asciidoc and other ruby dependencies
-    #   run: |
-    #     sudo gem install coderay
-        
-    - name: Install Python requirements.txt
-      run: |
-        python -m pip install --upgrade pip
-        pip install -r requirements.txt
-        
-    - name: Check environment
-      run: |
-        locale -a
-        locale
-        env
-
-    - name: Test chapter 1
-      if: always()
-      run: |
-        make test_chapter_01
-
-    - name: Test chapter 2
-      if: always()
-      run: |
-        make test_chapter_02_unittest
-
-    - name: Test chapter 3
-      if: always()
-      run: |
-        make test_chapter_unit_test_first_view
-
-    - name: Test chapter 4
-      if: always()
-      run: |
-        make test_chapter_philosophy_and_refactoring
-
-    - name: Test chapter 5
-      if: always()
-      run: |
-        make test_chapter_post_and_database
-
-    - name: Test chapter 6
-      if: always()
-      run: |
-        make test_chapter_explicit_waits_1
-
-    - name: Test chapter 7
-      if: always()
-      run: |
-        make test_chapter_working_incrementally
-  # - name: Test all chapters in parallel, yolo
-  #   run: |
-  #     make build
-  #     pytest --tb=short --color=yes --numprocesses=4 tests/test_chapter_*
+      - uses: actions/checkout@v4
+      - id: foo
+        uses: hjwp/github-actions@v6
+        with:
+          test_chapter: ${{ matrix.test_chapter }}

.github/workflows/tests.yml

@@ -1,56 +1,44 @@
 *.pyc
-misc/abandoned_roman_numerals_example
-docs/atlas_docs/
-proposals
-tags
-pdf_drafts
-pycon
-source/*/static
-source/*/.venv
-source/*/database
-chapter_*.html
-appendix_*.html
-outline_and_future*.html
-pre-requisite-installations.html
-preface.html
-epilogue.html
-bibliography.html
-part2.html
-acknowledgments.html
-book.harry.asciidoc
-harrybook.asciidoc
-part1.harry.asciidoc
-part1.harry.html
-part1.html
-part2.harry.asciidoc
-part2.harry.html
-part3.harry.asciidoc
-part3.harry.html
-part3.html
-book.harry.html
-praise.harry.html
-wordcounts.*
-feedback
-downloads/*.js
-downloads/mock*
-misc/promo/
-misc/Vagrantfile
-misc/superlists-repo-django16-backup.zip
-tdd-tutorial-materials
-misc/Invoice-Percival-1
-video
-misc/*conference_report.md
-video_plug.html
-tests/.cache/
-workshops/js-testing-with-jasmine.html
-chapter_philosophy_and_refactoring.html
-chapter_unit_test_first_view.html
-chapter_02_unittest.html
 .cache
 .vagrant
 *-cloudimg-console.log
-tech review/
 .venv
-geckodriver.log
 .pytest_cache
-2018-06-12-14-16-35.098-VBoxSVC-24136.log
+
+/chapter_*.html
+/appendix_*.html
+/part*.html
+/outline_and_future*.html
+/pre-requisite-installations.html
+/preface.html
+/epilogue.html
+/bibliography.html
+/acknowledgments.html
+/video_plug.html
+/part*.forbook.asciidoc
+/praise.forbook.html
+
+/misc/abandoned_roman_numerals_example
+/docs/atlas_docs/
+/proposals
+/tags
+/pdf_drafts
+/pycon
+/source/*/static
+/source/*/database
+/wordcounts.*
+/feedback
+/downloads/*.js
+/downloads/mock*
+/misc/promo/
+/misc/Vagrantfile
+/misc/superlists-repo-django16-backup.zip
+/tdd-tutorial-materials
+/misc/Invoice-Percival-1
+/video
+/misc/*conference_report.md
+/tests/.cache/
+/workshops/js-testing-with-jasmine.html
+/tech review/
+.vagrant.d
+*.egg-info

.gitignore

@@ -5,37 +5,37 @@
 	path = source/chapter_02_unittest/superlists
 	url = [email protected]:hjwp/book-example.git
 [submodule "source/chapter_03/superlists"]
-	path = source/chapter_unit_test_first_view/superlists
+	path = source/chapter_03_unit_test_first_view/superlists
 	url = [email protected]:hjwp/book-example.git
 [submodule "source/chapter_04/superlists"]
-	path = source/chapter_philosophy_and_refactoring/superlists
+	path = source/chapter_04_philosophy_and_refactoring/superlists
 	url = [email protected]:hjwp/book-example.git
 [submodule "source/chapter_05/superlists"]
-	path = source/chapter_post_and_database/superlists
+	path = source/chapter_05_post_and_database/superlists
 	url = [email protected]:hjwp/book-example.git
 [submodule "source/chapter_06/superlists"]
-	path = source/chapter_explicit_waits_1/superlists
+	path = source/chapter_06_explicit_waits_1/superlists
 	url = [email protected]:hjwp/book-example.git
 [submodule "source/chapter_07/superlists"]
-	path = source/chapter_working_incrementally/superlists
+	path = source/chapter_07_working_incrementally/superlists
 	url = [email protected]:hjwp/book-example.git
 [submodule "source/chapter_08/superlists"]
-	path = source/chapter_prettification/superlists
+	path = source/chapter_08_prettification/superlists
 	url = [email protected]:hjwp/book-example.git
 [submodule "source/chapter_09/superlists"]
-	path = source/chapter_manual_deployment/superlists
+	path = source/chapter_09_docker/superlists
 	url = [email protected]:hjwp/book-example.git
-[submodule "source/chapter_10/superlists"]
-	path = source/chapter_automate_deployment_with_fabric/superlists
+[submodule "source/chapter_10_production_readiness/superlists"]
+	path = source/chapter_10_production_readiness/superlists
 	url = [email protected]:hjwp/book-example.git
 [submodule "source/chapter_11/superlists"]
-	path = source/chapter_database_layer_validation/superlists
+	path = source/chapter_13_database_layer_validation/superlists
 	url = [email protected]:hjwp/book-example.git
 [submodule "source/chapter_12/superlists"]
-	path = source/chapter_simple_form/superlists
+	path = source/chapter_14_simple_form/superlists
 	url = [email protected]:hjwp/book-example.git
 [submodule "source/chapter_13/superlists"]
-	path = source/chapter_advanced_forms/superlists
+	path = source/chapter_15_advanced_forms/superlists
 	url = [email protected]:hjwp/book-example.git
 [submodule "source/chapter_14/superlists"]
 	path = source/chapter_javascript/superlists
@@ -94,9 +94,9 @@
 [submodule "source/chapter_fixtures_and_wait_decorator/superlists"]
 	path = source/chapter_fixtures_and_wait_decorator/superlists
 	url = [email protected]:hjwp/book-example.git
-[submodule "source/chapter_organising_test_files/superlists"]
-	path = source/chapter_organising_test_files/superlists
+[submodule "source/chapter_12_organising_test_files/superlists"]
+	path = source/chapter_12_organising_test_files/superlists
 	url = [email protected]:hjwp/book-example.git
-[submodule "source/chapter_making_deployment_production_ready/superlists"]
-	path = source/chapter_making_deployment_production_ready/superlists
+[submodule "source/chapter_11_ansible/superlists"]
+	path = source/chapter_11_ansible/superlists
 	url = [email protected]:hjwp/book-example.git

.gitmodules

@@ -1 +1 @@
-3.11
+3.12