Skip to content

Commit

Permalink
Merge pull request #200 from GSA/feature/ckanext-iauth
Browse files Browse the repository at this point in the history
Feature/ckanext iauth
  • Loading branch information
chris-macdermaid authored Feb 8, 2021
2 parents 7dbbe6d + 59cf679 commit 4656ca6
Show file tree
Hide file tree
Showing 28 changed files with 1,474 additions and 14 deletions.
15 changes: 15 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,25 @@
version: 2
jobs:
lint:
docker:
- image: circleci/python:2.7.18
steps:
- run:
name: lint code
command: |
pip install pip==20.3.3
pip install flake8
flake8 . --count --show-source --statistics
build:
machine: true
steps:
- checkout
- run:
name: Run tests
command: make test
- run:
name: Run extension tests
command: make test_extension

deploy-sandbox:
docker:
Expand All @@ -24,9 +37,11 @@ workflows:
version: 2
commit:
jobs:
- lint
- build
- deploy-sandbox:
requires:
- lint
- build
filters:
branches:
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ RUN /usr/local/bin/pip install pip==20.3.3 && \
RUN mkdir -p $CKAN_HOME && \
virtualenv $CKAN_HOME -p /usr/local/bin/python

COPY $REQUIREMENTS_FILE /tmp/requirements.txt
COPY . /opt/inventory-app/

# Install ckan dependencies
RUN $CKAN_HOME/bin/pip install -r /tmp/requirements.txt
RUN $CKAN_HOME/bin/pip install -r $REQUIREMENTS_FILE

COPY entrypoint-docker.sh /
ENTRYPOINT ["/entrypoint-docker.sh"]
Expand Down
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ test:
docker-compose -f docker-compose.yml -f docker-compose.test.yml -f docker-compose.seed.yml build --build-arg REQUIREMENTS_FILE app
docker-compose -f docker-compose.yml -f docker-compose.test.yml -f docker-compose.seed.yml up --abort-on-container-exit test

test_extension:
docker-compose run --rm app nosetests --ckan --with-pylons=docker_test.ini ckanext-datagov_inventory/ckanext/datagov_inventory/tests/*

up:
docker-compose up

Expand Down
5 changes: 5 additions & 0 deletions ckanext-datagov_inventory/.coveragerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[report]
omit =
*/site-packages/*
*/python?.?/*
ckan/*
42 changes: 42 additions & 0 deletions ckanext-datagov_inventory/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
.ropeproject
node_modules
bower_components

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]

# C extensions
*.so

# Distribution / packaging
.Python
env/
build/
develop-eggs/
dist/
sdist/
*.egg-info/
.installed.cfg
*.egg

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.coverage
.cache
nosetests.xml
coverage.xml

# Sphinx documentation
docs/_build/
Loading

0 comments on commit 4656ca6

Please sign in to comment.