Merge pull request #110 from opensafely/replace-cohortextractor-with-…

…ehrql Replace cohortextractor with ehrql
opensafely · Nov 7, 2023 · 25cf5b6 · 25cf5b6
2 parents d6a1e4c + cc204eb
commit 25cf5b6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 32 deletions.
diff --git a/analysis/dataset_definition.py b/analysis/dataset_definition.py
@@ -1,8 +1,3 @@
-# Note: If you are using ehrQL to define your study population you need to:
-# (1) uncomment the ehrQL action in the project.yaml file (lines 14-18),
-# (2) delete the cohort-extractor action from the project.yaml file (lines 8-12), and
-# (3) delete the study_definition.py file.
-
 from ehrql import Dataset
 from ehrql.tables.beta.tpp import patients, practice_registrations
 

diff --git a/analysis/study_definition.py b/analysis/study_definition.py
diff --git a/project.yaml b/project.yaml
@@ -1,18 +1,12 @@
 version: '3.0'
 
+# Ignore this`expectation` block. It is required but not used, and will be removed in future versions.
 expectations:
   population_size: 1000
 
 actions:
-
-  generate_study_population:
-    run: cohortextractor:latest generate_cohort --output-format csv.gz --study-definition study_definition
+  generate_dataset:
+    run: ehrql:v0 generate-dataset analysis/dataset_definition.py --output output/dataset.csv.gz
     outputs:
       highly_sensitive:
-        cohort: output/input.csv.gz
-
-  # generate_dataset:
-  #   run: ehrql:v0 generate-dataset analysis/dataset_definition.py --output output/dataset.csv.gz
-  #   outputs:
-  #     highly_sensitive:
-  #       cohort: output/dataset.csv.gz
+        dataset: output/dataset.csv.gz