Skip to content

Commit 2f5e0a4

Browse files
committed
Use Apache 2.0 license everywhere
Confirmation from copyright holders is in #155
1 parent 5a00d2c commit 2f5e0a4

27 files changed

+45
-11
lines changed

cwl_utils/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# SPDX-License-Identifier: Apache-2.0
2+
"""Python Utilities and Autogenerated Classes for loading and parsing CWL documents."""

cwl_utils/__meta__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
# SPDX-License-Identifier: Apache-2.0
12
"""Global version number for the cwl_utils package."""
23
__version__ = "0.16"

cwl_utils/cite_extract.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env python3
2-
# SPDX-License-Identifier: GPL-3.0-only
2+
# SPDX-License-Identifier: Apache-2.0
33
import argparse
44
import sys
55
from typing import Iterator, List, Union, cast

cwl_utils/docker_extract.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env python3
2-
# SPDX-License-Identifier: GPL-3.0-only
2+
# SPDX-License-Identifier: Apache-2.0
33
import argparse
44
import os
55
import sys

cwl_utils/errors.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# SPDX-License-Identifier: Apache-2.0
2+
"""Common Exceptions."""
3+
4+
15
class ArrayMissingItems(BaseException):
26
"""From https://github.com/rabix/sbpack/blob/b8404a0859ffcbe1edae6d8f934e51847b003320/sbpack/lib.py"""
37

cwl_utils/expression.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# SPDX-License-Identifier: Apache-2.0
2+
"""CWL Expression parsing."""
13
import asyncio
24
import copy
35
import inspect

cwl_utils/file_formats.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: Apache-2.0
12
"""
23
CWL file formats utilities.
34

cwl_utils/graph_split.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env python
2-
# SPDX-License-Identifier: GPL-3.0-only
2+
# SPDX-License-Identifier: Apache-2.0
33
# Copyright 2019-2020 Michael R. Crusoe
44
# Copyright 2020 Altair Wei
55
"""

cwl_utils/image_puller.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: GPL-3.0-only
1+
# SPDX-License-Identifier: Apache-2.0
22
"""Classes for docker-extract."""
33
import logging
44
import os

cwl_utils/loghandler.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# SPDX-License-Identifier: Apache-2.0
2+
"""Shared logging object."""
13
import logging
24

35
_logger = logging.getLogger("cwl_utils") # pylint: disable=invalid-name

cwl_utils/pack.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# SPDX-License-Identifier: Apache-2.0
2+
# Copyright (c) 2021 Michael R. Crusoe
3+
# Copyright (c) 2020 Seven Bridges
4+
# See https://github.com/rabix/sbpack/blob/b8404a0859ffcbe1edae6d8f934e51847b003320/LICENSE
15
"""
26
The link resolution is as follows:
37
@@ -9,9 +13,6 @@
913
From https://github.com/rabix/sbpack/blob/b8404a0859ffcbe1edae6d8f934e51847b003320/sbpack/lib.py
1014
"""
1115

12-
# Copyright (c) 2021 Michael R. Crusoe
13-
# Copyright (c) 2020 Seven Bridges
14-
# See https://github.com/rabix/sbpack/blob/b8404a0859ffcbe1edae6d8f934e51847b003320/LICENSE
1516

1617
import logging
1718
import os

cwl_utils/parser/cwl_v1_0_utils.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: Apache-2.0
12
import hashlib
23
from typing import Any, List, Optional, Union
34

cwl_utils/parser/cwl_v1_1_utils.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: Apache-2.0
12
import hashlib
23
from typing import Any, List, Optional, Union, cast
34

cwl_utils/parser/cwl_v1_2_utils.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: Apache-2.0
12
import hashlib
23
from typing import Any, List, Optional, Union, cast
34

cwl_utils/sandboxjs.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# SPDX-License-Identifier: Apache-2.0
2+
"""Safe execution of CWL Expressions in a NodeJS sandbox."""
13
import collections
24
import errno
35
import json

cwl_utils/schemadef.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# SPDX-License-Identifier: Apache-2.0
2+
# Copyright (c) 2021 Michael R. Crusoe
3+
# Copyright (c) 2020 Seven Bridges
4+
# See https://github.com/rabix/sbpack/blob/b8404a0859ffcbe1edae6d8f934e51847b003320/LICENSE
15
"""
26
Valid forms of user defined types stored in external file
37
@@ -10,9 +14,6 @@
1014
From https://github.com/rabix/sbpack/blob/b8404a0859ffcbe1edae6d8f934e51847b003320/sbpack/lib.py
1115
"""
1216

13-
# Copyright (c) 2021 Michael R. Crusoe
14-
# Copyright (c) 2020 Seven Bridges
15-
# See https://github.com/rabix/sbpack/blob/b8404a0859ffcbe1edae6d8f934e51847b003320/LICENSE
1617

1718
import sys
1819
import urllib.parse

cwl_utils/types.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
# SPDX-License-Identifier: Apache-2.0
2+
# From https://github.com/rabix/sbpack/blob/b8404a0859ffcbe1edae6d8f934e51847b003320/sbpack/lib.py
3+
"""Shared Python type definitions for commons JSON like CWL objects."""
14
from typing import Any, MutableMapping, MutableSequence, Optional, Union
25

3-
# From https://github.com/rabix/sbpack/blob/b8404a0859ffcbe1edae6d8f934e51847b003320/sbpack/lib.py
46
built_in_types = [
57
"null",
68
"boolean",

cwl_utils/utils.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# SPDX-License-Identifier: Apache-2.0
2+
"""Miscellaneous utility functions."""
13
import os
24
import pathlib
35
import subprocess # nosec

tests/test_cite_extract.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# SPDX-License-Identifier: Apache-2.0
2+
"""Tests for cwl-cite-extract."""
13
from pathlib import Path
24

35
import cwl_utils.parser.cwl_v1_0 as parser

tests/test_docker_extract.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# SPDX-License-Identifier: Apache-2.0
2+
"""Tests for cwl-docker-extract."""
13
from pathlib import Path
24
from shutil import which
35
from tempfile import TemporaryDirectory

tests/test_etools_to_clt.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: Apache-2.0
12
"""Test the CWL Expression refactoring tool."""
23
import os
34
import shutil

tests/test_examples.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: Apache-2.0
12
"""Tests of example Python scripts."""
23
import os
34
from pathlib import Path

tests/test_format.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: Apache-2.0
12
"""Tests of cwl_utils.file_formats."""
23

34
import xml.sax

tests/test_graph_split.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: Apache-2.0
12
"""Test the CWL $graph document splitter tool."""
23
import os
34
from io import StringIO

tests/test_meta.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: Apache-2.0
12
"""Test __meta__ properties."""
23

34
from cwl_utils.__meta__ import __version__

tests/test_parser.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: Apache-2.0
12
"""Test the load and save functions for CWL."""
23
from pathlib import Path
34

tests/test_parser_utils.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: Apache-2.0
12
"""Test the CWL parsers utility functions."""
23
from pathlib import Path
34

0 commit comments

Comments
 (0)