Skip to content

Commit

Permalink
Merge pull request #3 from datopian/feature/update-docs-new-approach
Browse files Browse the repository at this point in the history
Update Docs and Makefile
  • Loading branch information
pdelboca authored Mar 4, 2021
2 parents a5c0a68 + 5373e4c commit 4304115
Show file tree
Hide file tree
Showing 10 changed files with 60 additions and 409 deletions.
19 changes: 0 additions & 19 deletions .gitlab-ci.yml

This file was deleted.

30 changes: 9 additions & 21 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,20 @@ SHELL := bash
PIP := pip
ISORT := isort
FLAKE8 := flake8
NOSETESTS := nosetests
PYTEST := pytest
SED := sed
PASTER := paster
CKAN := ckan

TEST_INI_PATH := ./test.ini
CKAN_PATH := ../../src/ckan
CKAN_PATH := ../ckan

prepare-config:
$(SED) "s@use = config:.*@use = config:$(CKAN_PATH)/test-core.ini@" -i $(TEST_INI_PATH)

test: prepare-config
test:
$(PIP) install -r dev-requirements.txt
$(ISORT) -rc -df -c $(PACKAGE_DIR)
$(FLAKE8) $(PACKAGE_DIR)
$(PASTER) --plugin=ckan db init -c $(CKAN_PATH)/test-core.ini
$(NOSETESTS) --ckan \
--with-pylons=$(TEST_INI_PATH) \
--nologcapture \
--with-doctest

coverage: prepare-config test
$(NOSETESTS) --ckan \
--with-pylons=$(TEST_INI_PATH) \
--nologcapture \
--with-coverage \
--cover-package=ckanext.versions \
--cover-inclusive \
--cover-erase \
--cover-tests
$(CKAN) -c $(CKAN_PATH)/test-core.ini db init
$(PYTEST) --ckan-ini=$(TEST_INI_PATH) \
-s \
--cov=ckanext.versions \
ckanext/versions
Loading

0 comments on commit 4304115

Please sign in to comment.