Skip to content

Remove AutoFlow #6395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Nov 9, 2023
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 3 additions & 61 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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" }}
Expand All @@ -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>>"
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
9 changes: 0 additions & 9 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
47 changes: 0 additions & 47 deletions autoflow.Dockerfile

This file was deleted.

20 changes: 0 additions & 20 deletions autoflow.Dockerfile.dockerignore

This file was deleted.

24 changes: 0 additions & 24 deletions autoflow/.coveragerc

This file was deleted.

1 change: 0 additions & 1 deletion autoflow/.gitattributes

This file was deleted.

6 changes: 0 additions & 6 deletions autoflow/Gemfile

This file was deleted.

61 changes: 0 additions & 61 deletions autoflow/Gemfile.lock

This file was deleted.

2 changes: 0 additions & 2 deletions autoflow/MANIFEST.in

This file was deleted.

40 changes: 0 additions & 40 deletions autoflow/Pipfile

This file was deleted.

Loading