Skip to content

Commit

Permalink
Add license header and fix integration test
Browse files Browse the repository at this point in the history
Change-Id: I45f501beb8876a7abdfd9827772b5e08b059ace6
  • Loading branch information
TristanCacqueray authored and javierpena committed Dec 12, 2019
1 parent 86a7419 commit 8a89744
Show file tree
Hide file tree
Showing 9 changed files with 106 additions and 7 deletions.
15 changes: 15 additions & 0 deletions distroinfo/exception.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
# Copyright (c) 2019 Red Hat
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.


class DistroInfoException(Exception):
msg_fmt = "An unknown error occurred"

Expand Down
14 changes: 14 additions & 0 deletions distroinfo/fetch.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# Copyright (c) 2019 Red Hat
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.

import hashlib
import logging
import os
Expand Down
14 changes: 14 additions & 0 deletions distroinfo/helpers.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# Copyright (c) 2019 Red Hat
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.

import contextlib
import os
import subprocess
Expand Down
14 changes: 14 additions & 0 deletions distroinfo/info.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# Copyright (c) 2019 Red Hat
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.

import six

from distroinfo import exception
Expand Down
14 changes: 14 additions & 0 deletions distroinfo/parse.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# Copyright (c) 2019 Red Hat
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.

import collections
import copy
import six
Expand Down
14 changes: 14 additions & 0 deletions distroinfo/query.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# Copyright (c) 2019 Red Hat
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.

from __future__ import print_function
import collections
from functools import partial
Expand Down
14 changes: 14 additions & 0 deletions distroinfo/repoman.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# Copyright (c) 2019 Red Hat
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.

import logging
import os
import re
Expand Down
12 changes: 6 additions & 6 deletions tests/assets/info/rdoinfo/rdo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ package-configs:
# templates using rpmfactory's repositories
rpmfactory-core:
name: openstack-%(project)s
upstream: git://git.openstack.org/openstack/%(project)s
upstream: https://git.openstack.org/openstack/%(project)s
# distgit: http://review.rdoproject.org/r/p/openstack/%(project)s-distgit.git
distgit: https://github.com/rdo-packages/%(project)s-distgit.git
patches: http://review.rdoproject.org/r/p/openstack/%(project)s.git
Expand All @@ -136,7 +136,7 @@ package-configs:
- [email protected]
rpmfactory-client:
name: python-%(project)s
upstream: git://git.openstack.org/openstack/python-%(project)s
upstream: https://git.openstack.org/openstack/python-%(project)s
# distgit: http://review.rdoproject.org/r/p/openstack/%(project)s-distgit.git
distgit: https://github.com/rdo-packages/%(project)s-distgit.git
patches: http://review.rdoproject.org/r/p/openstack/%(project)s.git
Expand All @@ -149,7 +149,7 @@ package-configs:
- [email protected]
rpmfactory-lib:
name: python-%(project)s
upstream: git://git.openstack.org/openstack/%(project)s
upstream: https://git.openstack.org/openstack/%(project)s
# distgit: http://review.rdoproject.org/r/p/openstack/%(project)s-distgit.git
distgit: https://github.com/rdo-packages/%(project)s-distgit.git
patches: http://review.rdoproject.org/r/p/openstack/%(project)s.git
Expand All @@ -163,7 +163,7 @@ package-configs:
- [email protected]
rpmfactory-puppet:
name: '%(project)s'
upstream: git://git.openstack.org/openstack/%(project)s
upstream: https://git.openstack.org/openstack/%(project)s
# distgit: http://review.rdoproject.org/r/p/puppet/%(project)s-distgit.git
distgit: https://github.com/rdo-packages/%(project)s-distgit.git
patches: http://review.rdoproject.org/r/p/puppet/%(project)s.git
Expand All @@ -186,7 +186,7 @@ package-configs:
rpmfactory-tempest-plugin:
# Name and Project will be defined.
name: '%(project)s'
upstream: git://git.openstack.org/openstack/%(project)s
upstream: https://git.openstack.org/openstack/%(project)s
# distgit: http://review.rdoproject.org/r/p/openstack/%(project)s-distgit.git
distgit: https://github.com/rdo-packages/%(project)s-distgit.git
patches: http://review.rdoproject.org/r/p/openstack/%(project)s.git
Expand All @@ -204,7 +204,7 @@ package-configs:
pike:
rpm-packaging:
name: '%(project)s'
upstream: git://git.openstack.org/openstack/%(project)s.git
upstream: https://git.openstack.org/openstack/%(project)s.git
distgit: https://github.com/openstack/rpm-packaging
distgit-path: /openstack/%(project)s
master-distgit: https://github.com/openstack/rpm-packaging
Expand Down
2 changes: 1 addition & 1 deletion tests/test_common.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def assert_rdoinfo_base(info):
'project': 'nova',
'conf': 'rpmfactory-core',
'upstream':
'git://git.openstack.org/openstack/nova',
'https://git.openstack.org/openstack/nova',
'patches':
'http://review.rdoproject.org/r/p/openstack/nova.git',
'distgit':
Expand Down

0 comments on commit 8a89744

Please sign in to comment.