Merge pull request #245 from CSCfi/devel

Merge v1.1.0b2

Author: sampsapenna

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:14.16.1-alpine3.12 as FRONTEND
+FROM node:14.17.0-alpine3.12 as FRONTEND
 
 RUN apk add --update \
     && apk add --no-cache build-base curl-dev linux-headers bash git\
@@ -13,7 +13,7 @@ RUN cd /root/swift_ui/swift_browser_ui_frontend \
     && git clone --verbose https://github.com/CSCfi/swift-sharing-request.git \
     && cp swift-sharing-request/bindings/js/swift_sharing_request_bind.js src/common/swift_sharing_request_bind.js \
     && rm -rf swift-sharing-request \
-    && npm install -g npm@7.14.0 \
+    && npm install -g npm@7.17.0 \
     && npm install \
     && npm run build
 

Dockerfile-Devel

@@ -1,4 +1,4 @@
-FROM node:14.16.1-alpine3.12 as FRONTEND
+FROM node:14.17.0-alpine3.12 as FRONTEND
 
 RUN apk add --update \
     && apk add --no-cache build-base curl-dev linux-headers bash git\
@@ -13,7 +13,7 @@ RUN cd /root/swift_ui/swift_browser_ui_frontend \
     && git clone --verbose https://github.com/CSCfi/swift-sharing-request.git \
     && cp swift-sharing-request/bindings/js/swift_sharing_request_bind.js src/common/swift_sharing_request_bind.js \
     && rm -rf swift-sharing-request \
-    && npm install -g npm@7.14.0 \
+    && npm install -g npm@7.17.0 \
     && npm install \
     && npm run build-devel
 

Dockerfile-SD

@@ -1,4 +1,4 @@
-FROM node:14.16.1-alpine3.12 as FRONTEND
+FROM node:14.17.0-alpine3.12 as FRONTEND
 
 RUN apk add --update \
     && apk add --no-cache build-base curl-dev linux-headers bash git\
@@ -10,13 +10,16 @@ RUN cd /root/swift_ui/swift_browser_ui_frontend/src/assets \
     && ln -f -s ../../config/sd_overrides.js lang_overrides.js \
     && cd ../.. \
     && ls -lh ./src/assets \
+    && cd ./public \
+    && ln -f -s ../config/images/favicon-csc.ico favicon.ico \
+    && cd .. \
     && git clone --verbose https://github.com/CSCfi/swift-x-account-sharing.git \
     && cp swift-x-account-sharing/bindings/js/swift_x_account_sharing_bind.js src/common/swift_x_account_sharing_bind.js \
     && rm -rf swift-x-account-sharing \
     && git clone --verbose https://github.com/CSCfi/swift-sharing-request.git \
     && cp swift-sharing-request/bindings/js/swift_sharing_request_bind.js src/common/swift_sharing_request_bind.js \
     && rm -rf swift-sharing-request \
-    && npm install -g npm@7.14.0 \
+    && npm install -g npm@7.17.0 \
     && npm install \
     && npm run build
 

docs/source/conf.py

@@ -28,7 +28,7 @@
 author = "CSC Developers"
 
 # The full version, including alpha/beta/rc tags
-version = release = "1.1.0b1"
+version = release = "1.1.0b2"
 
 
 # -- General configuration ---------------------------------------------------

requirements.txt

@@ -1,10 +1,10 @@
 aiohttp==3.7.4.post0
-python-swiftclient==3.11.1
+python-swiftclient==3.12.0
 cryptography==3.4.7
 keystoneauth1==4.3.1
 click==8.0.1
 sphinx==4.0.2
 sphinx_rtd_theme==0.5.2
 uvloop==0.15.2
 gunicorn>=20.0.1
-certifi==2020.12.05 
+certifi==2021.5.30

setup.py

@@ -13,26 +13,26 @@
     license="MIT",
     install_requires=[
         "aiohttp==3.7.4.post0",
-        "python-swiftclient==3.11.1",
+        "python-swiftclient==3.12.0",
         "cryptography==3.4.7",
         "keystoneauth1==4.3.1",
         "click==8.0.1",
         "gunicorn>=20.0.1",
         "uvloop==0.15.2",
-        "certifi==2020.12.05",
+        "certifi==2021.5.30",
     ],
     extras_require={
         "test": [
             "tox==3.23.1",
             "pytest==6.2.4",
-            "pytest-cov==2.12.0 ",
+            "pytest-cov==2.12.1",
             "coverage==5.5",
-            "coveralls==3.0.1",
+            "coveralls==3.1.0",
             "flake8==3.9.2",
             "flake8-docstrings==1.6.0",
             "pytest-xdist==2.2.1",
             "asynctest==0.13.0",
-            "black==21.5b1",
+            "black==21.6b0",
         ],
         "docs": ["sphinx==4.0.2", "sphinx_rtd_theme==0.5.2", "selenium==3.141.0"],
         "ui_test": ["pytest==6.2.4", "selenium==3.141.0 ", "pytest-timeout==1.4.2"],

swift_browser_ui/__init__.py

@@ -7,6 +7,6 @@
 
 
 __name__ = "swift_browser_ui"
-__version__ = "1.1.0b1"
+__version__ = "1.1.0b2"
 __author__ = "CSC Developers"
 __license__ = "MIT License"

swift_browser_ui/api.py

@@ -380,6 +380,8 @@ async def swift_upload_object_chunk(
     resp = aiohttp.web.Response(status=307)
     resp.headers["Location"] = f"{setd['upload_external_endpoint']}{path}"
 
+    request.app["Log"].info(f"redirecting {session} to {resp.headers['Location']}")
+
     return resp