Skip to content
This repository has been archived by the owner on Oct 23, 2023. It is now read-only.

Commit

Permalink
Merge pull request #166 from CSCfi/dev
Browse files Browse the repository at this point in the history
release v1.4.2
  • Loading branch information
teemukataja committed Mar 24, 2022
2 parents fe5241e + 8edf2d0 commit 12fa059
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ jobs:
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/int.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- 5000:5000

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
name: Get sources

- name: Set up Docker Buildx
Expand All @@ -41,14 +41,14 @@ jobs:
echo "BUILD_BRANCH=$BRANCH" >> $GITHUB_ENV
- name: Clone beacon 2
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: 'CSCfi/beacon-2.x'
ref: 'test'
path: beacon2

- name: Download beacon 2 data
uses: carlosperate/download-file-action@v1.1.0
uses: carlosperate/download-file-action@v1.1.1
id: download-data
with:
file-url: 'https://drive.google.com/uc?export=download&id=1PLv5F54a5pqR_ts5fL68jtmmkuJjDxMA'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/s2i-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
name: Integration Tests

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Install requirements
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ jobs:
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ jobs:
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}
- name: Install libcurl-devel
Expand Down
6 changes: 3 additions & 3 deletions docs/examples.rst
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ Response
"updatedAt": "2019-08-02 00:00:13.006256+00:00",
"contactUrl": "https://www.csc.fi/contact-info",
"environment": "dev",
"version": "1.4.1",
"version": "1.4.2",
"url": "https://staging-elixirbeacon.rahtiapp.fi/"
},
{
Expand All @@ -301,7 +301,7 @@ Response
"updatedAt": "2019-08-02 00:00:13.016122+00:00",
"contactUrl": "https://www.csc.fi/contact-info",
"environment": "prod",
"version": "1.4.1",
"version": "1.4.2",
"url": "https://staging-elixirbeacon.rahtiapp.fi/"
},
{
Expand Down Expand Up @@ -362,7 +362,7 @@ Response
"updatedAt": "2019-08-02 00:00:13.006256+00:00",
"contactUrl": "https://www.csc.fi/contact-info",
"environment": "dev",
"version": "1.4.1",
"version": "1.4.2",
"url": "https://staging-elixirbeacon.rahtiapp.fi/"
}
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ asyncio==3.4.3
aiohttp==3.8.1
aiohttp-cors==0.7.0
aiocache==0.11.1
aiomcache==0.6.0
aiomcache==0.7.0
ujson==5.1.0
uvloop==0.14.0; python_version < '3.7'
uvloop==0.16.0; python_version >= '3.7'
Expand Down
12 changes: 6 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

setup(
name="beacon_network",
version="1.4.1",
version="1.4.2",
description="Beacon Network services",
long_description_content_type="text/markdown",
project_urls={
Expand Down Expand Up @@ -33,7 +33,7 @@
"aiohttp==3.8.1",
"aiohttp-cors==0.7.0",
"aiocache==0.11.1",
"aiomcache==0.6.0",
"aiomcache==0.7.0",
"ujson==5.1.0",
"uvloop==0.14.0; python_version < '3.7'",
"uvloop==0.16.0; python_version >= '3.7'",
Expand All @@ -43,16 +43,16 @@
],
extras_require={
"test": [
"coverage==6.2",
"pytest<6.3",
"coverage==6.3.2",
"pytest<7.2",
"pytest-cov==3.0.0",
"testfixtures==6.18.3",
"testfixtures==6.18.5",
"tox==3.24.5",
"flake8==4.0.1",
"flake8-docstrings==1.6.0",
"asynctest==0.13.0",
"aioresponses==0.7.3",
"black==21.12b0",
"black==22.1.0",
],
"docs": ["sphinx >= 1.4", "sphinx_rtd_theme==1.0.0"],
},
Expand Down

0 comments on commit 12fa059

Please sign in to comment.