Skip to content
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.

Sign up for GitHub

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

TST/CI: refactor test suite to use TeenyTweetyNet, fix #330 #339

Merged
merged 1 commit into from
Apr 3, 2021
Merged

TST/CI: refactor test suite to use TeenyTweetyNet, fix #330 #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: run tests
run: |
make test-data-download-source
make test-data-download-generate
make test-data-download-generated-ci
poetry install
poetry run python ./src/scripts/test_data/fix_prep_csv_paths.py
poetry run pytest
poetry run python ./tests/scripts/fix_prep_csv_paths.py
poetry run pytest --models teenytweetynet
4 changes: 2 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ build/
doc/_build/

# test data
tests/test_data/source/
tests/test_data/generated/
tests/data_for_tests/source/
tests/data_for_tests/generated/
*.tar.gz
91 changes: 63 additions & 28 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,57 @@
SOURCE_TEST_DATA_TAR=tests/test_data/source/source_test_data.tar.gz
SOURCE_TEST_DATA_URL=https://osf.io/7ru4s/download
TEST_DATA_GENERATE_SCRIPT=./tests/scripts/generate_data_for_tests.py

TEST_DATA_GENERATE_SCRIPT=./src/scripts/test_data/test_data_generate.py
GENERATED_TEST_DATA_TAR=tests/test_data/generated/generated_test_data.tar.gz
GENERATED_TEST_DATA_URL=https://osf.io/q76xd/download
GENERATED_TEST_DATA_TOP_LEVEL_DIRS=tests/test_data/generated/configs tests/test_data/generated/prep tests/test_data/generated/results
DATA_FOR_TESTS_DIR=./tests/data_for_tests/
GENERATED_TEST_DATA_DIR=${DATA_FOR_TESTS_DIR}generated/
CONFIGS_DIR=${GENERATED_TEST_DATA_DIR}configs
PREP_DIR=${GENERATED_TEST_DATA_DIR}prep/
RESULTS_DIR=${GENERATED_TEST_DATA_DIR}results/
RESULTS_CI=$(shell ls -d ${RESULTS_DIR}*/*/teenytweetynet)
GENERATED_TEST_DATA_CI_DIRS=${CONFIGS_DIR} ${PREP_DIR} ${RESULTS_CI}
GENERATED_TEST_DATA_ALL_DIRS=${GENERATED_TEST_DATA_CI_DIRS} $(shell ls -d ${RESULTS_DIR}/*/*/tweetynet)

SOURCE_TEST_DATA_TAR=${DATA_FOR_TESTS_DIR}source/source_test_data.tar.gz
GENERATED_TEST_DATA_CI_TAR=${GENERATED_TEST_DATA_DIR}generated_test_data.ci.tar.gz
GENERATED_TEST_DATA_ALL_TAR=${GENERATED_TEST_DATA_DIR}generated_test_data.tar.gz

SOURCE_TEST_DATA_URL=https://osf.io/s85vh/download
GENERATED_TEST_DATA_ALL_URL=https://osf.io/gt5xw/download
GENERATED_TEST_DATA_CI_URL=https://osf.io/u64nt/download

help:
@echo 'Makefile for vak '
@echo ' '
@echo 'Usage: '
@echo ' make test-data-clean-source remove source test data '
@echo ' make test-data-download-source download source test data '
@echo ' make test-data-generate generate vak files used by tests from source data '
@echo ' make test-data-clean-generate remove generated test data '
@echo ' make test-data-tar-generate place generated test data in compressed tar file '
@echo ' make test-data-download-generate download generated test data .tar and expand '
@echo ' make variables show variables defined for Makefile '
@echo ' make test-data-clean-source remove source test data '
@echo ' make test-data-download-source download source test data '
@echo ' make test-data-generate generate vak files used by tests from source data '
@echo ' make test-data-clean-generated remove generated test data '
@echo ' make test-data-tar-generated-all place all generated test data in compressed tar file '
@echo ' make test-data-tar-generated-ci place generated test data for CI in compressed tar file '
@echo ' make test-data-download-generated-all download .tar with all generated test data and expand '
@echo ' make test-data-download-generated-ci download .tar with generated test data for CI and expand '
@echo ' make variables show variables defined for Makefile '

variables:
@echo ' SOURCE_TEST_DATA_TAR : $(GENERATED_TEST_DATA_TAR) '
@echo ' SOURCE_TEST_DATA_URL : $(GENERATED_TEST_DATA_URL) '
@echo ' TESTS_DATA_GENERATE_SCRIPT : $(TEST_DATA_GENERATE_SCRIPT) '
@echo ' GENERATED_TEST_DATA_TAR : $(GENERATED_TEST_DATA_TAR) '
@echo ' GENERATED_TEST_DATA_URL : $(GENERATED_TEST_DATA_URL) '
@echo ' GENERATED_TEST_DATA_TOP_LEVEL_DIRS : $(GENERATED_TEST_DATA_TOP_LEVEL_DIRS) '
@echo ' TESTS_DATA_GENERATE_SCRIPT : $(TEST_DATA_GENERATE_SCRIPT) '
@echo ''
@echo ' DATA_FOR_TESTS_DIR : $(DATA_FOR_TESTS_DIR) '
@echo ' GENERATED_TEST_DATA_DIR : $(GENERATED_TEST_DATA_DIR) '
@echo ' PREP_DIR : $(PREP_DIR) '
@echo ' RESULTS_DIR : $(RESULTS_DIR) '
@echo ' RESULTS_CI : $(RESULTS_CI) '
@echo ' GENERATED_TEST_DATA_CI_DIRS : $(GENERATED_TEST_DATA_CI_DIRS) '
@echo ' GENERATED_TEST_DATA_ALL_DIRS : $(GENERATED_TEST_DATA_ALL_DIRS) '
@echo ''
@echo ' SOURCE_TEST_DATA_TAR : $(SOURCE_TEST_DATA_TAR) '
@echo ' GENERATED_TEST_DATA_CI_TAR : $(GENERATED_TEST_DATA_CI_TAR) '
@echo ' GENERATED_TEST_DATA_ALL_TAR : $(GENERATED_TEST_DATA_ALL_TAR) '
@echo ''
@echo ' SOURCE_TEST_DATA_URL : $(SOURCE_TEST_DATA_URL) '
@echo ' GENERATED_TEST_DATA_ALL_URL : $(GENERATED_TEST_DATA_ALL_URL) '
@echo ' GENERATED_TEST_DATA_CI_URL : $(GENERATED_TEST_DATA_CI_URL) '

test-data-clean-source:
rm -rfv ./tests/test_data/source/*
rm -rfv ./tests/data_for_tests/source/*

test-data-download-source:
wget -q $(SOURCE_TEST_DATA_URL) -O $(SOURCE_TEST_DATA_TAR)
Expand All @@ -36,14 +60,25 @@ test-data-download-source:
test-data-generate : $(TEST_DATA_GENERATE_SCRIPT)
poetry run python $(TEST_DATA_GENERATE_SCRIPT)

test-data-clean-generate :
rm -rfv ./tests/test_data/generated/*
test-data-clean-generated :
rm -rfv ./tests/data_for_tests/generated/*

test-data-tar-generated-all:
tar -czvf $(GENERATED_TEST_DATA_ALL_TAR) $(GENERATED_TEST_DATA_ALL_DIRS)

test-data-tar-generated-ci:
tar -czvf $(GENERATED_TEST_DATA_CI_TAR) $(GENERATED_TEST_DATA_CI_DIRS)

test-data-tar-generate:
tar -czvf $(GENERATED_TEST_DATA_TAR) $(GENERATED_TEST_DATA_TOP_LEVEL_DIRS)
test-data-download-generated-all:
wget -q $(GENERATED_TEST_DATA_ALL_URL) -O $(GENERATED_TEST_DATA_ALL_TAR)
tar -xzf $(GENERATED_TEST_DATA_ALL_TAR)

test-data-download-generate:
wget -q $(GENERATED_TEST_DATA_URL) -O $(GENERATED_TEST_DATA_TAR)
tar -xzf $(GENERATED_TEST_DATA_TAR)
test-data-download-generated-ci:
wget -q $(GENERATED_TEST_DATA_CI_URL) -O $(GENERATED_TEST_DATA_CI_TAR)
tar -xzf $(GENERATED_TEST_DATA_CI_TAR)

.PHONY: help variables test-data-clean-source test-data-download-source test-data-generate test-data-clean-generate test-data-tar-generate test-data-download-generate
.PHONY: help variables \
test-data-clean-source test-data-download-source \
test-data-generate test-data-clean-generated \
test-data-tar-generated-all test-data-tar-generated-all \
test-data-download-generated-all test-data-download-generated-ci
262 changes: 0 additions & 262 deletions src/scripts/test_data/test_data_generate.py
View file
Open in desktop

This file was deleted.

Loading