Merge pull request #146 from ligangty/release

ligangty · web-flow · commit cc1a2427797b · 2022-03-10T19:31:12.000+08:00
Fix: wrong ignored metadata files of *-archetype-catalog.xml
diff --git a/.github/workflows/linters.yaml b/.github/workflows/linters.yaml
@@ -19,7 +19,7 @@ jobs:
       matrix:
         os:
           - name: centos
-            version: 8
+            version: 7
             python: 3
             engine: docker
 
diff --git a/.github/workflows/unittests.yaml b/.github/workflows/unittests.yaml
@@ -18,7 +18,7 @@ jobs:
       matrix:
         os:
           - name: centos
-            version: 8
+            version: 7
             python: 3
             engine: docker
 
diff --git a/charon/__init__.py b/charon/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon)
+Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/charon/cmd/__init__.py b/charon/cmd/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon)
+Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/charon/cmd/command.py b/charon/cmd/command.py
@@ -1,5 +1,5 @@
 """
-Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon)
+Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/charon/config.py b/charon/config.py
@@ -1,5 +1,5 @@
 """
-Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon)
+Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/charon/constants.py b/charon/constants.py
@@ -1,5 +1,5 @@
 """
-Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon)
+Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/charon/pkgs/__init__.py b/charon/pkgs/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon)
+Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/charon/pkgs/indexing.py b/charon/pkgs/indexing.py
@@ -1,5 +1,5 @@
 """
-Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon)
+Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/charon/pkgs/maven.py b/charon/pkgs/maven.py
@@ -1,5 +1,5 @@
 """
-Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon)
+Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -924,7 +924,7 @@ def __hash_decorate_metadata(path: str, metadata: str) -> List[str]:
 
 def _is_ignored(filename: str, ignore_patterns: List[str]) -> bool:
     for ignored_name in STANDARD_GENERATED_IGNORES:
-        if ignored_name in filename:
+        if filename and filename.startswith(ignored_name.strip()):
             logger.warning("Ignoring standard generated Maven path: %s", filename)
             return True
 
diff --git a/charon/pkgs/npm.py b/charon/pkgs/npm.py
@@ -1,5 +1,5 @@
 """
-Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon)
+Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/charon/storage.py b/charon/storage.py
@@ -1,5 +1,5 @@
 """
-Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon)
+Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/charon/utils/__init__.py b/charon/utils/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon)
+Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/charon/utils/archive.py b/charon/utils/archive.py
@@ -1,5 +1,5 @@
 """
-Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon)
+Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/charon/utils/files.py b/charon/utils/files.py
@@ -1,5 +1,5 @@
 """
-Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon)
+Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/charon/utils/logs.py b/charon/utils/logs.py
@@ -1,5 +1,5 @@
 """
-Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon)
+Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/setup.py b/setup.py
@@ -1,5 +1,5 @@
 """
-Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon)
+Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/test.sh b/test.sh
@@ -4,7 +4,7 @@ set -eux
 # Prepare env vars
 ENGINE=${ENGINE:="podman"}
 OS=${OS:="centos"}
-OS_VERSION=${OS_VERSION:="8"}
+OS_VERSION=${OS_VERSION:="7"}
 PYTHON_VERSION=${PYTHON_VERSION:="3"}
 ACTION=${ACTION:="test"}
 IMAGE="$OS:$OS_VERSION"
@@ -33,16 +33,22 @@ function setup_charon() {
   PKG_EXTRA=(dnf-plugins-core git "$PYTHON"-pylint)
   BUILDDEP=(dnf builddep)
   if [[ $OS == "centos" ]]; then
+    PKG="yum"
+    PKG_EXTRA=(yum-utils git "$PYTHON"-pylint)
+    BUILDDEP=(yum-builddep)
     ENABLE_REPO=
   else
     ENABLE_REPO="--enablerepo=updates-testing"
   fi
+  
 
   PIP_INST=("$PIP" install --index-url "${PYPI_INDEX:-https://pypi.org/simple}")
 
   if [[ $OS == "centos" ]]; then
     # Don't let builddep enable *-source repos since they give 404 errors
     $RUN rm -f /etc/yum.repos.d/CentOS-Sources.repo
+    # $RUN rm -f /etc/yum.repos.d/CentOS-Linux-AppStream.repo
+    # $RUN rm -f /etc/yum.repos.d/CentOS-Linux-BaseOS.repo
     # This has to run *before* we try installing anything from EPEL
     $RUN $PKG $ENABLE_REPO install -y epel-release
   fi
@@ -66,7 +72,7 @@ function setup_charon() {
   fi
 
   # install with RPM_PY_SYS=true to avoid error caused by installing on system python
-  $RUN sh -c "RPM_PY_SYS=true ${PIP_INST[*]} rpm-py-installer"
+  #$RUN sh -c "RPM_PY_SYS=true ${PIP_INST[*]} rpm-py-installer"
   # Setuptools install charon from source
   $RUN $PYTHON setup.py install
 
diff --git a/tests/base.py b/tests/base.py
@@ -1,5 +1,5 @@
 """
-Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon)
+Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@
 from charon.storage import PRODUCT_META_KEY, CHECKSUM_META_KEY
 from tests.commons import TEST_BUCKET
 from boto3_type_annotations import s3
+from moto import mock_s3
 
 
 SHORT_TEST_PREFIX = "ga"
@@ -82,6 +83,7 @@ def get_config_base(self) -> str:
         return os.path.join(self.get_temp_dir(), '.charon')
 
 
+@mock_s3
 class PackageBaseTest(BaseTest):
     def setUp(self):
         super().setUp()
diff --git a/tests/requirements.txt b/tests/requirements.txt
@@ -5,5 +5,5 @@ pytest-cov
 pytest-html
 flake8
 requests-mock
-moto
+moto==3.0.2.dev12
 
diff --git a/tests/test_config.py b/tests/test_config.py
@@ -1,5 +1,5 @@
 """
-Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon)
+Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tests/test_indexing.py b/tests/test_indexing.py
@@ -1,5 +1,5 @@
 """
-Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon)
+Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tests/test_maven_del.py b/tests/test_maven_del.py
@@ -1,5 +1,5 @@
 """
-Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon)
+Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tests/test_maven_index.py b/tests/test_maven_index.py
@@ -1,5 +1,5 @@
 """
-Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon)
+Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tests/test_maven_meta.py b/tests/test_maven_meta.py
@@ -1,5 +1,5 @@
 """
-Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon)
+Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tests/test_maven_upload.py b/tests/test_maven_upload.py
@@ -1,5 +1,5 @@
 """
-Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon)
+Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tests/test_npm_del.py b/tests/test_npm_del.py
@@ -1,5 +1,5 @@
 """
-Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon)
+Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tests/test_npm_index.py b/tests/test_npm_index.py
@@ -1,5 +1,5 @@
 """
-Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon)
+Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tests/test_npm_meta.py b/tests/test_npm_meta.py
@@ -1,5 +1,5 @@
 """
-Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon)
+Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tests/test_npm_upload.py b/tests/test_npm_upload.py
@@ -1,5 +1,5 @@
 """
-Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon)
+Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tests/test_pkgs_dryrun.py b/tests/test_pkgs_dryrun.py
@@ -1,5 +1,5 @@
 """
-Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon)
+Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tests/test_s3client.py b/tests/test_s3client.py
@@ -1,5 +1,5 @@
 """
-Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon)
+Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tests/test_util.py b/tests/test_util.py
@@ -1,5 +1,5 @@
 """
-Copyright (C) 2021 Red Hat, Inc. (https://github.com/Commonjava/charon)
+Copyright (C) 2022 Red Hat, Inc. (https://github.com/Commonjava/charon)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
