Skip to content
Snippets Groups Projects
Unverified Commit 9e39c353 authored by Luke Murphy's avatar Luke Murphy
Browse files

Make sure the ignore file is working.

parent c5c1ac2f
No related branches found
No related tags found
1 merge request!54Upgrade, Remove DYE, Fix up failing tests
Showing with 65 additions and 9469 deletions
Source diff could not be displayed: it is too large. Options to address this: view the blob.
*.pyc *.pyc
.pytest_cache .pytest_cache
.*.swp internewshid/local_settings.py
*~ internewshid/private_settings.py
.ropeproject internewshid/.ve
django/website/local_settings.py internewshid/distribute-*.tar.gz
django/website/private_settings.py internewshid/*.sqlite
django/website/.ve internewshid/static
django/website/distribute-*.tar.gz internewshid/uploads
django/website/*.sqlite
django/website/static
django/website/uploads
reports/*
.DS_Store
.pydevproject
*.sql *.sql
*.sql.gz *.sql.gz
TAGS TAGS
junit.xml
.~lock.*
...@@ -21,6 +21,7 @@ before_script: ...@@ -21,6 +21,7 @@ before_script:
- | - |
echo "SECRET_KEY = '$DJANGO_SECRET_KEY'" >> internewshid/private_settings.py echo "SECRET_KEY = '$DJANGO_SECRET_KEY'" >> internewshid/private_settings.py
echo "DB_PASSWORD = '$MYSQL_ROOT_PASSWORD'" >> internewshid/private_settings.py echo "DB_PASSWORD = '$MYSQL_ROOT_PASSWORD'" >> internewshid/private_settings.py
- pipenv install --dev --two
checks: checks:
stage: checks stage: checks
...@@ -42,4 +43,4 @@ style: ...@@ -42,4 +43,4 @@ style:
test: test:
stage: test stage: test
script: script:
- pipenv run pytest -v - pipenv run pytest -v --cov
...@@ -38,3 +38,4 @@ py = "*" ...@@ -38,3 +38,4 @@ py = "*"
pylava = "*" pylava = "*"
pytest-django = "*" pytest-django = "*"
pytest-pythonpath = "*" pytest-pythonpath = "*"
pytest-cov = "*"
{ {
"_meta": { "_meta": {
"hash": { "hash": {
"sha256": "890a2b537008d78da83b6acc3c7ee0c682cba9f9e9e88dcc7aac36228989b558" "sha256": "49d2eba8b8e826c53e907af673f790db7fbdf1e33666b1287c4ad1e4999639bd"
}, },
"pipfile-spec": 6, "pipfile-spec": 6,
"requires": { "requires": {
...@@ -275,6 +275,50 @@ ...@@ -275,6 +275,50 @@
], ],
"version": "==3.5.0" "version": "==3.5.0"
}, },
"coverage": {
"hashes": [
"sha256:03481e81d558d30d230bc12999e3edffe392d244349a90f4ef9b88425fac74ba",
"sha256:0b136648de27201056c1869a6c0d4e23f464750fd9a9ba9750b8336a244429ed",
"sha256:104ab3934abaf5be871a583541e8829d6c19ce7bde2923b2751e0d3ca44db60a",
"sha256:10a46017fef60e16694a30627319f38a2b9b52e90182dddb6e37dcdab0f4bf95",
"sha256:15b111b6a0f46ee1a485414a52a7ad1d703bdf984e9ed3c288a4414d3871dcbd",
"sha256:198626739a79b09fa0a2f06e083ffd12eb55449b5f8bfdbeed1df4910b2ca640",
"sha256:1c383d2ef13ade2acc636556fd544dba6e14fa30755f26812f54300e401f98f2",
"sha256:23d341cdd4a0371820eb2b0bd6b88f5003a7438bbedb33688cd33b8eae59affd",
"sha256:28b2191e7283f4f3568962e373b47ef7f0392993bb6660d079c62bd50fe9d162",
"sha256:2a5b73210bad5279ddb558d9a2bfedc7f4bf6ad7f3c988641d83c40293deaec1",
"sha256:2eb564bbf7816a9d68dd3369a510be3327f1c618d2357fa6b1216994c2e3d508",
"sha256:337ded681dd2ef9ca04ef5d93cfc87e52e09db2594c296b4a0a3662cb1b41249",
"sha256:3a2184c6d797a125dca8367878d3b9a178b6fdd05fdc2d35d758c3006a1cd694",
"sha256:3c79a6f7b95751cdebcd9037e4d06f8d5a9b60e4ed0cd231342aa8ad7124882a",
"sha256:3d72c20bd105022d29b14a7d628462ebdc61de2f303322c0212a054352f3b287",
"sha256:3eb42bf89a6be7deb64116dd1cc4b08171734d721e7a7e57ad64cc4ef29ed2f1",
"sha256:4635a184d0bbe537aa185a34193898eee409332a8ccb27eea36f262566585000",
"sha256:56e448f051a201c5ebbaa86a5efd0ca90d327204d8b059ab25ad0f35fbfd79f1",
"sha256:5a13ea7911ff5e1796b6d5e4fbbf6952381a611209b736d48e675c2756f3f74e",
"sha256:69bf008a06b76619d3c3f3b1983f5145c75a305a0fea513aca094cae5c40a8f5",
"sha256:6bc583dc18d5979dc0f6cec26a8603129de0304d5ae1f17e57a12834e7235062",
"sha256:701cd6093d63e6b8ad7009d8a92425428bc4d6e7ab8d75efbb665c806c1d79ba",
"sha256:7608a3dd5d73cb06c531b8925e0ef8d3de31fed2544a7de6c63960a1e73ea4bc",
"sha256:76ecd006d1d8f739430ec50cc872889af1f9c1b6b8f48e29941814b09b0fd3cc",
"sha256:7aa36d2b844a3e4a4b356708d79fd2c260281a7390d678a10b91ca595ddc9e99",
"sha256:7d3f553904b0c5c016d1dad058a7554c7ac4c91a789fca496e7d8347ad040653",
"sha256:7e1fe19bd6dce69d9fd159d8e4a80a8f52101380d5d3a4d374b6d3eae0e5de9c",
"sha256:8c3cb8c35ec4d9506979b4cf90ee9918bc2e49f84189d9bf5c36c0c1119c6558",
"sha256:9d6dd10d49e01571bf6e147d3b505141ffc093a06756c60b053a859cb2128b1f",
"sha256:9e112fcbe0148a6fa4f0a02e8d58e94470fc6cb82a5481618fea901699bf34c4",
"sha256:ac4fef68da01116a5c117eba4dd46f2e06847a497de5ed1d64bb99a5fda1ef91",
"sha256:b8815995e050764c8610dbc82641807d196927c3dbed207f0a079833ffcf588d",
"sha256:be6cfcd8053d13f5f5eeb284aa8a814220c3da1b0078fa859011c7fffd86dab9",
"sha256:c1bb572fab8208c400adaf06a8133ac0712179a334c09224fb11393e920abcdd",
"sha256:de4418dadaa1c01d497e539210cb6baa015965526ff5afc078c57ca69160108d",
"sha256:e05cb4d9aad6233d67e0541caa7e511fa4047ed7750ec2510d466e806e0255d6",
"sha256:e4d96c07229f58cb686120f168276e434660e4358cc9cf3b0464210b04913e77",
"sha256:f3f501f345f24383c0000395b26b726e46758b71393267aeae0bd36f8b3ade80",
"sha256:f8a923a85cb099422ad5a2e345fe877bbc89a8a8b23235824a93488150e45f6e"
],
"version": "==4.5.1"
},
"factory-boy": { "factory-boy": {
"hashes": [ "hashes": [
"sha256:6f25cc4761ac109efd503f096e2ad99421b1159f01a29dbb917359dcd68e08ca", "sha256:6f25cc4761ac109efd503f096e2ad99421b1159f01a29dbb917359dcd68e08ca",
...@@ -350,7 +394,7 @@ ...@@ -350,7 +394,7 @@
"sha256:8eb170f8d0d61825e09a95b38be068299ddeda82f35e96c3301a8a5e7604cb83", "sha256:8eb170f8d0d61825e09a95b38be068299ddeda82f35e96c3301a8a5e7604cb83",
"sha256:d1aa2a11ba7b8f7b21ab852b1fb5afb277e1bb99d5dfc663380b5015c0d80c5a" "sha256:d1aa2a11ba7b8f7b21ab852b1fb5afb277e1bb99d5dfc663380b5015c0d80c5a"
], ],
"markers": "python_version < '3.4'", "markers": "python_version < '3.6'",
"version": "==2.3.2" "version": "==2.3.2"
}, },
"pbr": { "pbr": {
...@@ -413,6 +457,14 @@ ...@@ -413,6 +457,14 @@
], ],
"version": "==3.8.0" "version": "==3.8.0"
}, },
"pytest-cov": {
"hashes": [
"sha256:513c425e931a0344944f84ea47f3956be0e416d95acbd897a44970c8d926d5d7",
"sha256:e360f048b7dae3f2f2a9a4d067b2dd6b6a015d384d1577c994a43f3f7cbad762"
],
"index": "pypi",
"version": "==2.6.0"
},
"pytest-django": { "pytest-django": {
"hashes": [ "hashes": [
"sha256:2d2e0a618d91c280d463e90bcbea9b4e417609157f611a79685b1c561c4c0836", "sha256:2d2e0a618d91c280d463e90bcbea9b4e417609157f611a79685b1c561c4c0836",
......
local_settings.py.dev
\ No newline at end of file
S'2361e37a139771e028c25fb4ae286f7e'
p1
.
\ No newline at end of file
Source diff could not be displayed: it is too large. Options to address this: view the blob.
S'073a27fb'
p1
.
\ No newline at end of file
V.dashboard .panel-heading {\u000a padding: 10px 15px;\u000a}\u000a.dashboard .panel {\u000a margin-bottom: 20px;\u000a}\u000a.dashboard .panel-body {\u000a overflow: auto;\u000a}\u000a.dashboard .widget-height-small {\u000a height: 120px;\u000a}\u000a.dashboard .widget-height-small .panel {\u000a height: 100px;\u000a}\u000a.dashboard .widget-height-small .panel-body {\u000a height: 60px;\u000a}\u000a.dashboard .widget-height-medium {\u000a height: 300px;\u000a}\u000a.dashboard .widget-height-medium .panel {\u000a height: 280px;\u000a}\u000a.dashboard .widget-height-medium .panel-body {\u000a height: 210px;\u000a}\u000a.dashboard .widget-height-tall {\u000a height: 420px;\u000a}\u000a.dashboard .widget-height-tall .panel {\u000a height: 400px;\u000a}\u000a.dashboard .widget-height-tall .panel-body {\u000a height: 360px;\u000a}\u000a
p1
.
\ No newline at end of file
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment