Removed sdist setup.cfg template

log2timeline · Mar 30, 2024 · bf39c63 · bf39c63
1 parent c73448c
commit bf39c63
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 23 deletions.
diff --git a/data/templates/github_actions/test_docker.yml b/data/templates/github_actions/test_docker.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: ['39']
+        version: ['39', '40']
     container:
       image: registry.fedoraproject.org/fedora:$${{ matrix.version }}
     steps:
@@ -41,7 +41,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: ['22.04']
+        version: ['24.04']
     container:
       image: ubuntu:$${{ matrix.version }}
     steps:

diff --git a/data/templates/setup.cfg/sdist_test_data b/data/templates/setup.cfg/sdist_test_data
diff --git a/l2tdevtools/dependency_writers/setup.py b/l2tdevtools/dependency_writers/setup.py
@@ -36,10 +36,6 @@ class SetupCfgWriter(interface.DependencyFileWriter):
       'artifacts-kb', 'dfvfs', 'dfwinreg', 'dtformats', 'esedb-kb', 'olecf-kb',
       'plaso', 'winreg-kb', 'winsps-kb')
 
-  _PROJECTS_WITH_SDIST_TEST_DATA = (
-      'dfimagetools', 'dfvfs', 'dfwinreg', 'plaso', 'winevt-kb', 'winreg-kb',
-      'winsps-kb')
-
   _TEMPLATE_DIRECTORY = os.path.join('data', 'templates', 'setup.cfg')
 
   def _DetermineSubmoduleLevels(self, python_module_name):
@@ -190,11 +186,6 @@ def Write(self):
         'options_packages_find', template_mappings)
     file_content.append(template_data)
 
-    if self._project_definition.name in self._PROJECTS_WITH_SDIST_TEST_DATA:
-      template_data = self._GenerateFromTemplate(
-          'sdist_test_data', template_mappings)
-      file_content.append(template_data)
-
     template_data = self._GenerateFromTemplate('bdist_wheel', template_mappings)
     file_content.append(template_data)
 

diff --git a/tests/download_helpers/github.py b/tests/download_helpers/github.py
@@ -172,7 +172,7 @@ class Log2TimelineGitHubReleasesDownloadHelperTest(test_lib.BaseTestCase):
 
   _PROJECT_ORGANIZATION = 'log2timeline'
   _PROJECT_NAME = 'dfvfs'
-  _PROJECT_VERSION = '20240115'
+  _PROJECT_VERSION = '20240317'
 
   @classmethod
   def setUpClass(cls):

diff --git a/tests/download_helpers/pypi.py b/tests/download_helpers/pypi.py
@@ -19,7 +19,7 @@ class PyPIDownloadHelperTest(test_lib.BaseTestCase):
   _GIT_URL = 'https://github.com/log2timeline/dfvfs.git'
 
   _PROJECT_NAME = 'dfvfs'
-  _PROJECT_VERSION = '20240115'
+  _PROJECT_VERSION = '20240317'
   _PYPI_VERSION = '20240115'
 
   @classmethod

diff --git a/tests/update.py b/tests/update.py
@@ -20,7 +20,7 @@ class GithubRepoDownloadHelperTest(test_lib.BaseTestCase):
   _DOWNLOAD_URL = 'https://github.com/ForensicArtifacts/artifacts/releases'
 
   _PROJECT_NAME = 'artifacts'
-  _PROJECT_VERSION = '20240303'
+  _PROJECT_VERSION = '20240317'
 
   def testGetPackageDownloadURLs(self):
     """Tests the GetPackageDownloadURLs function."""
@@ -50,7 +50,7 @@ class DependencyUpdaterTest(test_lib.BaseTestCase):
   # pylint: disable=protected-access
 
   _PROJECT_NAME = 'dfvfs'
-  _PROJECT_VERSION = '20240115'
+  _PROJECT_VERSION = '20240317'
 
   def testGetAvailableWheelPackages(self):
     """Tests the _GetAvailableWheelPackages function."""