Skip to content

RECIRCLE / portal

Go to a project
Commit ea77ebc2 by Chif Gergő
Options

Merge branch 'CI' into 'master' 

Ci

Closes REC-6

See merge request !2
parents f9249afa d816a212
Pipeline #726 passed with stages
in 1 minute 17 seconds
Showing with 85 additions and 29 deletions
.gitlab-ci.yml 0 → 100644
image: python:3.6
before_script:
- pip install flake8
- pip install pipenv
- pipenv install
stages:
- lint
- test
flake8:
stage: lint
script:
- flake8 --max-line-length=125 --exclude=migrations
test:
script:
- cd recircle
- pipenv run python manage.py test
\ No newline at end of file
Pipfile
...@@ -5,6 +5,7 @@ verify_ssl = true ...@@ -5,6 +5,7 @@ verify_ssl = true
[dev-packages] [dev-packages]
httpie = "*" httpie = "*"
flake8 = "*"
[packages] [packages]
django = "*" django = "*"
......
Pipfile.lock
{ {
"_meta": { "_meta": {
"hash": { "hash": {
"sha256": "d21a5665a08be3d0e1ec2b632ac10c1603ef068be1b7d09c9c65c460b78dc2e4" "sha256": "90be0e04b8f1caa17226ec46a3db4fff310f3c7d30fe950b536395b6dafc5edf"
}, },
"pipfile-spec": 6, "pipfile-spec": 6,
"requires": { "requires": {
...@@ -18,11 +18,11 @@ ...@@ -18,11 +18,11 @@
"default": { "default": {
"django": { "django": {
"hashes": [ "hashes": [
"sha256:7c3543e4fb070d14e10926189a7fcf42ba919263b7473dceaefce34d54e8a119", "sha256:4d23f61b26892bac785f07401bc38cbf8fa4cec993f400e9cd9ddf28fd51c0ea",
"sha256:a2814bffd1f007805b19194eb0b9a331933b82bd5da1c3ba3d7b7ba16e06dc4b" "sha256:6e974d4b57e3b29e4882b244d40171d6a75202ab8d2402b8e8adbd182e25cf0c"
], ],
"index": "pypi", "index": "pypi",
"version": "==2.2" "version": "==2.2.3"
}, },
"django-rest-framework": { "django-rest-framework": {
"hashes": [ "hashes": [
...@@ -40,26 +40,26 @@ ...@@ -40,26 +40,26 @@
}, },
"djangorestframework": { "djangorestframework": {
"hashes": [ "hashes": [
"sha256:8a435df9007c8b7d8e69a21ef06650e3c0cbe0d4b09e55dd1bd74c89a75a9fcd", "sha256:376f4b50340a46c15ae15ddd0c853085f4e66058f97e4dbe7d43ed62f5e60651",
"sha256:f7a266260d656e1cf4ca54d7a7349609dc8af4fe2590edd0ecd7d7643ea94a17" "sha256:c12869cfd83c33d579b17b3cb28a2ae7322a53c3ce85580c2a2ebe4e3f56c4fb"
], ],
"index": "pypi", "index": "pypi",
"version": "==3.9.2" "version": "==3.9.4"
}, },
"djoser": { "djoser": {
"hashes": [ "hashes": [
"sha256:a9eaf1b172c40f14be82fd145bfc02de7b3470b085b53169755c2c08fb7bd0a2", "sha256:1e310801b225ea668a035d3da90c1c9ca5b80a294235b9a25a5999fbc9ac5a96",
"sha256:f311248eda5f14dcfe839b9481721a701aa9b67195b4e7606c234d476cb24cdf" "sha256:d0ca48a05f590d77d6d292177c735a92b639f78a7060c1861d9b5317843a0685"
], ],
"index": "pypi", "index": "pypi",
"version": "==1.5.1" "version": "==1.7.0"
}, },
"pytz": { "pytz": {
"hashes": [ "hashes": [
"sha256:32b0891edff07e28efe91284ed9c31e123d84bea3fd98e1f72be2508f43ef8d9", "sha256:303879e36b721603cc54604edcac9d20401bdbe31e1e4fdee5b9f98d5d31dfda",
"sha256:d5f05e487007e29e03409f9398d074e158d920d36eb82eaf66fb1136b0c5374c" "sha256:d747dd3d23d77ef44c6a3526e274af6efeb0a6f1afd5a69ba4d5be4098c8e141"
], ],
"version": "==2018.9" "version": "==2019.1"
}, },
"sqlparse": { "sqlparse": {
"hashes": [ "hashes": [
...@@ -72,10 +72,10 @@ ...@@ -72,10 +72,10 @@
"develop": { "develop": {
"certifi": { "certifi": {
"hashes": [ "hashes": [
"sha256:59b7658e26ca9c7339e00f8f4636cdfe59d34fa37b9b04f6f9e9926b3cece1a5", "sha256:046832c04d4e752f37383b628bc601a7ea7211496b4638f6514d0e5b9acc4939",
"sha256:b26104d6835d1f5e49452a26eb2ff87fe7090b89dfcaee5ea2212697e1e1d7ae" "sha256:945e3ba63a0b9f577b1395204e13c3a231f9bc0223888be653286534e5873695"
], ],
"version": "==2019.3.9" "version": "==2019.6.16"
}, },
"chardet": { "chardet": {
"hashes": [ "hashes": [
...@@ -84,6 +84,21 @@ ...@@ -84,6 +84,21 @@
], ],
"version": "==3.0.4" "version": "==3.0.4"
}, },
"entrypoints": {
"hashes": [
"sha256:589f874b313739ad35be6e0cd7efde2a4e9b6fea91edcc34e58ecbb8dbe56d19",
"sha256:c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451"
],
"version": "==0.3"
},
"flake8": {
"hashes": [
"sha256:859996073f341f2670741b51ec1e67a01da142831aa1fdc6242dbf88dffbe661",
"sha256:a796a115208f5c03b18f332f7c11729812c8c3ded6c46319c59b53efd3819da8"
],
"index": "pypi",
"version": "==3.7.7"
},
"httpie": { "httpie": {
"hashes": [ "hashes": [
"sha256:449c07947be10ee1482fd7ac00b7fe0af499e0e85213fca4e97b6b69a95d61f5", "sha256:449c07947be10ee1482fd7ac00b7fe0af499e0e85213fca4e97b6b69a95d61f5",
...@@ -99,26 +114,47 @@ ...@@ -99,26 +114,47 @@
], ],
"version": "==2.8" "version": "==2.8"
}, },
"mccabe": {
"hashes": [
"sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42",
"sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f"
],
"version": "==0.6.1"
},
"pycodestyle": {
"hashes": [
"sha256:95a2219d12372f05704562a14ec30bc76b05a5b297b21a5dfe3f6fac3491ae56",
"sha256:e40a936c9a450ad81df37f549d676d127b1b66000a6c500caa2b085bc0ca976c"
],
"version": "==2.5.0"
},
"pyflakes": {
"hashes": [
"sha256:17dbeb2e3f4d772725c777fabc446d5634d1038f234e77343108ce445ea69ce0",
"sha256:d976835886f8c5b31d47970ed689944a0262b5f3afa00a5a7b4dc81e5449f8a2"
],
"version": "==2.1.1"
},
"pygments": { "pygments": {
"hashes": [ "hashes": [
"sha256:5ffada19f6203563680669ee7f53b64dabbeb100eb51b61996085e99c03b284a", "sha256:71e430bc85c88a430f000ac1d9b331d2407f681d6f6aec95e8bcfbc3df5b0127",
"sha256:e8218dd399a61674745138520d0d4cf2621d7e032439341bc3f647bff125818d" "sha256:881c4c157e45f30af185c1ffe8d549d48ac9127433f2c380c24b84572ad66297"
], ],
"version": "==2.3.1" "version": "==2.4.2"
}, },
"requests": { "requests": {
"hashes": [ "hashes": [
"sha256:502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e", "sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4",
"sha256:7bf2a778576d825600030a110f3c0e3e8edc51dfaafe1c146e39a2027784957b" "sha256:9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31"
], ],
"version": "==2.21.0" "version": "==2.22.0"
}, },
"urllib3": { "urllib3": {
"hashes": [ "hashes": [
"sha256:61bf29cada3fc2fbefad4fdf059ea4bd1b4a86d2b6d15e1c7c0b582b9752fe39", "sha256:b246607a25ac80bedac05c6f282e3cdaf3afb65420fd024ac94435cabe6e18d1",
"sha256:de9529817c93f27c8ccbfead6985011db27bd0ddfcdb2d86f3f663385c6a9c22" "sha256:dbe59173209418ae49d485b87d1681aefa36252ee85884c31346debd19463232"
], ],
"version": "==1.24.1" "version": "==1.25.3"
} }
} }
} }
recircle/recircle/settings.py
...@@ -122,4 +122,4 @@ USE_TZ = True ...@@ -122,4 +122,4 @@ USE_TZ = True
# Static files (CSS, JavaScript, Images) # Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/2.1/howto/static-files/ # https://docs.djangoproject.com/en/2.1/howto/static-files/
STATIC_URL = '/static/' STATIC_URL = '/static/'
\ No newline at end of file
recircle/recircle/urls.py
...@@ -20,4 +20,4 @@ urlpatterns = [ ...@@ -20,4 +20,4 @@ urlpatterns = [
path('admin/', admin.site.urls), path('admin/', admin.site.urls),
re_path(r'^auth/', include('djoser.urls')), re_path(r'^auth/', include('djoser.urls')),
re_path(r'^auth/', include('djoser.urls.authtoken')) re_path(r'^auth/', include('djoser.urls.authtoken'))
] ]
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment