Skip to content

Commit

Permalink
Use Apache 2.0 license everywhere
Browse files Browse the repository at this point in the history
Confirmation from copyright holders is in #155
  • Loading branch information
mr-c committed Sep 2, 2022
1 parent 5a00d2c commit 2f5e0a4
Show file tree
Hide file tree
Showing 27 changed files with 45 additions and 11 deletions.
2 changes: 2 additions & 0 deletions cwl_utils/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# SPDX-License-Identifier: Apache-2.0
"""Python Utilities and Autogenerated Classes for loading and parsing CWL documents."""
1 change: 1 addition & 0 deletions cwl_utils/__meta__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# SPDX-License-Identifier: Apache-2.0
"""Global version number for the cwl_utils package."""
__version__ = "0.16"
2 changes: 1 addition & 1 deletion cwl_utils/cite_extract.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
# SPDX-License-Identifier: GPL-3.0-only
# SPDX-License-Identifier: Apache-2.0
import argparse
import sys
from typing import Iterator, List, Union, cast
Expand Down
2 changes: 1 addition & 1 deletion cwl_utils/docker_extract.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
# SPDX-License-Identifier: GPL-3.0-only
# SPDX-License-Identifier: Apache-2.0
import argparse
import os
import sys
Expand Down
4 changes: 4 additions & 0 deletions cwl_utils/errors.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-License-Identifier: Apache-2.0
"""Common Exceptions."""


class ArrayMissingItems(BaseException):
"""From https://github.com/rabix/sbpack/blob/b8404a0859ffcbe1edae6d8f934e51847b003320/sbpack/lib.py"""

Expand Down
2 changes: 2 additions & 0 deletions cwl_utils/expression.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# SPDX-License-Identifier: Apache-2.0
"""CWL Expression parsing."""
import asyncio
import copy
import inspect
Expand Down
1 change: 1 addition & 0 deletions cwl_utils/file_formats.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# SPDX-License-Identifier: Apache-2.0
"""
CWL file formats utilities.
Expand Down
2 changes: 1 addition & 1 deletion cwl_utils/graph_split.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env python
# SPDX-License-Identifier: GPL-3.0-only
# SPDX-License-Identifier: Apache-2.0
# Copyright 2019-2020 Michael R. Crusoe
# Copyright 2020 Altair Wei
"""
Expand Down
2 changes: 1 addition & 1 deletion cwl_utils/image_puller.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SPDX-License-Identifier: GPL-3.0-only
# SPDX-License-Identifier: Apache-2.0
"""Classes for docker-extract."""
import logging
import os
Expand Down
2 changes: 2 additions & 0 deletions cwl_utils/loghandler.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# SPDX-License-Identifier: Apache-2.0
"""Shared logging object."""
import logging

_logger = logging.getLogger("cwl_utils") # pylint: disable=invalid-name
Expand Down
7 changes: 4 additions & 3 deletions cwl_utils/pack.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-License-Identifier: Apache-2.0
# Copyright (c) 2021 Michael R. Crusoe
# Copyright (c) 2020 Seven Bridges
# See https://github.com/rabix/sbpack/blob/b8404a0859ffcbe1edae6d8f934e51847b003320/LICENSE
"""
The link resolution is as follows:
Expand All @@ -9,9 +13,6 @@
From https://github.com/rabix/sbpack/blob/b8404a0859ffcbe1edae6d8f934e51847b003320/sbpack/lib.py
"""

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

import logging
import os
Expand Down
1 change: 1 addition & 0 deletions cwl_utils/parser/cwl_v1_0_utils.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# SPDX-License-Identifier: Apache-2.0
import hashlib
from typing import Any, List, Optional, Union

Expand Down
1 change: 1 addition & 0 deletions cwl_utils/parser/cwl_v1_1_utils.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# SPDX-License-Identifier: Apache-2.0
import hashlib
from typing import Any, List, Optional, Union, cast

Expand Down
1 change: 1 addition & 0 deletions cwl_utils/parser/cwl_v1_2_utils.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# SPDX-License-Identifier: Apache-2.0
import hashlib
from typing import Any, List, Optional, Union, cast

Expand Down
2 changes: 2 additions & 0 deletions cwl_utils/sandboxjs.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# SPDX-License-Identifier: Apache-2.0
"""Safe execution of CWL Expressions in a NodeJS sandbox."""
import collections
import errno
import json
Expand Down
7 changes: 4 additions & 3 deletions cwl_utils/schemadef.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-License-Identifier: Apache-2.0
# Copyright (c) 2021 Michael R. Crusoe
# Copyright (c) 2020 Seven Bridges
# See https://github.com/rabix/sbpack/blob/b8404a0859ffcbe1edae6d8f934e51847b003320/LICENSE
"""
Valid forms of user defined types stored in external file
Expand All @@ -10,9 +14,6 @@
From https://github.com/rabix/sbpack/blob/b8404a0859ffcbe1edae6d8f934e51847b003320/sbpack/lib.py
"""

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

import sys
import urllib.parse
Expand Down
4 changes: 3 additions & 1 deletion cwl_utils/types.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# SPDX-License-Identifier: Apache-2.0
# From https://github.com/rabix/sbpack/blob/b8404a0859ffcbe1edae6d8f934e51847b003320/sbpack/lib.py
"""Shared Python type definitions for commons JSON like CWL objects."""
from typing import Any, MutableMapping, MutableSequence, Optional, Union

# From https://github.com/rabix/sbpack/blob/b8404a0859ffcbe1edae6d8f934e51847b003320/sbpack/lib.py
built_in_types = [
"null",
"boolean",
Expand Down
2 changes: 2 additions & 0 deletions cwl_utils/utils.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# SPDX-License-Identifier: Apache-2.0
"""Miscellaneous utility functions."""
import os
import pathlib
import subprocess # nosec
Expand Down
2 changes: 2 additions & 0 deletions tests/test_cite_extract.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# SPDX-License-Identifier: Apache-2.0
"""Tests for cwl-cite-extract."""
from pathlib import Path

import cwl_utils.parser.cwl_v1_0 as parser
Expand Down
2 changes: 2 additions & 0 deletions tests/test_docker_extract.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# SPDX-License-Identifier: Apache-2.0
"""Tests for cwl-docker-extract."""
from pathlib import Path
from shutil import which
from tempfile import TemporaryDirectory
Expand Down
1 change: 1 addition & 0 deletions tests/test_etools_to_clt.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# SPDX-License-Identifier: Apache-2.0
"""Test the CWL Expression refactoring tool."""
import os
import shutil
Expand Down
1 change: 1 addition & 0 deletions tests/test_examples.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# SPDX-License-Identifier: Apache-2.0
"""Tests of example Python scripts."""
import os
from pathlib import Path
Expand Down
1 change: 1 addition & 0 deletions tests/test_format.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# SPDX-License-Identifier: Apache-2.0
"""Tests of cwl_utils.file_formats."""

import xml.sax
Expand Down
1 change: 1 addition & 0 deletions tests/test_graph_split.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# SPDX-License-Identifier: Apache-2.0
"""Test the CWL $graph document splitter tool."""
import os
from io import StringIO
Expand Down
1 change: 1 addition & 0 deletions tests/test_meta.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# SPDX-License-Identifier: Apache-2.0
"""Test __meta__ properties."""

from cwl_utils.__meta__ import __version__
Expand Down
1 change: 1 addition & 0 deletions tests/test_parser.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# SPDX-License-Identifier: Apache-2.0
"""Test the load and save functions for CWL."""
from pathlib import Path

Expand Down
1 change: 1 addition & 0 deletions tests/test_parser_utils.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# SPDX-License-Identifier: Apache-2.0
"""Test the CWL parsers utility functions."""
from pathlib import Path

Expand Down

0 comments on commit 2f5e0a4

Please sign in to comment.