Skip to content

Commit

Permalink
Merge pull request #380 from jpopelka/license-change-mit
Browse files Browse the repository at this point in the history
Change license from GPLv3+ to MIT
  • Loading branch information
jpopelka committed Nov 26, 2020
2 parents 585d7fe + 8b428aa commit 0f5dbc8
Show file tree
Hide file tree
Showing 85 changed files with 216 additions and 1,707 deletions.
52 changes: 18 additions & 34 deletions .packit.yaml
Original file line number Diff line number Diff line change
@@ -1,35 +1,19 @@
dist_git_url: https://src.fedoraproject.org/rpms/conu.git
specfile_path: conu.spec
synced_files:
- conu.spec
upstream_package_name: conu
downstream_package_name: conu
upstream_project_url: https://github.com/user-cont/conu

jobs:
- job: sync_from_downstream
trigger: commit
- job: propose_downstream
trigger: release
metadata:
dist-git-branch: master
- job: propose_downstream
trigger: release
metadata:
dist-git-branch: f31
- job: propose_downstream
trigger: release
metadata:
dist-git-branch: f30
- job: copr_build
trigger: pull_request
metadata:
targets:
- fedora-30-x86_64
- fedora-31-x86_64
- fedora-rawhide-x86_64
# - job: tests
# trigger: pull_request
# metadata:
# targets:
# - fedora-30-x86_64
# - fedora-31-x86_64
# - fedora-rawhide-x86_64
- job: sync_from_downstream
trigger: commit
- job: propose_downstream
trigger: release
metadata:
dist_git_branches: fedora-all
- job: copr_build
trigger: pull_request
metadata:
targets:
- fedora-all
- job: tests
trigger: pull_request
metadata:
targets:
- fedora-all
695 changes: 21 additions & 674 deletions LICENSE

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions conu.spec
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

Name: %{pypi_name}
Version: 0.7.1
Release: 2%{?dist}
Release: 3%{?dist}
Summary: library which makes it easy to write tests for your containers

License: GPLv3+
License: MIT
URL: https://github.com/fedora-modularity/conu
Source0: https://files.pythonhosted.org/packages/source/c/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
BuildArch: noarch
Expand Down Expand Up @@ -98,6 +98,9 @@ rm -rf html/.{doctrees,buildinfo}
%license LICENSE

%changelog
* Thu Nov 26 2020 Jiri Popelka <jpopelka@redhat.com> - 0.7.1-3
- Change license from GPLv3+ to MIT

* Thu Feb 28 2019 Jiri Popelka <jpopelka@redhat.com> - 0.7.1-2
- remove Python 2 support

Expand All @@ -123,7 +126,7 @@ rm -rf html/.{doctrees,buildinfo}
- 0.6.0 release

* Thu Sep 13 2018 Radoslav Pitonak <rado.pitonak@gmail.com> - 0.5.0-2
- add dependency kubernetes
- add dependency kubernetes

* Thu Sep 13 2018 Radoslav Pitonak <rado.pitonak@gmail.com> - 0.5.0-1
- New upstream release 0.5.0
Expand Down
14 changes: 2 additions & 12 deletions conu/__init__.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,7 @@
# -*- coding: utf-8 -*-
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Copyright Contributors to the Conu project.
# SPDX-License-Identifier: MIT
#

"""
Expand Down
14 changes: 2 additions & 12 deletions conu/apidefs/__init__.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,7 @@
# -*- coding: utf-8 -*-
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Copyright Contributors to the Conu project.
# SPDX-License-Identifier: MIT
#

"""
Expand Down
14 changes: 2 additions & 12 deletions conu/apidefs/backend.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,7 @@
# -*- coding: utf-8 -*-
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Copyright Contributors to the Conu project.
# SPDX-License-Identifier: MIT
#

"""
Expand Down
14 changes: 2 additions & 12 deletions conu/apidefs/container.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,7 @@
# -*- coding: utf-8 -*-
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Copyright Contributors to the Conu project.
# SPDX-License-Identifier: MIT
#

"""
Expand Down
14 changes: 2 additions & 12 deletions conu/apidefs/filesystem.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,7 @@
# -*- coding: utf-8 -*-
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Copyright Contributors to the Conu project.
# SPDX-License-Identifier: MIT
#

import logging
Expand Down
14 changes: 2 additions & 12 deletions conu/apidefs/image.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,7 @@
# -*- coding: utf-8 -*-
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Copyright Contributors to the Conu project.
# SPDX-License-Identifier: MIT
#

"""
Expand Down
14 changes: 2 additions & 12 deletions conu/backend/buildah/__init__.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
# -*- coding: utf-8 -*-
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Copyright Contributors to the Conu project.
# SPDX-License-Identifier: MIT
#
14 changes: 2 additions & 12 deletions conu/backend/buildah/backend.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,7 @@
# -*- coding: utf-8 -*-
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Copyright Contributors to the Conu project.
# SPDX-License-Identifier: MIT
#

"""
Expand Down
14 changes: 2 additions & 12 deletions conu/backend/buildah/constants.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,7 @@
# -*- coding: utf-8 -*-
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Copyright Contributors to the Conu project.
# SPDX-License-Identifier: MIT
#

CONU_ARTIFACT_TAG = 'conu.test_artifact'
14 changes: 2 additions & 12 deletions conu/backend/buildah/container.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,7 @@
# -*- coding: utf-8 -*-
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Copyright Contributors to the Conu project.
# SPDX-License-Identifier: MIT
#

"""
Expand Down
14 changes: 2 additions & 12 deletions conu/backend/buildah/image.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,7 @@
# -*- coding: utf-8 -*-
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Copyright Contributors to the Conu project.
# SPDX-License-Identifier: MIT
#

"""
Expand Down
14 changes: 2 additions & 12 deletions conu/backend/buildah/utils.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,7 @@
# -*- coding: utf-8 -*-
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Copyright Contributors to the Conu project.
# SPDX-License-Identifier: MIT
#

"""
Expand Down
14 changes: 2 additions & 12 deletions conu/backend/docker/__init__.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
# -*- coding: utf-8 -*-
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Copyright Contributors to the Conu project.
# SPDX-License-Identifier: MIT
#
14 changes: 2 additions & 12 deletions conu/backend/docker/backend.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,7 @@
# -*- coding: utf-8 -*-
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Copyright Contributors to the Conu project.
# SPDX-License-Identifier: MIT
#

"""
Expand Down
14 changes: 2 additions & 12 deletions conu/backend/docker/client.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,7 @@
# -*- coding: utf-8 -*-
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Copyright Contributors to the Conu project.
# SPDX-License-Identifier: MIT
#

"""
Expand Down

0 comments on commit 0f5dbc8

Please sign in to comment.