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.

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

Feature/ckanext iauth #200

Merged
merged 78 commits into from
Feb 8, 2021
Merged
Show file tree
Hide file tree
Changes from 75 commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
a9f4f3f
Add restart functionality
jbrown-xentity Dec 21, 2020
479e9fd
syntax correction
pjsharpe07 Dec 21, 2020
4b8ccf2
web-pdb additions
jbrown-xentity Dec 22, 2020
d87fd45
Transition to ipdb debugger
jbrown-xentity Dec 23, 2020
d67cefa
Current workaround: kill gunicorn and start debug
jbrown-xentity Dec 23, 2020
b03745e
Update documentation for simpler edits
jbrown-xentity Dec 23, 2020
3c62b6a
Remove defunct documentation
jbrown-xentity Dec 23, 2020
df04401
Remove comment
jbrown-xentity Dec 23, 2020
6130a33
Wait for installation of local directories
jbrown-xentity Dec 23, 2020
e6df203
Create ckanext-datagov_iauthfunctions
chris-macdermaid Dec 30, 2020
5e9aed6
Add datagov_iauthfunctions to production.ini
chris-macdermaid Dec 30, 2020
ec14dd4
Update iauth
chris-macdermaid Dec 30, 2020
e5abc7f
Update iauth Makefile
chris-macdermaid Jan 4, 2021
0cd77f6
update plugin.py & user register
Jan 4, 2021
aaab693
Merge branch 'feature/ckanext-iauth' of https://github.com/GSA/invent…
Jan 4, 2021
2344052
address comments
jbrown-xentity Jan 4, 2021
f2902b8
Only commented extension
jbrown-xentity Jan 4, 2021
cbcdf8a
implement redirect into auth functions. add logs
pjsharpe07 Jan 5, 2021
7d816e8
add other auth funcs and change redirect to abort
pjsharpe07 Jan 5, 2021
d2e111b
debug simplification
jbrown-xentity Jan 6, 2021
69be608
Clean up documentation
jbrown-xentity Jan 6, 2021
19c3ef4
Behavior update
jbrown-xentity Jan 6, 2021
50d3cc0
Merge branch 'feature/ckanext-iauth' into feature/local-reload
jbrown-xentity Jan 6, 2021
3c6cafa
Merge pull request #190 from GSA/feature/local-reload
jbrown-xentity Jan 6, 2021
718c7b1
disallow change
jbrown-xentity Jan 6, 2021
e520f9b
auth updates
jbrown-xentity Jan 6, 2021
d074913
renaming and rebuilding extension
Jan 6, 2021
e7d7d12
403 template error page & further iauth functions
pjsharpe07 Jan 7, 2021
9291b88
edited error document and moved inven ext to front
pjsharpe07 Jan 11, 2021
e4ebb31
Update documentation
jbrown-xentity Jan 12, 2021
92e988a
Update ga test for dataset path
jbrown-xentity Jan 13, 2021
b75a5bf
use upstream packages auth
jbrown-xentity Jan 13, 2021
91ff514
Merge pull request #195 from GSA/feature/debug
Jan 14, 2021
d9cf75f
Add docker-test.ini for nosetests
chris-macdermaid Jan 15, 2021
0c8d041
Add nosetests
chris-macdermaid Jan 15, 2021
096af0f
Update extenstion testing
chris-macdermaid Jan 22, 2021
5db72e8
Cleanup and user fix
jbrown-xentity Jan 22, 2021
82f7945
Use generic auth test
jbrown-xentity Jan 22, 2021
8f4d621
Lint fixes
jbrown-xentity Jan 22, 2021
cc3070b
Add linting circleCi
jbrown-xentity Jan 22, 2021
369b1eb
Merge branch 'inventory_ckan_2.8' into feature/ckanext-iauth
jbrown-xentity Jan 22, 2021
8241d09
Remove unnecessary travis files
jbrown-xentity Jan 22, 2021
6f4e825
Merge branch 'feature/ckanext-iauth' of https://github.com/GSA/invent…
jbrown-xentity Jan 22, 2021
8b2d24c
Bump requirements
jbrown-xentity Jan 22, 2021
fb372b8
Pin pip version to supported python version
jbrown-xentity Jan 25, 2021
c5f5782
Add more extenstion tests
chris-macdermaid Jan 25, 2021
1f88827
Merge branch 'feature/ckanext-iauth' of github.com:GSA/inventory-app …
chris-macdermaid Jan 25, 2021
0757561
Update request_reset auth, clean up log messages
chris-macdermaid Jan 25, 2021
a5d6a23
Update production.ini
chris-macdermaid Jan 25, 2021
ed42891
Update production.ini 2
chris-macdermaid Jan 25, 2021
73c19ef
Change localhost to app for unit test
chris-macdermaid Jan 26, 2021
5e2649a
Add readme for extension
chris-macdermaid Jan 26, 2021
e4dfd1c
Change README
chris-macdermaid Jan 26, 2021
575ac9b
Clean erroneous files
jbrown-xentity Jan 26, 2021
8498368
Update resources tests
jbrown-xentity Jan 26, 2021
21450de
Remove pylons.test
jbrown-xentity Jan 26, 2021
7bed930
Merge branch 'inventory_ckan_2.8' into feature/ckanext-iauth
jbrown-xentity Jan 26, 2021
ad50fe7
Update for Readme.md
jbrown-xentity Jan 26, 2021
6de962d
Merge branch 'feature/ckanext-iauth' of https://github.com/GSA/invent…
jbrown-xentity Jan 26, 2021
52b66a8
Update extension commit
jbrown-xentity Jan 26, 2021
545be31
Update circleci and error doc
chris-macdermaid Jan 27, 2021
33423fa
Add new auth test
chris-macdermaid Feb 1, 2021
b6e1d70
Update unit test
chris-macdermaid Feb 1, 2021
cef03cd
Update unit test #2
chris-macdermaid Feb 1, 2021
3e94b82
Update unit test #3
chris-macdermaid Feb 1, 2021
53335f2
Update unit test #4
chris-macdermaid Feb 1, 2021
0224a6f
Update unit test #5
chris-macdermaid Feb 1, 2021
2424416
Update unit test #5
chris-macdermaid Feb 1, 2021
8ce3147
Updates to new tests
jbrown-xentity Feb 1, 2021
3ce30d3
Add more unit tests
chris-macdermaid Feb 2, 2021
159a983
Cleanup
jbrown-xentity Feb 4, 2021
0500b09
Remove comment
jbrown-xentity Feb 5, 2021
38ab47c
Merge branch 'inventory_ckan_2.8' into feature/ckanext-iauth
jbrown-xentity Feb 5, 2021
f409a6b
Update requirements for latest auth commit
jbrown-xentity Feb 5, 2021
7554e75
Update clean up unit tests
chris-macdermaid Feb 5, 2021
660f6e9
Update ckanext-datagov_inventory/ckanext/datagov_inventory/tests/logi…
chris-macdermaid Feb 5, 2021
ab42ad5
Update ckanext-datagov_inventory/ckanext/datagov_inventory/templates/…
chris-macdermaid Feb 5, 2021
59cf679
Update clean up extension and tests
chris-macdermaid Feb 6, 2021
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
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