From b84685e68907a76688be589f28700977e8794049 Mon Sep 17 00:00:00 2001
From: Krzysztof <krzysztof.kolodzinski@lifeflow.eu>
Date: Thu, 31 Mar 2022 21:16:20 +0200
Subject: [PATCH 01/37] created github actions

---
 .github/workflows/build.yml | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 .github/workflows/build.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 000000000..9b58267ab
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,29 @@
+name: Publish Python distributions to PyPI and TestPyPI
+env:
+  BOOST_PYTHON_LIB: boost_python
+  BOOST_SYSTEM_LIB: boost_system
+  MASON_BUILD: true
+on: [push, pull_request]
+jobs:
+  build-n-publish:
+    runs-on: ubuntu-20.04
+    name: Build and publish Python distribution
+    steps:
+      - uses: actions/checkout@v3
+      - name: install dependencies
+        run: |
+          sudo apt-get install libboost-python-dev
+      - name: Initialize Python 2.7
+        uses: actions/setup-python@v3
+        with:
+          python-version: 2.7
+      - name: Build binary wheel and a source tarball
+        run: |
+          pip install wheel
+          python setup.py sdist bdist_wheel
+      - uses: actions/upload-artifact@v2
+        with:
+          path: ./dist/*.whl
+      - name: Run tests
+        run: |
+          python setup.py test

From f1ec905581e4a5c6c87bd8450302622a5aa7cf6e Mon Sep 17 00:00:00 2001
From: ravenwing <kolodzinski.krzys@gmail.com>
Date: Fri, 1 Apr 2022 00:50:55 +0200
Subject: [PATCH 02/37] changing python to 3.6

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9b58267ab..88cdf9d49 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,10 +13,10 @@ jobs:
       - name: install dependencies
         run: |
           sudo apt-get install libboost-python-dev
-      - name: Initialize Python 2.7
+      - name: Initialize Python 3.6
         uses: actions/setup-python@v3
         with:
-          python-version: 2.7
+          python-version: 3.6
       - name: Build binary wheel and a source tarball
         run: |
           pip install wheel

From 021e2cacc53443fb5d74ca8b86c21e5aa614bc2c Mon Sep 17 00:00:00 2001
From: ravenwing <kolodzinski.krzys@gmail.com>
Date: Fri, 1 Apr 2022 10:29:32 +0200
Subject: [PATCH 03/37] added matrix of pythons

---
 .github/workflows/build.yml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 88cdf9d49..ae66ae9d1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -5,7 +5,13 @@ env:
   MASON_BUILD: true
 on: [push, pull_request]
 jobs:
-  build-n-publish:
+  build-and-test:
+    strategy:
+      matrix:
+        python-version:
+        - "2.7"
+        - "3.6"
+        - "3.8"
     runs-on: ubuntu-20.04
     name: Build and publish Python distribution
     steps:
@@ -13,10 +19,10 @@ jobs:
       - name: install dependencies
         run: |
           sudo apt-get install libboost-python-dev
-      - name: Initialize Python 3.6
+      - name: Initialize Python {{matrix.python-version}}
         uses: actions/setup-python@v3
         with:
-          python-version: 3.6
+          python-version: ${{ matrix.python-version }}
       - name: Build binary wheel and a source tarball
         run: |
           pip install wheel

From 59df4c0a47d6d6785cc66be7f7da28ead97e93e8 Mon Sep 17 00:00:00 2001
From: Krzysztof <krzysztof.kolodzinski@lifeflow.eu>
Date: Fri, 1 Apr 2022 15:34:22 +0200
Subject: [PATCH 04/37] new build instructions

---
 .github/workflows/build.yml | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ae66ae9d1..5f1cd5321 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,23 +2,32 @@ name: Publish Python distributions to PyPI and TestPyPI
 env:
   BOOST_PYTHON_LIB: boost_python
   BOOST_SYSTEM_LIB: boost_system
+  BOOST_THREAD_LIB: boost_thread
+  PYCAIRO: true
   MASON_BUILD: true
 on: [push, pull_request]
 jobs:
   build-and-test:
     strategy:
+      fail-fast: false
       matrix:
         python-version:
         - "2.7"
-        - "3.6"
-        - "3.8"
-    runs-on: ubuntu-20.04
+        #- "3.6"
+        #- "3.8"
+        system:
+        #- ubuntu-18.04
+        - ubuntu-20.04
+    runs-on: ${{matrix.system}}
     name: Build and publish Python distribution
     steps:
       - uses: actions/checkout@v3
+        with:
+          submodules: true
       - name: install dependencies
         run: |
-          sudo apt-get install libboost-python-dev
+          sudo apt-get install libboost-python-dev python-cairo-dev clang
+      #clang-3.9
       - name: Initialize Python {{matrix.python-version}}
         uses: actions/setup-python@v3
         with:

From 6c9f2f9bd806536bacff8e298e6e0510d9010022 Mon Sep 17 00:00:00 2001
From: ravenwing <kolodzinski.krzys@gmail.com>
Date: Fri, 1 Apr 2022 15:51:47 +0200
Subject: [PATCH 05/37] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5f1cd5321..085c451ea 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,7 +3,7 @@ env:
   BOOST_PYTHON_LIB: boost_python
   BOOST_SYSTEM_LIB: boost_system
   BOOST_THREAD_LIB: boost_thread
-  PYCAIRO: true
+  PYCAIRO: false
   MASON_BUILD: true
 on: [push, pull_request]
 jobs:

From 5ca2f55753fedcbac8e66bc6f263020a73aaea60 Mon Sep 17 00:00:00 2001
From: ravenwing <kolodzinski.krzys@gmail.com>
Date: Fri, 1 Apr 2022 16:07:38 +0200
Subject: [PATCH 06/37] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 085c451ea..b385a09a3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -26,7 +26,7 @@ jobs:
           submodules: true
       - name: install dependencies
         run: |
-          sudo apt-get install libboost-python-dev python-cairo-dev clang
+          sudo apt-get install libboost-python-dev python3-cairo-dev python-cairo-dev clang
       #clang-3.9
       - name: Initialize Python {{matrix.python-version}}
         uses: actions/setup-python@v3

From 4f7aa50cb33386232df2bbcf5d737be79826cadb Mon Sep 17 00:00:00 2001
From: ravenwing <kolodzinski.krzys@gmail.com>
Date: Fri, 1 Apr 2022 16:18:48 +0200
Subject: [PATCH 07/37] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b385a09a3..3868919e6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,7 +3,7 @@ env:
   BOOST_PYTHON_LIB: boost_python
   BOOST_SYSTEM_LIB: boost_system
   BOOST_THREAD_LIB: boost_thread
-  PYCAIRO: false
+  PYCAIRO: true
   MASON_BUILD: true
 on: [push, pull_request]
 jobs:

From 0407c3e91ce3d6536ac929e7dd3d80aead21642a Mon Sep 17 00:00:00 2001
From: ravenwing <kolodzinski.krzys@gmail.com>
Date: Fri, 1 Apr 2022 16:32:43 +0200
Subject: [PATCH 08/37] Update mapnik_image.cpp

---
 src/mapnik_image.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mapnik_image.cpp b/src/mapnik_image.cpp
index 9add692c9..004b7405b 100644
--- a/src/mapnik_image.cpp
+++ b/src/mapnik_image.cpp
@@ -47,7 +47,7 @@
 #define PYCAIRO_NO_IMPORT
 #include <py3cairo.h>
 #else
-#include <pycairo.h>
+#include <pycairo/pycairo.h>
 #endif
 #include <cairo.h>
 #endif

From 49c3440174dfad6c0e5970d050bfd5a2d958ffb9 Mon Sep 17 00:00:00 2001
From: ravenwing <kolodzinski.krzys@gmail.com>
Date: Fri, 1 Apr 2022 16:41:42 +0200
Subject: [PATCH 09/37] Update mapnik_python.cpp

---
 src/mapnik_python.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mapnik_python.cpp b/src/mapnik_python.cpp
index 14523b034..69bb489af 100644
--- a/src/mapnik_python.cpp
+++ b/src/mapnik_python.cpp
@@ -146,7 +146,7 @@ void clear_cache()
 #if PY_MAJOR_VERSION >= 3
 #include <py3cairo.h>
 #else
-#include <pycairo.h>
+#include <pycairo/pycairo.h>
 static Pycairo_CAPI_t *Pycairo_CAPI;
 #endif
 

From 1c7dfd0ce601b0868be6e6de048725d37dbbc9eb Mon Sep 17 00:00:00 2001
From: ravenwing <kolodzinski.krzys@gmail.com>
Date: Fri, 1 Apr 2022 16:49:56 +0200
Subject: [PATCH 10/37] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3868919e6..3e60b6390 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -34,7 +34,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Build binary wheel and a source tarball
         run: |
-          pip install wheel
+          pip install wheel pycairo
           python setup.py sdist bdist_wheel
       - uses: actions/upload-artifact@v2
         with:

From 0ad011ce00ebab67baefcc4224fbbe2c85ea343d Mon Sep 17 00:00:00 2001
From: ravenwing <kolodzinski.krzys@gmail.com>
Date: Fri, 1 Apr 2022 17:11:33 +0200
Subject: [PATCH 11/37] changed badge

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index bdcc1a0a6..3e3791011 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,4 @@
-
-[![Build Status](https://travis-ci.org/mapnik/python-mapnik.svg)](https://travis-ci.org/mapnik/python-mapnik)
+![Build Status](https://github.com/raven-wing/python-mapnik/actions/workflows/build.yml/badge.svg)
 
 Python bindings for Mapnik.
 

From c0ba1e663148341710a1f192996fc6941acee24c Mon Sep 17 00:00:00 2001
From: ravenwing <kolodzinski.krzys@gmail.com>
Date: Fri, 1 Apr 2022 17:33:02 +0200
Subject: [PATCH 12/37] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3e3791011..81575254f 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-![Build Status](https://github.com/raven-wing/python-mapnik/actions/workflows/build.yml/badge.svg)
+[![Build Status](https://github.com/raven-wing/python-mapnik/actions/workflows/build.yml/badge.svg)](https://github.com/raven-wing/python-mapnik/actions)
 
 Python bindings for Mapnik.
 

From 69a2cac8d8a03c939fc979504577950bbcd534a3 Mon Sep 17 00:00:00 2001
From: ravenwing <kolodzinski.krzys@gmail.com>
Date: Fri, 1 Apr 2022 18:14:13 +0200
Subject: [PATCH 13/37] Update build.yml

---
 .github/workflows/build.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3e60b6390..860434015 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -41,4 +41,8 @@ jobs:
           path: ./dist/*.whl
       - name: Run tests
         run: |
-          python setup.py test
+          source mason-config.env
+          /mason_packages/.link/bin/postgres -k ${PGHOST} > postgres.log &
+          python test/run_tests.py
+          python test/visual.py -q
+          ./mason_packages/.link/bin/pg_ctl -w stop

From dbe626838aadcbb4b04840892a5032ca5f92fe11 Mon Sep 17 00:00:00 2001
From: ravenwing <kolodzinski.krzys@gmail.com>
Date: Fri, 1 Apr 2022 18:23:11 +0200
Subject: [PATCH 14/37] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 860434015..7bf5c121d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -34,7 +34,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Build binary wheel and a source tarball
         run: |
-          pip install wheel pycairo
+          pip install wheel pycairo nose 
           python setup.py sdist bdist_wheel
       - uses: actions/upload-artifact@v2
         with:

From 0f50e8fa46701a5a307bcf22eb1becdf0649eda6 Mon Sep 17 00:00:00 2001
From: ravenwing <kolodzinski.krzys@gmail.com>
Date: Fri, 1 Apr 2022 18:31:58 +0200
Subject: [PATCH 15/37] Update build.yml

---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7bf5c121d..86e842b0a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -41,6 +41,7 @@ jobs:
           path: ./dist/*.whl
       - name: Run tests
         run: |
+          python setup.py install
           source mason-config.env
           /mason_packages/.link/bin/postgres -k ${PGHOST} > postgres.log &
           python test/run_tests.py

From f7f9acd22a6e6481d3db3d59ba8713f58ac61939 Mon Sep 17 00:00:00 2001
From: ravenwing <kolodzinski.krzys@gmail.com>
Date: Fri, 1 Apr 2022 18:40:53 +0200
Subject: [PATCH 16/37] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 86e842b0a..ceee22b7a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -34,7 +34,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Build binary wheel and a source tarball
         run: |
-          pip install wheel pycairo nose 
+          pip install wheel pycairo nose PyPDF2
           python setup.py sdist bdist_wheel
       - uses: actions/upload-artifact@v2
         with:

From 65186488782e7d1db53664a8206723d0ebeab886 Mon Sep 17 00:00:00 2001
From: ravenwing <kolodzinski.krzys@gmail.com>
Date: Fri, 1 Apr 2022 19:01:25 +0200
Subject: [PATCH 17/37] Update build.yml

---
 .github/workflows/build.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ceee22b7a..9d4e2528f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -26,8 +26,7 @@ jobs:
           submodules: true
       - name: install dependencies
         run: |
-          sudo apt-get install libboost-python-dev python3-cairo-dev python-cairo-dev clang
-      #clang-3.9
+          sudo apt-get install libboost-python-dev python3-cairo-dev python-cairo-dev clang postgress
       - name: Initialize Python {{matrix.python-version}}
         uses: actions/setup-python@v3
         with:
@@ -43,7 +42,7 @@ jobs:
         run: |
           python setup.py install
           source mason-config.env
-          /mason_packages/.link/bin/postgres -k ${PGHOST} > postgres.log &
+          ./mason_packages/.link/bin/postgres -k ${PGHOST} > postgres.log &
           python test/run_tests.py
           python test/visual.py -q
           ./mason_packages/.link/bin/pg_ctl -w stop

From dc3aaa0bbeb6a7feee3bc82a41d09fe87aa29916 Mon Sep 17 00:00:00 2001
From: ravenwing <kolodzinski.krzys@gmail.com>
Date: Fri, 1 Apr 2022 19:47:06 +0200
Subject: [PATCH 18/37] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9d4e2528f..facdb82a3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -26,7 +26,7 @@ jobs:
           submodules: true
       - name: install dependencies
         run: |
-          sudo apt-get install libboost-python-dev python3-cairo-dev python-cairo-dev clang postgress
+          sudo apt-get install libboost-python-dev python3-cairo-dev python-cairo-dev clang postgresql
       - name: Initialize Python {{matrix.python-version}}
         uses: actions/setup-python@v3
         with:

From fc9ea9dde7f8ed8c125a974ce2b861d31c547f58 Mon Sep 17 00:00:00 2001
From: ravenwing <kolodzinski.krzys@gmail.com>
Date: Fri, 1 Apr 2022 21:11:00 +0200
Subject: [PATCH 19/37] Update build.yml

---
 .github/workflows/build.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index facdb82a3..1e3790f5a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,6 +24,10 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: true
+      - name: Git Sumbodule Update
+        run: |
+          git pull --recurse-submodules
+          git submodule update --remote --recursive
       - name: install dependencies
         run: |
           sudo apt-get install libboost-python-dev python3-cairo-dev python-cairo-dev clang postgresql

From 627127e8736408607ffe0892d3179399462ec8f7 Mon Sep 17 00:00:00 2001
From: Krzysztof <krzysztof.kolodzinski@lifeflow.eu>
Date: Sun, 3 Apr 2022 15:17:48 +0200
Subject: [PATCH 20/37] some alignments

---
 .github/workflows/build.yml | 13 +++++++++++--
 test/data                   |  2 +-
 test/data-visual            |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1e3790f5a..f132538aa 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -5,6 +5,11 @@ env:
   BOOST_THREAD_LIB: boost_thread
   PYCAIRO: true
   MASON_BUILD: true
+  CCACHE_TEMPDIR: /tmp/.ccache-temp
+  CCACHE_COMPRESS: 1
+  PYTHONUSERBASE: $(pwd)/mason_packages/.link
+  PYTHONPATH: $(pwd)/mason_packages/.link/lib/python2.7/site-packages
+  PATH: $(pwd)/mason_packages/.link/bin:${PYTHONUSERBASE}/bin:${PATH}
 on: [push, pull_request]
 jobs:
   build-and-test:
@@ -44,9 +49,13 @@ jobs:
           path: ./dist/*.whl
       - name: Run tests
         run: |
-          python setup.py install
+          mkdir -p ${PYTHONPATH}
+          python setup.py install --prefix ${PYTHONUSERBASE}
+
           source mason-config.env
           ./mason_packages/.link/bin/postgres -k ${PGHOST} > postgres.log &
+          
           python test/run_tests.py
           python test/visual.py -q
-          ./mason_packages/.link/bin/pg_ctl -w stop
+          ./mason_packages/.link/bin/pg_ctl -w stop                    
+
diff --git a/test/data b/test/data
index 99da07d5e..5206bfd11 160000
--- a/test/data
+++ b/test/data
@@ -1 +1 @@
-Subproject commit 99da07d5e76ccf5978ef0a380bf5f631f9088584
+Subproject commit 5206bfd11f122bc8fe81519d39768b30108da03a
diff --git a/test/data-visual b/test/data-visual
index e040c3d9c..7dd395c33 160000
--- a/test/data-visual
+++ b/test/data-visual
@@ -1 +1 @@
-Subproject commit e040c3d9c8f6bdf3319e25f42b1cf907725285c9
+Subproject commit 7dd395c33a5cb5ae6b8c33bf9cd81ee296606f88

From 04275d9895d06954041e52b4008598dbc88da990 Mon Sep 17 00:00:00 2001
From: ravenwing <kolodzinski.krzys@gmail.com>
Date: Sun, 3 Apr 2022 15:21:43 +0200
Subject: [PATCH 21/37] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f132538aa..424521438 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -26,7 +26,7 @@ jobs:
     runs-on: ${{matrix.system}}
     name: Build and publish Python distribution
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v1
         with:
           submodules: true
       - name: Git Sumbodule Update

From 00943708f2837e7ae488c81aa6cfe5e1e1c9f618 Mon Sep 17 00:00:00 2001
From: ravenwing <kolodzinski.krzys@gmail.com>
Date: Sun, 3 Apr 2022 15:47:31 +0200
Subject: [PATCH 22/37] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 424521438..f132538aa 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -26,7 +26,7 @@ jobs:
     runs-on: ${{matrix.system}}
     name: Build and publish Python distribution
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
         with:
           submodules: true
       - name: Git Sumbodule Update

From 73179a5025a557dedf365eee4912859e9c4e5232 Mon Sep 17 00:00:00 2001
From: ravenwing <kolodzinski.krzys@gmail.com>
Date: Sun, 3 Apr 2022 15:49:52 +0200
Subject: [PATCH 23/37] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f132538aa..e9685a9c2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,7 +28,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          submodules: true
+          submodules: recursive
       - name: Git Sumbodule Update
         run: |
           git pull --recurse-submodules

From b8ccb2bcaeff005b6e4349c182d770b0ea481760 Mon Sep 17 00:00:00 2001
From: ravenwing <kolodzinski.krzys@gmail.com>
Date: Sun, 3 Apr 2022 15:53:04 +0200
Subject: [PATCH 24/37] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e9685a9c2..b9dc0ba76 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,7 +9,7 @@ env:
   CCACHE_COMPRESS: 1
   PYTHONUSERBASE: $(pwd)/mason_packages/.link
   PYTHONPATH: $(pwd)/mason_packages/.link/lib/python2.7/site-packages
-  PATH: $(pwd)/mason_packages/.link/bin:${PYTHONUSERBASE}/bin:${PATH}
+  #PATH: $(pwd)/mason_packages/.link/bin:${PYTHONUSERBASE}/bin:${PATH}
 on: [push, pull_request]
 jobs:
   build-and-test:

From 62a5cffb37c24edaae7325e2fcd2a83658fd06eb Mon Sep 17 00:00:00 2001
From: ravenwing <kolodzinski.krzys@gmail.com>
Date: Sun, 3 Apr 2022 16:06:21 +0200
Subject: [PATCH 25/37] Update build.yml

---
 .github/workflows/build.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b9dc0ba76..7904ce1f1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -49,6 +49,8 @@ jobs:
           path: ./dist/*.whl
       - name: Run tests
         run: |
+          export PATH=$(pwd)/mason_packages/.link/bin:${PYTHONUSERBASE}/bin:${PATH}
+        
           mkdir -p ${PYTHONPATH}
           python setup.py install --prefix ${PYTHONUSERBASE}
 

From c895331f3b9c89035ac39c8dbb435f72dc67da3b Mon Sep 17 00:00:00 2001
From: ravenwing <kolodzinski.krzys@gmail.com>
Date: Sun, 3 Apr 2022 16:41:15 +0200
Subject: [PATCH 26/37] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7904ce1f1..0b89345ec 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,7 +3,7 @@ env:
   BOOST_PYTHON_LIB: boost_python
   BOOST_SYSTEM_LIB: boost_system
   BOOST_THREAD_LIB: boost_thread
-  PYCAIRO: true
+  PYCAIRO: false
   MASON_BUILD: true
   CCACHE_TEMPDIR: /tmp/.ccache-temp
   CCACHE_COMPRESS: 1

From 05bf9cff17c06dc79437d19b302e191cd649faf3 Mon Sep 17 00:00:00 2001
From: ravenwing <kolodzinski.krzys@gmail.com>
Date: Sun, 3 Apr 2022 16:58:38 +0200
Subject: [PATCH 27/37] Update build.yml

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0b89345ec..a7212fd33 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,8 +18,8 @@ jobs:
       matrix:
         python-version:
         - "2.7"
-        #- "3.6"
-        #- "3.8"
+        - "3.6"
+        - "3.8"
         system:
         #- ubuntu-18.04
         - ubuntu-20.04

From ae000fb3918fe922a3fe8c0ac1c9313ab9afc885 Mon Sep 17 00:00:00 2001
From: ravenwing <kolodzinski.krzys@gmail.com>
Date: Sun, 3 Apr 2022 17:19:36 +0200
Subject: [PATCH 28/37] Update build.yml

---
 .github/workflows/build.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a7212fd33..680ac667b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -50,7 +50,9 @@ jobs:
       - name: Run tests
         run: |
           export PATH=$(pwd)/mason_packages/.link/bin:${PYTHONUSERBASE}/bin:${PATH}
-        
+          
+          source scripts/setup_mason.sh
+          
           mkdir -p ${PYTHONPATH}
           python setup.py install --prefix ${PYTHONUSERBASE}
 

From a7fd647dd7ab62327c5c8028922262514e0d500f Mon Sep 17 00:00:00 2001
From: ravenwing <kolodzinski.krzys@gmail.com>
Date: Sun, 3 Apr 2022 17:26:00 +0200
Subject: [PATCH 29/37] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 680ac667b..d051ea7a7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,7 +3,7 @@ env:
   BOOST_PYTHON_LIB: boost_python
   BOOST_SYSTEM_LIB: boost_system
   BOOST_THREAD_LIB: boost_thread
-  PYCAIRO: false
+  PYCAIRO: true
   MASON_BUILD: true
   CCACHE_TEMPDIR: /tmp/.ccache-temp
   CCACHE_COMPRESS: 1

From 1581579746d9abd54500979b16f32de4e706b4bd Mon Sep 17 00:00:00 2001
From: ravenwing <kolodzinski.krzys@gmail.com>
Date: Sun, 3 Apr 2022 17:35:01 +0200
Subject: [PATCH 30/37] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d051ea7a7..39c4e821c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,7 +21,7 @@ jobs:
         - "3.6"
         - "3.8"
         system:
-        #- ubuntu-18.04
+        - ubuntu-18.04
         - ubuntu-20.04
     runs-on: ${{matrix.system}}
     name: Build and publish Python distribution

From f8e3e01fb79038898db77eefc90f5277a536adee Mon Sep 17 00:00:00 2001
From: ravenwing <kolodzinski.krzys@gmail.com>
Date: Sun, 3 Apr 2022 17:39:25 +0200
Subject: [PATCH 31/37] Update build.yml

---
 .github/workflows/build.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 39c4e821c..2d9ba7600 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,7 +3,6 @@ env:
   BOOST_PYTHON_LIB: boost_python
   BOOST_SYSTEM_LIB: boost_system
   BOOST_THREAD_LIB: boost_thread
-  PYCAIRO: true
   MASON_BUILD: true
   CCACHE_TEMPDIR: /tmp/.ccache-temp
   CCACHE_COMPRESS: 1

From f4bd238690de8b509b6fc953e87836d6f3f5801b Mon Sep 17 00:00:00 2001
From: ravenwing <kolodzinski.krzys@gmail.com>
Date: Sun, 3 Apr 2022 17:49:05 +0200
Subject: [PATCH 32/37] Update build.yml

---
 .github/workflows/build.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2d9ba7600..f1d3f5212 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -43,8 +43,9 @@ jobs:
         run: |
           pip install wheel pycairo nose PyPDF2
           python setup.py sdist bdist_wheel
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
+          name: ${{ matrix.python-version }}_${{matrix.system}}
           path: ./dist/*.whl
       - name: Run tests
         run: |

From 017b0a2fdd3524e537b0abadd5da448e68b9ec8b Mon Sep 17 00:00:00 2001
From: ravenwing <kolodzinski.krzys@gmail.com>
Date: Sun, 3 Apr 2022 18:03:21 +0200
Subject: [PATCH 33/37] Update build.yml

---
 .github/workflows/build.yml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f1d3f5212..d760614bb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,7 +8,6 @@ env:
   CCACHE_COMPRESS: 1
   PYTHONUSERBASE: $(pwd)/mason_packages/.link
   PYTHONPATH: $(pwd)/mason_packages/.link/lib/python2.7/site-packages
-  #PATH: $(pwd)/mason_packages/.link/bin:${PYTHONUSERBASE}/bin:${PATH}
 on: [push, pull_request]
 jobs:
   build-and-test:
@@ -43,10 +42,6 @@ jobs:
         run: |
           pip install wheel pycairo nose PyPDF2
           python setup.py sdist bdist_wheel
-      - uses: actions/upload-artifact@v3
-        with:
-          name: ${{ matrix.python-version }}_${{matrix.system}}
-          path: ./dist/*.whl
       - name: Run tests
         run: |
           export PATH=$(pwd)/mason_packages/.link/bin:${PYTHONUSERBASE}/bin:${PATH}
@@ -62,4 +57,7 @@ jobs:
           python test/run_tests.py
           python test/visual.py -q
           ./mason_packages/.link/bin/pg_ctl -w stop                    
-
+      - uses: actions/upload-artifact@v3
+        with:
+          name: python_{{ matrix.python-version }}-${{matrix.system}}
+          path: ./dist/*.whl

From 9dbb26905c3ab920327f128222037547dce3fa27 Mon Sep 17 00:00:00 2001
From: Krzysztof <krzysztof.kolodzinski@lifeflow.eu>
Date: Sun, 3 Apr 2022 18:23:54 +0200
Subject: [PATCH 34/37] some lines changed

---
 .github/workflows/build.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d760614bb..e9ab8636a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -44,19 +44,17 @@ jobs:
           python setup.py sdist bdist_wheel
       - name: Run tests
         run: |
+          source scripts/setup_mason.sh          
           export PATH=$(pwd)/mason_packages/.link/bin:${PYTHONUSERBASE}/bin:${PATH}
           
-          source scripts/setup_mason.sh
-          
           mkdir -p ${PYTHONPATH}
           python setup.py install --prefix ${PYTHONUSERBASE}
-
+#old_script
           source mason-config.env
           ./mason_packages/.link/bin/postgres -k ${PGHOST} > postgres.log &
-          
           python test/run_tests.py
           python test/visual.py -q
-          ./mason_packages/.link/bin/pg_ctl -w stop                    
+          ./mason_packages/.link/bin/pg_ctl -w stop
       - uses: actions/upload-artifact@v3
         with:
           name: python_{{ matrix.python-version }}-${{matrix.system}}

From 6c61f102025f521d32c062281f6230a23019fe16 Mon Sep 17 00:00:00 2001
From: ravenwing <kolodzinski.krzys@gmail.com>
Date: Sun, 3 Apr 2022 22:10:19 +0200
Subject: [PATCH 35/37] Update build.yml

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e9ab8636a..120d6005c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -46,10 +46,10 @@ jobs:
         run: |
           source scripts/setup_mason.sh          
           export PATH=$(pwd)/mason_packages/.link/bin:${PYTHONUSERBASE}/bin:${PATH}
-          
           mkdir -p ${PYTHONPATH}
           python setup.py install --prefix ${PYTHONUSERBASE}
-#old_script
+          
+          
           source mason-config.env
           ./mason_packages/.link/bin/postgres -k ${PGHOST} > postgres.log &
           python test/run_tests.py

From 51d926c87c0b3c0b12a431d3a172028072b8e123 Mon Sep 17 00:00:00 2001
From: Krzysztof <krzysztof.kolodzinski@lifeflow.eu>
Date: Sun, 3 Apr 2022 23:19:10 +0200
Subject: [PATCH 36/37] removed travis setup

---
 .travis.yml | 93 -----------------------------------------------------
 1 file changed, 93 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 6d3648a6c..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,93 +0,0 @@
-language: generic
-
-matrix:
-  include:
-    - os: linux
-      sudo: false
-      compiler: clang
-      # note: only using ccache for CC is intentional here to
-      # workaround an odd bug in distutils that manifests when only `ccache` is used to link
-      # because distutils also has a bug whereby CC is used to compile instead of CXX, this works :)
-      env: JOBS=8 CXX="clang++-3.9 -Qunused-arguments" CC="ccache clang-3.9 -Qunused-arguments"
-      addons:
-        apt:
-          sources: [ 'ubuntu-toolchain-r-test']
-          packages: [ 'libstdc++-5-dev', 'gdb', 'apport']
-    - os: osx
-      osx_image: xcode8.2
-      compiler: clang
-      env: JOBS=4
-
-cache:
-  directories:
-  - $HOME/.ccache
-
-env:
-  global:
-    - secure: "CqhZDPctJcpXGPpmIPK5usD/O+2HYawW3434oDufVS9uG/+C7aHzKzi8cuZ7n/REHqJMzy7gJfp6DiyF2QowpnN1L2W0FSJ9VOgj4JQF2Wsupo6gJkq6/CW2Fa35PhQHsv29bfyqtIq+R5SBVAieBe/Lh2P144RwRliGRopGQ68="
-    - secure: "idk4fdU49i546Zs6Fxha14H05eRJ1G/D6NPRaie8M8o+xySnEqf+TyA9/HU8QH7cFvroSLuHJ1U7TmwnR+sXy4XBlIfHLi4u2MN+l/q014GG7T2E2xYcTauqjB4ldToRsDQwe5Dq0gZCMsHLPspWPjL9twfp+Ds7qgcFhTsct0s="
-    - BOOST_PYTHON_LIB="boost_python"
-    - BOOST_SYSTEM_LIB="boost_system"
-    - BOOST_THREAD_LIB="boost_thread"
-    - CCACHE_TEMPDIR=/tmp/.ccache-temp
-    - CCACHE_COMPRESS=1
-
-before_install:
- # workaround travis rvm bug
- # http://superuser.com/questions/1044130/why-am-i-having-how-can-i-fix-this-error-shell-session-update-command-not-f
- - |
-   if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
-     rvm get head || true
-   fi
- - source scripts/setup_mason.sh
- - export PYTHONUSERBASE=$(pwd)/mason_packages/.link
- - export PYTHONPATH=$(pwd)/mason_packages/.link/lib/python2.7/site-packages
- - export PATH=$(pwd)/mason_packages/.link/bin:${PYTHONUSERBASE}/bin:${PATH}
- - export MASON_BUILD=true
- - export COMMIT_MESSAGE=$(git show -s --format=%B $TRAVIS_COMMIT | tr -d '\n')
- - |
-   if [[ $(uname -s) == 'Linux' ]]; then
-     export LDSHARED=$(python -c "import os;from distutils import sysconfig;print sysconfig.get_config_var('LDSHARED').replace('cc ','clang++-3.9 ')");
-     mason install clang++ 3.9.1
-     export PATH=$(mason prefix clang++ 3.9.1)/bin:${PATH}
-     which clang++
-   else
-     sudo easy_install pip;
-     export LDSHARED=$(python -c "import os;from distutils import sysconfig;print sysconfig.get_config_var('LDSHARED').replace('cc ','clang++ ')");
-   fi
- - pip install --upgrade --user nose
- - pip install --upgrade --user wheel
- - pip install --upgrade --user twine
- - pip install --upgrade --user setuptools
- - pip install --upgrade --user PyPDF2
- - python --version
-
-install:
- - mkdir -p ${PYTHONPATH}
- - python setup.py install --prefix ${PYTHONUSERBASE}
-
-before_script:
- # start postgres/postgis
- - source mason-config.env
- - ./mason_packages/.link/bin/postgres -k ${PGHOST} > postgres.log &
-
-script:
- - python test/run_tests.py
- - python test/visual.py -q
- # stop postgres
- - ./mason_packages/.link/bin/pg_ctl -w stop
- - |
-   if [[ ${COMMIT_MESSAGE} =~ "[publish]" ]]; then
-     python setup.py bdist_wheel
-     if [[ $(uname -s) == 'Linux' ]]; then
-        export PRE_DISTS='dist/*.whl'
-        rename 's/linux_x86_64/any/;' $PRE_DISTS
-     fi
-     export DISTS='dist/*'
-     $(pwd)/mason_packages/.link/bin/twine upload -u $PYPI_USER -p $PYPI_PASSWORD $DISTS
-   fi
-
-
-notifications:
-  slack:
-    secure: dZhYCFXTvn6zna7GhagCUcInfhoUf/AMkTpJKPnJgaGnS3DlfbnMsSU73J4hs46wCOFII3AfYUOI/SUEBZ15lkJHfBsCku0a5a2M8g5ddxKFoIM8gosH3dLjeGJ5Ou8zNQGyzokXidKfHC+Gh4UVGyn+aeXxglRmRkUeaP+GD1k=

From 37f9c5dbb9b4a8d947556538ea3359c6d3b6817c Mon Sep 17 00:00:00 2001
From: ravenwing <kolodzinski.krzys@gmail.com>
Date: Mon, 4 Apr 2022 09:31:36 +0200
Subject: [PATCH 37/37] Update build.yml

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 120d6005c..62ae951ca 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -37,7 +37,7 @@ jobs:
       - name: Initialize Python {{matrix.python-version}}
         uses: actions/setup-python@v3
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: ${{matrix.python-version}}
       - name: Build binary wheel and a source tarball
         run: |
           pip install wheel pycairo nose PyPDF2
@@ -57,5 +57,5 @@ jobs:
           ./mason_packages/.link/bin/pg_ctl -w stop
       - uses: actions/upload-artifact@v3
         with:
-          name: python_{{ matrix.python-version }}-${{matrix.system}}
+          name: python_${{matrix.python-version}}-${{matrix.system}}
           path: ./dist/*.whl