Merge pull request #6789 from Flowminder/fix-str-enum

Fix str enum

Author: mergify[bot]

.circleci/config.yml

@@ -20,7 +20,7 @@ commands:
 
 defaults:
   - &base_docker
-    - image: cimg/python:3.8
+    - image: cimg/python:3.12
       environment:
         FLOWDB_PORT: 5432
         MPLBACKEND: "agg"
@@ -72,7 +72,7 @@ executors:
     parameters:
       python_version:
         type: enum
-        enum: ["3.7", "3.8", "3.9", "3.11"]
+        enum: ["3.7", "3.8", "3.9", "3.11", "3.12"]
         default: "3.8"
       flowdb_image:
         type: enum
@@ -328,13 +328,13 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: flowmachine-deps-8-{{ checksum "flowmachine/Pipfile.lock" }}
+          key: flowmachine-deps-9-{{ checksum "flowmachine/Pipfile.lock" }}
       # Need to install graphviz and pygraphviz manually because it was removed from the Pipfile
       # (see https://github.com/Flowminder/FlowKit/issues/952)
       - run: cd flowmachine && pipenv install --dev --deploy
       - run: cd flowmachine && sudo apt-get update && sudo apt-get install -y libgraphviz-dev graphviz && pipenv run pip install pygraphviz
       - save_cache:
-          key: flowmachine-deps-8-{{ checksum "flowmachine/Pipfile.lock" }}
+          key: flowmachine-deps-9-{{ checksum "flowmachine/Pipfile.lock" }}
           paths:
             - /home/circleci/.local/share/virtualenvs/
 
@@ -344,7 +344,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: flowmachine-deps-8-{{ checksum "flowmachine/Pipfile.lock" }}
+          key: flowmachine-deps-9-{{ checksum "flowmachine/Pipfile.lock" }}
       - run:
           name: Linting files with black
           # Installed the version of Black from flowmachine's lockfile
@@ -378,14 +378,15 @@ jobs:
       name: python_with_flowdb
       flowdb_image: "testdata"
       num_days: 7
+      python_version: "3.12"
     working_directory: /home/circleci/project/flowmachine
     steps:
       - checkout:
           path: /home/circleci/project/
       - attach_workspace:
           at: /home/circleci/
       - restore_cache:
-          key: flowmachine-deps-8-{{ checksum "Pipfile.lock" }}
+          key: flowmachine-deps-9-{{ checksum "Pipfile.lock" }}
       - run:
           name: Install graphviz
           command: sudo apt-get update && sudo apt-get install -y xvfb libgraphviz-dev graphviz
@@ -694,18 +695,18 @@ jobs:
     executor:
       name: python_with_flowdb
       flowdb_image: "testdata"
-      python_version: "3.8"
+      python_version: "3.11"
     working_directory: /home/circleci/project/integration_tests
     steps:
       - checkout:
           path: /home/circleci/project/
       - attach_workspace:
           at: /home/circleci
       - restore_cache:
-          key: integration-test-deps-6-{{ checksum "Pipfile.lock" }}
+          key: integration-test-deps-7-{{ checksum "Pipfile.lock" }}
       - run: pipenv install --deploy --dev
       - save_cache:
-          key: integration-test-deps-6-{{ checksum "Pipfile.lock" }}
+          key: integration-test-deps-7-{{ checksum "Pipfile.lock" }}
           paths:
             - /home/circleci/.local/share/virtualenvs/
       - run: *wait_for_flowdb
@@ -769,14 +770,15 @@ jobs:
       num_mds: 20000
       disaster_start_date: 2016-02-11
       disaster_end_date: 2016-03-01
+      python_version: "3.11"
     working_directory: /home/circleci/project/docs
     steps:
       - checkout:
           path: /home/circleci/project/
       - attach_workspace:
           at: /home/circleci/
       - restore_cache:
-          key: flowkit-docs-deps-6-{{ checksum "Pipfile.lock" }}
+          key: flowkit-docs-deps-7-{{ checksum "Pipfile.lock" }}
       - run:
           name: Install pandoc
           command: |
@@ -870,7 +872,7 @@ jobs:
           path: /home/circleci/project/docs/pg_log.zip
           destination: pg_log
       - save_cache:
-          key: flowkit-docs-deps-6-{{ checksum "Pipfile.lock" }}
+          key: flowkit-docs-deps-7-{{ checksum "Pipfile.lock" }}
           paths:
             - /home/circleci/.local/share/virtualenvs/
 

CHANGELOG.md

@@ -9,8 +9,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Added
 
 ### Changed
+- FlowMachine now requires python >= 3.11
 
 ### Fixed
+- Diretion enum not being recognised [#6787](https://github.com/Flowminder/FlowKit/issues/6787)
 
 ### Removed
 - Removed Oracle fdw

docs/Pipfile

@@ -34,7 +34,7 @@ mike = "*"
 jupyterlab = "*"
 
 [requires]
-python_version = "3.8"
+python_version = "3.11"
 
 [scripts]
 build = "bash build.sh"

docs/Pipfile.lock

@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-FROM python:3.8-slim-bullseye@sha256:1e749e00ba22618288f0d16fa610c35d984e5e92b290f39ebd1cda1604220cb5
+FROM python:3.12-bullseye@sha256:fa925b59486a5c2d8e3d10897fc9da22def0bce17a9c18924c8ece3819823635
 
 ARG SOURCE_VERSION=0+unknown
 ENV SOURCE_VERSION=${SOURCE_VERSION}

flowmachine.Dockerfile

@@ -9,7 +9,7 @@ cachetools = "*"
 numpy = "*"
 networkx = "*"
 pandas = "*"
-pglast = "==4.1" # Pin pglast because different versions may produce different query IDs
+pglast = "==6.3" # Pin pglast because different versions may produce different query IDs
 python-dateutil = "*"
 pytz = "*"
 python-louvain = "*"
@@ -38,12 +38,11 @@ pytest = "*"
 pytest-asyncio = "*"
 pytest-cov = "*"
 pytest-testmon = "*"
-asynctest = "*"
 cachey = "*"
 approvaltests = "*"
 watchdog = "*"
 ipdb = "*"
 flowmachine = {editable = true, extras = ["test"], path = "."}
 
 [requires]
-python_version = "3.8"
+python_version = "3.12"