fix minor errors

Signed-off-by: Varsha U N <[email protected]>

Author: VarshaUN

Dockerfile

@@ -1,111 +1,11 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
-
+
 =======
 >>>>>>> b6d23428 (Revert "Revert "add tests for storing packages"")
 =======
 >>>>>>> 507231a0 (Revert "add tests for storing packages")
-# SPDX-License-Identifier: Apache-2.0
-#
-# http://nexb.com and https://github.com/aboutcode-org/scancode.io
-# The ScanCode.io software is licensed under the Apache License version 2.0.
-# Data generated with ScanCode.io is provided as-is without warranties.
-# ScanCode is a trademark of nexB Inc.
-#
-# You may not use this software except in compliance with the License.
-# You may obtain a copy of the License at: http://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.
-#
-# Data Generated with ScanCode.io is provided on an "AS IS" BASIS, WITHOUT WARRANTIES
-# OR CONDITIONS OF ANY KIND, either express or implied. No content created from
-# ScanCode.io should be considered or used as legal advice. Consult an Attorney
-# for any legal advice.
-#
-# ScanCode.io is a free software code scanning tool from nexB Inc. and others.
-# Visit https://github.com/aboutcode-org/scancode.io for support and download.
-
-FROM python:3.13-slim
-
-LABEL org.opencontainers.image.source="https://github.com/aboutcode-org/scancode.io"
-LABEL org.opencontainers.image.description="ScanCode.io"
-LABEL org.opencontainers.image.licenses="Apache-2.0"
-
-ENV APP_NAME scancodeio
-ENV APP_USER app
-ENV APP_DIR /opt/$APP_NAME
-ENV VENV_LOCATION /opt/$APP_NAME/.venv
-
-# Force Python unbuffered stdout and stderr (they are flushed to terminal immediately)
-ENV PYTHONUNBUFFERED 1
-# Do not write Python .pyc files
-ENV PYTHONDONTWRITEBYTECODE 1
-# Add the app dir in the Python path for entry points availability
-ENV PYTHONPATH $PYTHONPATH:$APP_DIR
-
-# OS requirements as per
-# https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html
-# Also install universal-ctags and xgettext for symbol and string collection.
-RUN apt-get update \
- && apt-get install -y --no-install-recommends \
-       bzip2 \
-       xz-utils \
-       zlib1g \
-       libxml2-dev \
-       libxslt1-dev \
-       libgomp1 \
-       libsqlite3-0 \
-       libgcrypt20 \
-       libpopt0 \
-       libzstd1 \
-       libgpgme11 \
-       libdevmapper1.02.1 \
-       libguestfs-tools \
-       linux-image-amd64 \
-       git \
-       wait-for-it \
-       universal-ctags \
-       gettext \
- && apt-get clean \
- && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-# Create the APP_USER group and user
-RUN addgroup --system $APP_USER \
- && adduser --system --group --home=$APP_DIR $APP_USER \
- && chown $APP_USER:$APP_USER $APP_DIR
-
-# Create the /var/APP_NAME directory with proper permission for APP_USER
-RUN mkdir -p /var/$APP_NAME \
- && chown $APP_USER:$APP_USER /var/$APP_NAME
-
-# Setup the work directory and the user as APP_USER for the remaining stages
-WORKDIR $APP_DIR
-USER $APP_USER
-
-# Create the virtualenv
-RUN python -m venv $VENV_LOCATION
-# Enable the virtualenv, similar effect as "source activate"
-ENV PATH $VENV_LOCATION/bin:$PATH
-
-# Create static/ and workspace/ directories
-RUN mkdir -p /var/$APP_NAME/static/ \
- && mkdir -p /var/$APP_NAME/workspace/
-
-# Install the dependencies before the codebase COPY for proper Docker layer caching
-COPY --chown=$APP_USER:$APP_USER pyproject.toml $APP_DIR/
-RUN pip install --no-cache-dir .
-
-# Copy the codebase and set the proper permissions for the APP_USER
-<<<<<<< HEAD
-<<<<<<< HEAD
-COPY --chown=$APP_USER:$APP_USER . $APP_DIR
-=======
-COPY --chown=$APP_USER:$APP_USER . $APP_DIR
->>>>>>> b6d23428 (Revert "Revert "add tests for storing packages"")
-=======
 # SPDX-License-Identifier: Apache-2.0
 #
 # http://nexb.com and https://github.com/aboutcode-org/scancode.io
@@ -200,7 +100,4 @@ RUN pip install --no-cache-dir .
 
 # Copy the codebase and set the proper permissions for the APP_USER
 COPY --chown=$APP_USER:$APP_USER . $APP_DIR
->>>>>>> ca2f49f5 (Revert "Revert "Revert "add tests for storing packages""")
-=======
-COPY --chown=$APP_USER:$APP_USER . $APP_DIR
->>>>>>> 507231a0 (Revert "add tests for storing packages")
+

scanpipe/pipelines/__init__.py

@@ -29,13 +29,15 @@
 from functools import wraps
 from pathlib import Path
 
+from django.conf import settings
+
 import bleach
 from markdown_it import MarkdownIt
 from pyinstrument import Profiler
-from django.conf import settings
 
 from aboutcode.pipeline import BasePipeline
 from scancodeio.settings import download_store
+
 logger = logging.getLogger(__name__)
 
 

scanpipe/tests/test_pipelines.py

@@ -1,11 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-=======
->>>>>>> ca2f49f5 (Revert "Revert "Revert "add tests for storing packages""")
 # SPDX-License-Identifier: Apache-2.0
 #
 # http://nexb.com and https://github.com/nexB/scancode.io
@@ -37,10 +29,6 @@
 from pathlib import Path
 from unittest import mock
 from unittest import skipIf
-<<<<<<< HEAD
-=======
-from unittest.mock import patch
->>>>>>> ca2f49f5 (Revert "Revert "Revert "add tests for storing packages""")
 
 from django.conf import settings
 from django.test import TestCase
@@ -311,49 +299,31 @@ def test_archive_downloads(self, mock_get):
         with open(test_data_path, "rb") as f:
             test_content = f.read()
 
-<<<<<<< HEAD
-        input_source=InputSource.objects.create(
-=======
-        InputSource.objects.create(
->>>>>>> ca2f49f5 (Revert "Revert "Revert "add tests for storing packages""")
-            project=project1,
-            filename=test_filename,
-            download_url=test_url,
-            is_uploaded=False,
+        input_source = InputSource.objects.create(
+            InputSource.objects.create(
+                project=project1,
+                filename=test_filename,
+                download_url=test_url,
+                is_uploaded=False,
+            )
         )
-<<<<<<< HEAD
-
-=======
-        
->>>>>>> ca2f49f5 (Revert "Revert "Revert "add tests for storing packages""")
         mock_get.return_value.content = test_content
         mock_get.return_value.status_code = 200
 
         pipeline.download_missing_inputs()
         input_source.refresh_from_db()
-<<<<<<< HEAD
         self.assertTrue(
             input_source.file_path.startswith(settings.CENTRAL_ARCHIVE_PATH)
         )
         self.assertTrue(Path(input_source.file_path).exists())
 
-=======
-        self.assertTrue(input_source.file_path.startswith(settings.CENTRAL_ARCHIVE_PATH))
-        self.assertTrue(Path(input_source.file_path).exists())
-
-        
->>>>>>> ca2f49f5 (Revert "Revert "Revert "add tests for storing packages""")
         pipeline.archive_downloads()
         input_source = InputSource.refresh_from_db()
         self.assertTrue(input_source.sha256)
         self.assertTrue(input_source.download_date)
         self.assertEqual(input_source.download_url, test_url)
         self.assertEqual(input_source.filename, test_filename)
-<<<<<<< HEAD
 
-=======
-    
->>>>>>> ca2f49f5 (Revert "Revert "Revert "add tests for storing packages""")
         project2 = make_project(name="project2")
         input_source2 = InputSource.objects.create(
             project=project2,