Skip to content

Commit 70890cd

Browse files
remove makerules changes
1 parent 8ca4826 commit 70890cd

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

makerules/makerules.mk

-6
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@ ifeq ($(CACHE_DIR),)
3535
CACHE_DIR=$(VAR_DIR)cache/
3636
endif
3737

38-
ifeq ($(DATASETTE_URL),)
39-
DATASETTE_URL=https://datasette.planning.data.gov.uk/
40-
endif
4138

4239
.PHONY: \
4340
makerules\
@@ -157,9 +154,6 @@ else
157154
curl -qfs "$(DATASTORE_URL)organisation-collection/dataset/organisation.csv" > $(CACHE_DIR)organisation.csv
158155
endif
159156

160-
$(CACHE_DIR)provision_summary.csv:
161-
curl -qfs "$(DATASETTE_URL)performance.csv?sql=select%20organisation%2C%20dataset%2C%20active_endpoint_count%20from%20provision_summary%20where%20active_endpoint_count%20%3E%200%20order%20by%20organisation%3B&_size=max" > $(CACHE_DIR)provision_summary.csv
162-
163157
init:: config
164158

165159
config::;

makerules/pipeline.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ endif
121121

122122
define run-pipeline
123123
mkdir -p $(@D) $(ISSUE_DIR)$(notdir $(@D)) $(OPERATIONAL_ISSUE_DIR) $(OUTPUT_LOG_DIR) $(COLUMN_FIELD_DIR)$(notdir $(@D)) $(DATASET_RESOURCE_DIR)$(notdir $(@D)) $(CONVERTED_RESOURCE_DIR)$(notdir $(@D))
124-
digital-land ${DIGITAL_LAND_OPTS} --dataset $(notdir $(@D)) --pipeline-dir $(PIPELINE_DIR) $(DIGITAL_LAND_FLAGS) pipeline $(1) --issue-dir $(ISSUE_DIR)$(notdir $(@D)) --column-field-dir $(COLUMN_FIELD_DIR)$(notdir $(@D)) --dataset-resource-dir $(DATASET_RESOURCE_DIR)$(notdir $(@D)) --converted-resource-dir $(CONVERTED_RESOURCE_DIR)$(notdir $(@D)) --config-path $(CACHE_DIR)config.sqlite3 --organisation-path $(CACHE_DIR)organisation.csv --provision-summary-dir $(CACHE_DIR)provision_summary.csv $(PIPELINE_FLAGS) $< $@
124+
digital-land ${DIGITAL_LAND_OPTS} --dataset $(notdir $(@D)) --pipeline-dir $(PIPELINE_DIR) $(DIGITAL_LAND_FLAGS) pipeline $(1) --issue-dir $(ISSUE_DIR)$(notdir $(@D)) --column-field-dir $(COLUMN_FIELD_DIR)$(notdir $(@D)) --dataset-resource-dir $(DATASET_RESOURCE_DIR)$(notdir $(@D)) --converted-resource-dir $(CONVERTED_RESOURCE_DIR)$(notdir $(@D)) --config-path $(CACHE_DIR)config.sqlite3 --organisation-path $(CACHE_DIR)organisation.csv $(PIPELINE_FLAGS) $< $@
125125
endef
126126

127127
define build-dataset =
@@ -172,7 +172,7 @@ clean::
172172

173173
# local copy of the organisation dataset
174174
# Download historic operational issue log data for relevant datasets
175-
init:: $(CACHE_DIR)organisation.csv $(CACHE_DIR)provision_summary.csv
175+
init:: $(CACHE_DIR)organisation.csv
176176
ifeq ($(COLLECTION_DATASET_BUCKET_NAME),)
177177
@datasets=$$(awk -F , '$$2 == "$(COLLECTION_NAME)" {print $$4}' specification/dataset.csv); \
178178
for dataset in $$datasets; do \

0 commit comments

Comments
 (0)