updated weblate depdencies by update_puppet_dependecy_files.py

manifests/weblate/debian_packages.pp

@@ -2,7 +2,7 @@
 class tails::weblate::debian_packages () {
 
   # some packages are commented out because the needed versions for Weblate
-  # 2.19.1 are still not available in Debian stable. Fore more details, see:
+  # 3.5.1 are still not available in Debian stable. Fore more details, see:
   # https://redmine.tails.boum.org/code/issues/10038
   $packages = [
     'ccze',
@@ -10,6 +10,7 @@ class tails::weblate::debian_packages () {
     'mercurial',  # so we can use pip to install from hg repos
     'python3-dateutil',
     'python3-defusedxml',
+    'python3-diff-match-patch',
     'python3-levenshtein',
     'python3-lxml',
     'python3-memcache',
@@ -17,9 +18,13 @@ class tails::weblate::debian_packages () {
     'python3-pil',
     'python3-psycopg2',
     'python3-pyuca',
+    'python3-rcssmin',
     'python3-six',
-    'python3-yaml',
+    'python3-sqlparse',
+    'python3-tblib',
+    'python3-tz',
     'python3-whoosh',
+    'python3-yaml',
     'sqlite3',
   ]
 

manifests/weblate/python_modules.pp

@@ -9,118 +9,178 @@ class tails::weblate::python_modules () {
   ensure_packages($pip_packages)
 
   # The following deps are in Debian Stretch but with a version that is older
-  # than needed by Weblate 3.0. The versions noted as comments are the
+  # than needed by Weblate 3.5.1. The versions noted as comments are the
   # requirements for the current Weblate version we are running (check
   # manifests/weblate.pp to know which version it is).
 
+  tails::pip_package_from_repo { 'amqp':
+    version => '2.5.2',  # >=2.5.2,<2.6
+    url     => 'http://github.com/celery/py-amqp',
+    require => 'Exec[pip_install_vine]',
+  }
+
+  tails::pip_package_from_repo { 'asgiref':
+    version => '3.2.3',  # ~=3.2
+    url     => 'http://github.com/django/asgiref/',
+  }
+
+  tails::pip_package_from_repo { 'billiard':
+    version => '3.6.1.0',  # <4.0,>=3.6.1
+    tag => '3.6.1',
+    url     => 'https://github.com/celery/billiard',
+  }
+
   tails::pip_package_from_repo { 'celery':
-    version => '4.3.0',  # >= 4.0
-    tag     => 'v4.3.0',
+    version => '4.4.0',  # >=4.0
+    tag     => 'v4.4.0',
     url     => 'https://github.com/celery/celery',
+    require => 'Exec[pip_install_billiard]',
+    require => 'Exec[pip_install_kombu]',
+    require => 'Exec[pip_install_vine]',
+    require => 'Exec[pip_install_couchbase-cffi]',
+    require => 'Exec[pip_install_redis]',
   }
 
   tails::pip_package_from_repo { 'celery-batches':
     version => '0.2',  # >= 0.2
     tag     => 'v0.2',
     url     => 'https://github.com/percipient/celery-batches',
+    require => 'Exec[pip_install_celery]',
   }
 
   tails::pip_package_from_repo { 'django':
-    version => '1.11.27',  # >= 1.11
+    version => '1.11.27',  # >=1.11,<2.0
     url     => 'https://github.com/django/django',
+    require => 'Exec[pip_install_asgiref]',
   }
 
   tails::pip_package_from_repo { 'django-appconf':
-    version => '1.0.2',  # >= 1.0
-    tag     => 'v1.0.2',
+    version => '1.0.3',  # >= 1.0
+    tag     => 'v1.0.3',
     url     => 'https://github.com/django-compressor/django-appconf',
+    require => 'Exec[pip_install_django]',
   }
 
   tails::pip_package_from_repo { 'django-compressor':
-    version => '2.2',  # >= 2.1.1
+    version => '2.4',  # >=2.1.1
     url     => 'https://github.com/django-compressor/django-compressor',
-    require => Exec['pip_install_django-appconf']
+    require => 'Exec[pip_install_django-appconf]',
+    require => 'Exec[pip_install_rjsmin]',
   }
 
   tails::pip_package_from_repo { 'django-crispy-forms':
-    version => '1.7.2',  # >= 1.7.2
+    version => '1.8.1',  # >=1.6.1
     url     => 'https://github.com/django-crispy-forms/django-crispy-forms',
   }
 
   tails::pip_package_from_repo { 'djangorestframework':
-    version => '3.8.2',  # >= 3.8
+    version => '3.11.0',  # >=3.8
     url     => 'https://github.com/encode/django-rest-framework',
+    require => 'Exec[pip_install_django]',
   }
 
   tails::pip_package_from_repo { 'filelock':
-    version => '3.0.4',  # >= 3.0.1
-    tag     => 'v3.0.4',
+    version => '3.0.12',  # >=3.0.1
+    tag     => 'v3.0.12',
     url     => 'https://github.com/benediktschmitt/py-filelock',
   }
 
+  tails::pip_package_from_repo { 'importlib-metadata':
+    version => '1.3.0',  # >=0.18
+    url     => 'https://gitlab.com/python-devs/importlib_metadata',
+    require => 'Exec[pip_install_zipp]',
+  }
+
   tails::pip_package_from_repo { 'jellyfish':
     version => '0.7.2',  # >= 0.6.1
-    tag     => '0.7.2',
     url     => 'https://github.com/jamesturk/jellyfish',
   }
 
-    tails::pip_package_from_repo { 'oauthlib':
-    version => '3.1.0',  # >= 3.0.0
-    tag     => 'v3.1.0',
+  tails::pip_package_from_repo { 'kombu':
+    version => '4.6.7',  # <4.7,>=4.6.7
+    url     => 'http://github.com/celery/kombu',
+    require => 'Exec[pip_install_amqp]',
+    require => 'Exec[pip_install_importlib-metadata]',
+    require => 'Exec[pip_install_redis]',
+  }
+
+  tails::pip_package_from_repo { 'more-itertools':
+    version => '8.0.2',
+    tag => 'v8.0.2',
+    url     => 'https://github.com/erikrose/more-itertools',
+  }
+
+  tails::pip_package_from_repo { 'oauthlib':
+    version => '3.1.0',  # >=3.0.0
+    tag => 'v3.1.0',
     url     => 'https://github.com/oauthlib/oauthlib',
   }
 
   tails::pip_package_from_repo { 'openpyxl':
-    version   => '2.6.0',  # >= 2.5.0
-    url       => 'https://bitbucket.org/openpyxl/openpyxl/src/default',
+    version => '3.0.2',  # >=2.5.0
+    url     => 'https://bitbucket.org/openpyxl/openpyxl/src/default',
     repo_type => 'hg',
   }
 
-  tails::pip_package_from_repo { 'phply':
-    version => '1.2.4',
-    url     => 'https://github.com/viraptor/phply',
-  }
-
   tails::pip_package_from_repo { 'redis':
     version => '3.3.11',  # >= 3.3.11 -- from celery's kombu
     url     => 'https://github.com/andymccurdy/redis-py',
   }
 
-  tails::pip_package_from_repo { 'ruamel.yaml':
-    version   => '0.16.5',
-    url       => 'https://bitbucket.org/ruamel/yaml/src/default',
-    repo_type => 'hg',
+  tails::pip_package_from_repo { 'rjsmin':
+    version => '1.1.0',  # ==1.1.0
+    url     => 'https://github.com/ndparker/rjsmin',
   }
 
   tails::pip_package_from_repo { 'siphashc':
-    version => '1.0',  # >= 0.8
-    tag     => 'v1.0',
+    version => '1.3',  # >=0.8
+    tag     => 'v1.3',
     url     => 'https://github.com/WeblateOrg/siphashc',
   }
 
   tails::pip_package_from_repo { 'social-auth-app-django':
-    version => '3.1.0',  # >= 3.1.0
+    version => '3.1.0',  # >=3.1.0
     url     => 'https://github.com/python-social-auth/social-app-django',
   }
 
   tails::pip_package_from_repo { 'social-auth-core':
-    version => '3.1.0',  # >= 3.1.0
+    version => '3.2.0',  # >=3.1.0
     url     => 'https://github.com/python-social-auth/social-core',
   }
 
   tails::pip_package_from_repo { 'translate-toolkit':
-    version => '2.3.1',  # >= 2.3.1
+    version => '2.4.0',  # >=2.3.1
     url     => 'https://github.com/translate/translate',
   }
 
   tails::pip_package_from_repo { 'translation-finder':
-    version => '1.7',  # >= 1.0
+    version => '1.7',  # >=1.0
     url     => 'https://github.com/WeblateOrg/translation-finder.git',
   }
 
+  tails::pip_package_from_repo { 'ua-parser':
+    version => '0.8.0',  # >=0.8.0
+    url     => 'https://github.com/ua-parser/uap-python',
+  }
+
   tails::pip_package_from_repo { 'user-agents':
-    version => '1.1.0',  # >= 1.1.0
-    tag     => 'v1.1.0',
+    version => '2.0',  # >=1.1.0
+    tag     => 'v2.0',
     url     => 'https://github.com/selwin/python-user-agents',
+    require => 'Exec[pip_install_ua-parser]',
   }
+
+  tails::pip_package_from_repo { 'vine':
+    version => '1.3.0',  # ==1.3.0
+    tag => 'v1.3.0',
+    url     => 'http://github.com/celery/vine',
+  }
+
+  tails::pip_package_from_repo { 'zipp':
+    version => '0.6.0',  # >=0.5
+    tag => 'v0.6.0',
+    url     => 'https://github.com/jaraco/zipp',
+    require => 'Exec[pip_install_more-itertools]',
+  }
+
 }