Skip to content

Commit

Permalink
Merge pull request #411 from CSCfi/devel
Browse files Browse the repository at this point in the history
v1.1.0b7
  • Loading branch information
blankdots authored Dec 1, 2021
2 parents ac2de58 + 8c9fda9 commit 151f7e8
Show file tree
Hide file tree
Showing 46 changed files with 4,806 additions and 5,518 deletions.
8 changes: 4 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ updates:
- package-ecosystem: "pip"
directory: "/"
schedule:
interval: "weekly"
interval: "monthly"
day: "monday"
labels:
- "pip dependencies"
Expand All @@ -12,7 +12,7 @@ updates:
- package-ecosystem: "npm"
directory: "/swift_browser_ui_frontend"
schedule:
interval: "weekly"
interval: "monthly"
day: "monday"
labels:
- "npm dependencies"
Expand All @@ -21,7 +21,7 @@ updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
interval: "monthly"
day: "monday"
labels:
- "github actions"
Expand All @@ -30,7 +30,7 @@ updates:
- package-ecosystem: docker
directory: "/dockerfiles"
schedule:
interval: "weekly"
interval: "monthly"
day: "monday"
labels:
- "docker dependencies"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2etests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Build Frontend
run: |
pushd swift_browser_ui_frontend
sudo npm install -g npm@7.24.1
sudo npm install -g npm@8.1.3
npm install
npm run build
- name: Setup and Run backend
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/eslint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Setup node
uses: actions/setup-node@v2.4.1
uses: actions/setup-node@v2.5.0
with:
node-version: ${{ matrix.node }}
- name: Install dependencies
run: |
pushd swift_browser_ui_frontend
sudo npm install -g npm@7.24.1
sudo npm install -g npm@8.1.3
npm ci
- name: Run eslint
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Setup node
uses: actions/setup-node@v2.4.1
uses: actions/setup-node@v2.5.0
with:
node-version: ${{ matrix.node }}
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Install frontend
run: |
pushd swift_browser_ui_frontend
sudo npm install -g npm@7.24.1
sudo npm install -g npm@8.1.3
npm install
npm run build
- name: Run unit tests
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ better upload and download functionality are in their separate files.

### Requirements

Python 3.6+ required (recommended 3.8+)
Python 3.8+ required.

The dependencies mentioned in `requirements.txt` and a suitable storage backend
supporting usage via Openstack Object Storage API. (e.g. Ceph RGW, Openstack Swift)
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile-ui
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ RUN apk add --update \
COPY swift_browser_ui_frontend /root/swift_ui/swift_browser_ui_frontend

RUN cd /root/swift_ui/swift_browser_ui_frontend \
&& npm install -g npm@7.24.1 \
&& npm install -g npm@8.1.3 \
&& npm install \
&& npm run build

Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile-ui-devel
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ RUN apk add --update \
COPY swift_browser_ui_frontend /root/swift_ui/swift_browser_ui_frontend

RUN cd /root/swift_ui/swift_browser_ui_frontend \
&& npm install -g npm@7.24.1 \
&& npm install -g npm@8.1.3 \
&& npm install \
&& npm run build-devel

Expand Down
190 changes: 0 additions & 190 deletions docs/API_spec.yml

This file was deleted.

Loading

0 comments on commit 151f7e8

Please sign in to comment.