Merge pull request #43 from abitrolly/1.x

Fix broken 1.x CI and installation for Python 2 maintenance release

.github/workflows/test-and-release.yml

@@ -2,28 +2,34 @@ name: "Test & Release"
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "1.x"]
     tags: [ "*" ]
   pull_request:
-    branches: [ "master" ]
+    branches: [ "1.x" ]
 
 env:
   FORCE_COLOR: 1
 
 jobs:
   test:
-    runs-on: "ubuntu-latest"
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         include:
-        - tox-envs: "sqla06-py27,sqla07-py27,sqla08-py27,sqla09-py27,sqlalchemy-py27"
-        - tox-envs: "sqlalchemy-py3"
+        - container: python:2
+          tox-envs: "sqla06-py27,sqla07-py27,sqla08-py27,sqla09-py27,sqlalchemy-py27"
+        - container: python:3
+          tox-envs: "sqlalchemy-py3"
+    container: ${{ matrix.container }}
     steps:
-    - uses: "actions/checkout@v3"
-    - name: "Install dependencies"
+    - uses: actions/checkout@v4
+    - name: "Install grapviz"
+      run: |
+        apt-get update
+        apt-get -y install graphviz
+    - name: Install tox flake8
       run: |
-        sudo apt-get -y install graphviz
         python -m pip install tox flake8
     - name: "Lint with flake8"
       run: |
@@ -40,7 +46,7 @@ jobs:
     runs-on: "ubuntu-latest"
     needs: "test"
     steps:
-    - uses: "actions/checkout@v3"
+    - uses: actions/checkout@v4
 
     - name: "Install dependencies"
       run: |

setup.py

@@ -19,7 +19,7 @@
     zip_safe=True,
     install_requires=[
         'setuptools',
-        'sqlalchemy',
+        'sqlalchemy < 2',
         'pydot',
     ],
     classifiers=[