Skip to content

Commit 7ea6a81

Browse files
pipinfitriadipipinfitriadi
committed
Merge branch 'hotfix/0.2.3'
2 parents 18884a6 + 1c571ae commit 7ea6a81

15 files changed

+52
-43
lines changed

‎.github/workflows/ci-cd.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# This file is part of AsicVerifier and is released under
2-
# the AGPL-3.0-only License: https://opensource.org/license/agpl-v3/
1+
# Copyright (c) Free Software Foundation, Inc. All rights reserved.
2+
# Licensed under the AGPL-3.0-only License. See LICENSE in the project root for license information.
33

44
name: CI/CD
55
on:
@@ -62,7 +62,7 @@ jobs:
6262
if: steps.cache-python-venv.outputs.cache-hit != 'true'
6363
uses: actions/setup-python@v4
6464
with:
65-
python-version: '3.7'
65+
python-version: '3.8'
6666
- name: Install dependencies
6767
if: steps.cache-python-venv.outputs.cache-hit != 'true'
6868
run: |

‎.gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# This file is part of AsicVerifier and is released under
2-
# the AGPL-3.0-only License: https://opensource.org/license/agpl-v3/
1+
# Copyright (c) Free Software Foundation, Inc. All rights reserved.
2+
# Licensed under the AGPL-3.0-only License. See LICENSE in the project root for license information.
33

44
*.egg-info/
55
__pycache__/

‎.vscode/extensions.json

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"recommendations": [
3+
"ms-python.flake8"
4+
]
5+
}

‎.vscode/tasks.json

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
"build",
2323
"'coverage[toml]'",
2424
"httpx",
25-
"'importlib_metadata<5'",
2625
"flake8"
2726
]
2827
},

‎Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# This file is part of AsicVerifier and is released under
2-
# the AGPL-3.0-only License: https://opensource.org/license/agpl-v3/
1+
# Copyright (c) Free Software Foundation, Inc. All rights reserved.
2+
# Licensed under the AGPL-3.0-only License. See LICENSE in the project root for license information.
33

4-
FROM python:3.7-alpine AS venv
4+
FROM python:3.8-alpine AS venv
55
LABEL [email protected]
66
ADD https://www.random.org/cgi-bin/randbyte?nbytes=10&format=h skipcache
77
RUN pip install \
@@ -15,7 +15,7 @@ RUN pip install \
1515
--target=/opt/venv/ \
1616
AsicVerifier[restful-api]
1717

18-
FROM python:3.7-alpine
18+
FROM python:3.8-alpine
1919
LABEL [email protected]
2020
COPY --from=niis/xroad-security-server-sidecar:7.0.4 /usr/share/xroad/jlib/asicverifier.jar /lib/
2121
ENV JAVA_HOME /opt/java/openjdk

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
2-
This file is part of AsicVerifier and is released under
3-
the AGPL-3.0-only License: https://opensource.org/license/agpl-v3/
2+
Copyright (c) Free Software Foundation, Inc. All rights reserved.
3+
Licensed under the AGPL-3.0-only License. See LICENSE in the project root for license information.
44
-->
55

66
# AsicVerifier

‎asicverifier/__init__.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
#!/usr/bin/env python3
22

3-
# This module is part of AsicVerifier and is released under
4-
# the AGPL-3.0-only License: https://opensource.org/license/agpl-v3/
3+
# Copyright (c) Free Software Foundation, Inc. All rights reserved.
4+
# Licensed under the AGPL-3.0-only License. See LICENSE in the project root
5+
# for license information.
56

6-
from dateutil import tz
7-
from dateutil.parser import parse
87
from datetime import datetime
98
from enum import Enum
109
from io import BytesIO
@@ -17,6 +16,8 @@
1716
from urllib.parse import urlencode, urljoin, urlparse
1817
from zipfile import ZipFile
1918

19+
from dateutil import tz
20+
from dateutil.parser import parse
2021
from dotenv import load_dotenv
2122
from importlib_metadata import PackageMetadata, metadata
2223
import requests

‎asicverifier/__main__.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#!/usr/bin/env python3
22

3-
# This module is part of AsicVerifier and is released under
4-
# the AGPL-3.0-only License: https://opensource.org/license/agpl-v3/
3+
# Copyright (c) Free Software Foundation, Inc. All rights reserved.
4+
# Licensed under the AGPL-3.0-only License. See LICENSE in the project root
5+
# for license information.
56

67
import logging
78
from os import getenv

‎asicverifier/restful_api.py

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#!/usr/bin/env python3
22

3-
# This module is part of AsicVerifier and is released under
4-
# the AGPL-3.0-only License: https://opensource.org/license/agpl-v3/
3+
# Copyright (c) Free Software Foundation, Inc. All rights reserved.
4+
# Licensed under the AGPL-3.0-only License. See LICENSE in the project root
5+
# for license information.
56

67
from datetime import datetime
78
from os import getenv
@@ -44,7 +45,7 @@ class AsicSign(BaseModel):
4445

4546

4647
class AsicSignerCertificateSubject(AsicOcsp):
47-
C: str
48+
C: str = None
4849

4950

5051
class AsicSignerCertificate(AsicSign):
@@ -62,14 +63,14 @@ class AsicOcspResponse(BaseModel):
6263

6364

6465
class AsicTimeStampSignByIssuer(AsicSignerCertificateSubject, BaseModel):
65-
ST: str
66-
L: str
67-
EMAILADDRESS: EmailStr
68-
OU: str
66+
ST: str = None
67+
L: str = None
68+
EMAILADDRESS: EmailStr = None
69+
OU: str = None
6970

7071

7172
class AsicTimeStampSignBySubject(AsicTimeStampSignByIssuer):
72-
oid_2_5_4_13: str = Field(alias='OID.2.5.4.13')
73+
oid_2_5_4_13: str = Field(None, alias='OID.2.5.4.13')
7374

7475

7576
class AsicTimeStampSignBy(AsicSign):

‎docker-compose.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# This file is part of AsicVerifier and is released under
2-
# the AGPL-3.0-only License: https://opensource.org/license/agpl-v3/
1+
# Copyright (c) Free Software Foundation, Inc. All rights reserved.
2+
# Licensed under the AGPL-3.0-only License. See LICENSE in the project root for license information.
33

44
version: '3.7'
55
services:

‎pyproject.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# This file is part of AsicVerifier and is released under
2-
# the AGPL-3.0-only License: https://opensource.org/license/agpl-v3/
1+
# Copyright (c) Free Software Foundation, Inc. All rights reserved.
2+
# Licensed under the AGPL-3.0-only License. See LICENSE in the project root for license information.
33

44
[build-system]
55
requires = ['setuptools>=61.0', 'setuptools-git-versioning<2']
@@ -9,15 +9,15 @@ build-backend = 'setuptools.build_meta'
99
name = 'AsicVerifier'
1010
description = 'Asic Verifier for X-Road'
1111
readme = 'README.md'
12-
requires-python = '>=3.7'
12+
requires-python = '>=3.8'
1313
license = {text = 'AGPL-3.0-only'}
1414
keywords = ['X-Road', 'security server']
1515
authors = [{name = 'Pipin Fitriadi'}, {email = '[email protected]'}]
1616
maintainers = [{name = 'Pipin Fitriadi'}, {email = '[email protected]'}]
1717
classifiers = [
1818
'Development Status :: 2 - Pre-Alpha',
1919
'Programming Language :: Java',
20-
'Programming Language :: Python :: 3.7',
20+
'Programming Language :: Python :: 3.8',
2121
'License :: OSI Approved :: GNU Affero General Public License v3',
2222
'Operating System :: OS Independent',
2323
'Framework :: FastAPI',

‎setup.cfg

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# This file is part of AsicVerifier and is released under
2-
# the AGPL-3.0-only License: https://opensource.org/license/agpl-v3/
1+
# Copyright (c) Free Software Foundation, Inc. All rights reserved.
2+
# Licensed under the AGPL-3.0-only License. See LICENSE in the project root for license information.
33

44
[metadata]
55
url = https://github.com/pipinfitriadi/asicverifier

‎template.pypirc

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
; This file is part of AsicVerifier and is released under
2-
; the AGPL-3.0-only License: https://opensource.org/license/agpl-v3/
1+
; Copyright (c) Free Software Foundation, Inc. All rights reserved.
2+
; Licensed under the AGPL-3.0-only License. See LICENSE in the project root for license information.
33

44
[pypi]
55
username = __token__

‎tests/__init__.py

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
#!/usr/bin/env python3
22

3-
# This module is part of AsicVerifier and is released under
4-
# the AGPL-3.0-only License: https://opensource.org/license/agpl-v3/
3+
# Copyright (c) Free Software Foundation, Inc. All rights reserved.
4+
# Licensed under the AGPL-3.0-only License. See LICENSE in the project root
5+
# for license information.
56

6-
from dateutil.parser import parse
7-
from dateutil.tz import tzutc
87
from datetime import datetime
98
import json
10-
import unittest
119
from typing import Any
10+
import unittest
1211
from unittest import mock
1312

1413
from click.testing import Result
14+
from dateutil.parser import parse
15+
from dateutil.tz import tzutc
1516
import requests
1617
from typer.testing import CliRunner
1718

‎tests/test_restful_api.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#!/usr/bin/env python3
22

3-
# This module is part of AsicVerifier and is released under
4-
# the AGPL-3.0-only License: https://opensource.org/license/agpl-v3/
3+
# Copyright (c) Free Software Foundation, Inc. All rights reserved.
4+
# Licensed under the AGPL-3.0-only License. See LICENSE in the project root
5+
# for license information.
56

67
import unittest
78
from unittest import mock

0 commit comments

Comments
 (0)