Merge pull request #2122 from NicholasBHubbard/fix-ci

Fix failing CI

Author: jordansissel

.github/workflows/ruby.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         ruby-version: ['2.7', '3.0', '3.1', '3.4']
@@ -20,7 +20,8 @@ jobs:
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-    - run: |
+    - name: Run test suite
+      run: |
         if [ ! -z "$RUNNER_DEBUG" ] ; then
           DEBUG=1 bundle exec rspec -fd
         else

docs/installation.rst

@@ -36,6 +36,7 @@ Some package formats require other tools to be installed on your machine to be b
 
 * RPM: rpm/rpm-tools/rpm-build [This dependency might be removed in the future, see `issue #54`_ on github]
 * Snap: squashfs/squashfs-tools
+* Python: a requirements.txt file is provided to list Python dependencies: `$ pip install -r requirements.txt`
 
 .. _issue #54: https://github.com/jordansissel/fpm/issues/54
 

lib/fpm/package/pyfpm/get_metadata.py

@@ -2,6 +2,7 @@
 
 #import pkg_resources
 import packaging.requirements
+import packaging.markers
 import json
 import sys
 
@@ -11,10 +12,9 @@
 # Process environment markers, if any, and produce a list of requirements for the current environment.
 def evaluate_requirements(fd):
     all_requirements = [packaging.requirements.Requirement(line) for line in sys.stdin]
-    
+    default_env = packaging.markers.default_environment()
     for req in all_requirements:
-        # XXX: Note: marker.evaluate() can be given a dict() containing environment values to overwrite
-        if req.marker is None or req.marker.evaluate():
+        if req.marker is None or req.marker.evaluate(environment=default_env):
             if len(req.specifier) > 0:
                 for spec in req.specifier:
                     yield "%s%s" % (req.name, spec)

lib/fpm/package/pyfpm/parse_requires.py

@@ -605,7 +605,7 @@ def install_to_staging(path)
     flags = [ "--root", staging_path ]
     flags += [ "--prefix", prefix ] if !attributes[:prefix].nil?
 
-    safesystem(*attributes[:python_pip], "install", "--no-deps", *flags, path)
+    safesystem(*attributes[:python_pip], "install", "--no-deps", "--ignore-installed", *flags, path)
   end # def install_to_staging
 
   public(:input)

lib/fpm/package/python.rb

@@ -0,0 +1,2 @@
+# Listing of fpm's Python package dependencies
+packaging

requirements.txt

@@ -400,7 +400,7 @@ def dpkg_field(field)
       subject.attributes[:deb_user] = "root"
       subject.attributes[:deb_group] = "root"
       subject.category = "comm"
-      subject.dependencies << "lsb-base"
+      subject.dependencies << "debconf"
 
       subject.instance_variable_set(:@staging_path, staging_path)
 

spec/fpm/package/deb_spec.rb

@@ -0,0 +1,2 @@
+# Listing of fpm test-suite's Python package dependencies
+setuptools