Merge pull request #6395 from Flowminder/remove-autoflow

Remove AutoFlow

Author: jc-harrison

.circleci/config.yml

@@ -637,56 +637,12 @@ jobs:
       - upload_codecov:
           test: test_results
 
-  run_autoflow_tests:
-    docker:
-      - image: cimg/python:3.8.5
-    working_directory: /home/circleci/project/autoflow
-    steps:
-      - checkout:
-          path: /home/circleci/project/
-      - restore_cache:
-          keys:
-            - autoflow-deps-6-{{ checksum "Pipfile.lock" }}
-      - run: &install_autoflow_deps
-          name: Install non-python autoflow dependencies
-          command: |
-            sudo apt-get update --allow-releaseinfo-change && sudo apt-get install -y postgresql pandoc ruby
-            sudo gem i rubygems-update -v '<3' 
-            sudo update_rubygems
-            sudo gem install bundler -v 2.3.26
-            sudo gem install bundle 
-            bundle install
-      - run:
-          name: Install python dependencies
-          command: |
-            pipenv install --deploy --dev
-      - save_cache:
-          key: autoflow-deps-6-{{ checksum "Pipfile.lock" }}
-          paths:
-            - /home/circleci/.local/share/virtualenvs/
-      - run:
-          name: Run autoflow unit tests
-          command: |
-            pipenv run python -m pytest --junitxml=test_results/pytest/results.xml --cov=./ \
-             --cov-report term --cov-report xml --durations=10
-      - store_test_results:
-          path: test_results
-      - upload_codecov:
-          test: test_results
-
   build_docker_image:
     parameters:
       component:
         type: enum
         enum:
-          [
-            "flowmachine",
-            "flowauth",
-            "flowapi",
-            "flowkit-examples",
-            "flowetl",
-            "autoflow",
-          ]
+          ["flowmachine", "flowauth", "flowapi", "flowkit-examples", "flowetl"]
       component_path:
         type: string
     machine:
@@ -826,11 +782,6 @@ jobs:
           at: /home/circleci
       - restore_cache:
           key: integration-test-deps-6-{{ checksum "Pipfile.lock" }}
-      - when:
-          condition:
-            equal: ["not query_tests", << parameters.pytest_selector >>]
-          steps:
-            - run: *install_autoflow_deps
       - run: pipenv install --deploy --dev
       - save_cache:
           key: integration-test-deps-6-{{ checksum "Pipfile.lock" }}
@@ -841,7 +792,7 @@ jobs:
           name: Run integration tests
           command: |
             PIPENV_DONT_LOAD_ENV=1 FLOWAPI_PORT=9090 pipenv run pytest -sv --junitxml=test_results/pytest/results.xml --durations=10 \
-            --cov=../flowmachine --cov=../flowclient --cov=../flowapi --cov=../autoflow \
+            --cov=../flowmachine --cov=../flowclient --cov=../flowapi \
             --cov-report xml \
             --cov-report term \
             -k "<<parameters.pytest_selector>>"
@@ -1052,7 +1003,7 @@ jobs:
           command: |
             export DOCKER_USER=$DOCKER_CLOUD_USER
             export DOCKER_PASS=$DOCKER_CLOUD_PASSWORD
-            for IMAGE in flowapi flowmachine flowdb flowdb-oracle flowdb-synthetic-data flowdb-testdata flowauth flowkit-examples flowetl autoflow; do
+            for IMAGE in flowapi flowmachine flowdb flowdb-oracle flowdb-synthetic-data flowdb-testdata flowauth flowkit-examples flowetl; do
               docker-retag flowminder/$IMAGE:$CIRCLE_SHA1 ${<< parameters.tag >>:-latest}
             done
 
@@ -1106,8 +1057,6 @@ workflows:
           requires:
             - build_flowdb_synthdata
           <<: *run_always_org_context
-      - run_autoflow_tests:
-          <<: *run_always_org_context
       - build_docker_image:
           name: build_examples
           component: flowkit-examples
@@ -1139,11 +1088,6 @@ workflows:
           component: flowapi
           component_path: flowapi
           <<: *run_always_org_context
-      - build_docker_image:
-          name: build_autoflow
-          component: autoflow
-          component_path: autoflow
-          <<: *run_always_org_context
       - run_flowauth_end_to_end_tests:
           requires:
             - build_flowauth
@@ -1236,8 +1180,6 @@ workflows:
             - build_flowetl_wheel
             - build_flowkit_jwt_generator_wheel
             - run_flowmachine_tests
-            - run_autoflow_tests
-            - build_autoflow
             - build_flowdb_oracle
           <<: *master_only_org_context
       - retag_images:

.github/dependabot.yml

@@ -11,15 +11,6 @@ updates:
     open-pull-requests-limit: 10
     ignore:
       - dependency-name: "apache/airflow" # Airflow image version needs to stay in sync with version in flowetl Pipfile
-  - package-ecosystem: bundler
-    directory: "/autoflow"
-    schedule:
-      interval: daily
-      time: "04:00"
-      timezone: Europe/London
-    pull-request-branch-name:
-      separator: "-"
-    open-pull-requests-limit: 10
   - package-ecosystem: npm
     directory: "/flowauth/frontend"
     schedule:
@@ -171,3 +162,8 @@ updates:
       - dependency-name: "pglast" # pglast version is pinned because different versions may produce different query IDs
     labels:
       - FlowMachine
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      # Check for updates to GitHub Actions every week
+      interval: "weekly"

.github/workflows/codeql-analysis.yml

@@ -4,48 +4,42 @@ on:
   push:
   pull_request:
   schedule:
-    - cron: '0 13 * * 4'
+    - cron: "0 13 * * 4"
 
 jobs:
   CodeQL-Build:
-
     runs-on: ubuntu-latest
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-      with:
-        # We must fetch at least the immediate parents so that if this is
-        # a pull request then we can checkout the head.
-        fetch-depth: 2
-
-    # If this run was triggered by a pull request event, then checkout
-    # the head of the pull request instead of the merge commit.
-    - run: git checkout HEAD^2
-      if: ${{ github.event_name == 'pull_request' }}
-      
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      # Override language selection by uncommenting this and choosing your languages
-      # with:
-      #   languages: go, javascript, csharp, python, cpp, java
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    #- run: |
-    #   make bootstrap
-    #   make release
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      - name: Checkout repository
+        uses: actions/checkout@v2
+        with:
+          # We must fetch at least the immediate parents so that if this is
+          # a pull request then we can checkout the head.
+          fetch-depth: 2
+
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        # Override language selection by uncommenting this and choosing your languages
+        with:
+          languages: python, javascript #, go, csharp, cpp, java
+
+      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+      # If this step fails, then you should remove it and run the build manually (see below)
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
+
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 https://git.io/JvXDl
+
+      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+      #    and modify them (or add more) to build your code if your project
+      #    uses a compiled language
+
+      #- run: |
+      #   make bootstrap
+      #   make release
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2

CHANGELOG.md

@@ -14,6 +14,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Removed
 
+- Removed AutoFlow. [#6394](https://github.com/Flowminder/FlowKit/issues/6394)
+
 ## [1.19.0]
 
 ### Added

Makefile

@@ -27,7 +27,7 @@ DOCKER_COMPOSE_TESTDATA_FILE_BUILD ?= docker-compose-testdata-build.yml
 DOCKER_COMPOSE_SYNTHETICDATA_FILE_BUILD ?= docker-compose-syntheticdata-build.yml
 DOCKER_SERVICES ?= flowdb flowapi flowmachine flowauth flowmachine_query_locker flowetl flowetl_db worked_examples
 DOCKER_SERVICES_TO_START = $(patsubst flowdb%,flowdb,$(DOCKER_SERVICES))
-services := flowmachine flowmachine_query_locker flowapi flowauth flowdb worked_examples flowdb_testdata flowdb_synthetic_data flowetl flowetl_db autoflow
+services := flowmachine flowmachine_query_locker flowapi flowauth flowdb worked_examples flowdb_testdata flowdb_synthetic_data flowetl flowetl_db
 space :=
 space +=
 DOCKER_COMPOSE := docker compose -f $(DOCKER_COMPOSE_FILE)