fdroidserver 2.2.1__tar.gz → 2.3a0__tar.gz

{fdroidserver-2.2.1 → fdroidserver-2.3a0}/CHANGELOG.md

@@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
+## unreleased
+
+### Added
+
+### Fixed
+
+### Removed
+
+* The `maven:` field is now always a string, with `yes` as a legacy special
+  value.  It is no longer treated like a boolean in any case.
+
 ## [2.2.1] - 2023-03-09
 
 ### Added

{fdroidserver-2.2.1 → fdroidserver-2.3a0}/MANIFEST.in

@@ -543,8 +543,26 @@ include tests/build-tools/28.0.3/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/generate.sh
 include tests/check-fdroid-apk
 include tests/checkupdates.TestCase
+include tests/com.fake.IpaApp_1000000000001.ipa
 include tests/common.TestCase
 include tests/config.py
+include tests/config/antiFeatures.yml
+include tests/config/categories.yml
+include tests/config/de/antiFeatures.yml
+include tests/config/fa/antiFeatures.yml
+include tests/config/ic_antifeature_ads.xml
+include tests/config/ic_antifeature_disabledalgorithm.xml
+include tests/config/ic_antifeature_knownvuln.xml
+include tests/config/ic_antifeature_nonfreeadd.xml
+include tests/config/ic_antifeature_nonfreeassets.xml
+include tests/config/ic_antifeature_nonfreedep.xml
+include tests/config/ic_antifeature_nonfreenet.xml
+include tests/config/ic_antifeature_nosourcesince.xml
+include tests/config/ic_antifeature_nsfw.xml
+include tests/config/ic_antifeature_tracking.xml
+include tests/config/ic_antifeature_upstreamnonfree.xml
+include tests/config/ro/antiFeatures.yml
+include tests/config/zh-rCN/antiFeatures.yml
 include tests/corrupt-featureGraphic.png
 include tests/deploy.TestCase
 include tests/dummy-keystore.jks
@@ -552,9 +570,12 @@ include tests/dump_internal_metadata_format.py
 include tests/exception.TestCase
 include tests/extra/manual-vmtools-test.py
 include tests/funding-usernames.yaml
-include tests/get_android_tools_versions/android-ndk/android-ndk-r21d/source.properties
-include tests/get_android_tools_versions/android-ndk/r11c/source.properties
-include tests/get_android_tools_versions/android-ndk/r17c/source.properties
+include tests/get_android_tools_versions/android-ndk-r10e/RELEASE.TXT
+include tests/get_android_tools_versions/android-sdk/ndk/11.2.2725575/source.properties
+include tests/get_android_tools_versions/android-sdk/ndk/17.2.4988734/source.properties
+include tests/get_android_tools_versions/android-sdk/ndk/21.3.6528147/source.properties
+include tests/get_android_tools_versions/android-sdk/ndk-bundle/package.xml
+include tests/get_android_tools_versions/android-sdk/ndk-bundle/source.properties
 include tests/get_android_tools_versions/android-sdk/patcher/v4/source.properties
 include tests/get_android_tools_versions/android-sdk/platforms/android-30/source.properties
 include tests/get_android_tools_versions/android-sdk/skiaparser/1/source.properties
@@ -578,7 +599,14 @@ include tests/main.TestCase
 include tests/metadata/apk/info.guardianproject.urzip.yaml
 include tests/metadata/apk/org.dyndns.fules.ck.yaml
 include tests/metadata/app.with.special.build.params.yml
+include tests/metadata/app.with.special.build.params/en-US/antifeatures/50_Ads.txt
+include tests/metadata/app.with.special.build.params/en-US/antifeatures/50_Tracking.txt
+include tests/metadata/app.with.special.build.params/en-US/antifeatures/Ads.txt
+include tests/metadata/app.with.special.build.params/en-US/antifeatures/NoSourceSince.txt
+include tests/metadata/app.with.special.build.params/zh-CN/antifeatures/49_Tracking.txt
+include tests/metadata/app.with.special.build.params/zh-CN/antifeatures/50_Ads.txt
 include tests/metadata/com.politedroid.yml
+include tests/metadata/dump/app.with.special.build.params.yaml
 include tests/metadata/dump/com.politedroid.yaml
 include tests/metadata/dump/org.adaway.yaml
 include tests/metadata/dump/org.smssecure.smssecure.yaml
@@ -634,8 +662,8 @@ include tests/org.bitbucket.tickytacky.mirrormirror_2.apk
 include tests/org.bitbucket.tickytacky.mirrormirror_3.apk
 include tests/org.bitbucket.tickytacky.mirrormirror_4.apk
 include tests/org.dyndns.fules.ck_20.apk
+include tests/org.sajeg.fallingblocks_3.apk
 include tests/publish.TestCase
-include tests/repo/categories.txt
 include tests/repo/com.example.test.helloworld_1.apk
 include tests/repo/com.politedroid_3.apk
 include tests/repo/com.politedroid_4.apk

{fdroidserver-2.2.1/fdroidserver.egg-info → fdroidserver-2.3a0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fdroidserver
-Version: 2.2.1
+Version: 2.3a0
 Summary: F-Droid Server Tools
 Home-page: https://f-droid.org
 Author: The F-Droid Project
@@ -19,6 +19,7 @@ Classifier: Topic :: Utilities
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 Provides-Extra: docs
+Provides-Extra: optional
 Provides-Extra: test
 License-File: LICENSE
 
@@ -27,83 +28,84 @@ License-File: LICENSE
 <p><img src="https://gitlab.com/fdroid/artwork/-/raw/master/fdroid-logo-2015/fdroid-logo.svg" width="200"></p>
 
 # F-Droid Server
-### Server tools for maintaining an F-Droid repository system.
+### Tools for maintaining an F-Droid repository system.
 
 </div>
 
 ---
 
-## What is F-Droid?
-
-F-Droid is an installable catalogue of FOSS (Free and Open Source Software)
-applications for the Android platform. The client makes it easy to browse,
-install, and keep track of updates on your device.
-
-
 ## What is F-Droid Server?
 
-The F-Droid server tools provide various scripts and tools that are
-used to maintain the main
-[F-Droid application repository](https://f-droid.org/packages).  You
-can use these same tools to create your own additional or alternative
-repository for publishing, or to assist in creating, testing and
-submitting metadata to the main repository.
+_fdroidserver_ is a suite of tools to publish and work with collections of
+Android apps (APK files) and other kinds of packages.  It is used to maintain
+the [f-droid.org application repository](https://f-droid.org/packages).  These
+same tools can be used to create additional or alternative repositories for
+publishing, or to assist in creating, testing and submitting metadata to the
+f-droid.org repository, also known as
+[_fdroiddata_](https://gitlab.com/fdroid/fdroiddata).
 
-For documentation, please see <https://f-droid.org/docs>, or you can
-find the source for the documentation in
-[fdroid/fdroid-website](https://gitlab.com/fdroid/fdroid-website).
+For documentation, please see <https://f-droid.org/docs>.
+
+In the beginning, _fdroidserver_ was the complete server-side setup that ran
+f-droid.org.  Since then, the website and other parts have been split out into
+their own projects.  The name for this suite of tooling has stayed
+_fdroidserver_ even though it no longer contains any proper server component.
 
 
 ## Installing
 
-There are many ways to install _fdroidserver_, they are documented on
-the website:
+There are many ways to install _fdroidserver_, including using a range of
+package managers.  All of the options are documented on the website:
 https://f-droid.org/docs/Installing_the_Server_and_Repo_Tools
 
-All sorts of other documentation lives there as well.
-
 
 ## Tests
 
-There are many components to all the tests for the components in
-this git repository.  The most commonly used parts of well tested, while
-some parts still lack tests.  This test suite has built over time a
-bit haphazardly, so it is not as clean, organized, or complete as it
-could be.  We welcome contributions.  Before rearchitecting any parts
-of it, be sure to [contact us](https://f-droid.org/about) to discuss
-the changes beforehand.
+To run the full test suite:
+
+    tests/run-tests
 
-### `fdroid` commands
+To run the tests for individual Python modules, see the _.TestCase_ files, e.g.:
 
-The test suite for all of the `fdroid` commands is in the _tests/_
-subdir.  _.gitlab-ci.yml_ and _.travis.yml_ run this test suite on
-various configurations.
+    tests/metadata.TestCase
+
+It is also possible to run individual tests:
+
+    tests/metadata.TestCase MetadataTest.test_rewrite_yaml_special_build_params
+
+There is a growing test suite that has good coverage on a number of key parts of
+this code base.  It does not yet cover all the code, and there are some parts
+where the technical debt makes it difficult to write unit tests.  New tests
+should be standard Python _unittest_ test cases.  Whenever possible, the old
+tests written in _bash_ in _tests/run-tests_ should be ported to Python.
+
+This test suite has built over time a bit haphazardly, so it is not as clean,
+organized, or complete as it could be.  We welcome contributions.  The goal is
+to move towards standard Python testing patterns and to expand the unit test
+coverage.  Before rearchitecting any parts of it, be sure to [contact
+us](https://f-droid.org/about) to discuss the changes beforehand.
 
-- _tests/run-tests_ runs the whole test suite
-- _tests/*.TestCase_ are individual unit tests for all of the `fdroid`
-  commands, which can be run separately, e.g. `./update.TestCase`.
-- run one test: `tests/common.TestCase CommonTest.test_get_apk_id`
 
 ### Additional tests for different linux distributions
 
-These tests are also run on various distributions through GitLab CI. This is
+These tests are also run on various configurations through GitLab CI. This is
 only enabled for `master@fdroid/fdroidserver` because it takes longer to
 complete than the regular CI tests.  Most of the time you won't need to worry
 about them, but sometimes it might make sense to also run them for your merge
-request. In that case you need to remove [these lines from
-.gitlab-ci.yml](https://gitlab.com/fdroid/fdroidserver/blob/master/.gitlab-ci.yml#L34-35)
+request. In that case you need to remove [these lines from .gitlab-ci.yml](https://gitlab.com/fdroid/fdroidserver/-/blob/0124b9dde99f9cab19c034cbc7d8cc6005a99b48/.gitlab-ci.yml#L90-91)
 and push this to a new branch of your fork.
 
 Alternatively [run them
 locally](https://docs.gitlab.com/runner/commands/README.html#gitlab-runner-exec)
 like this: `gitlab-runner exec docker ubuntu_lts`
 
+
 ### Buildserver
 
 The tests for the whole build server setup are entirely separate
 because they require at least 200 GB of disk space, and 8 GB of
 RAM. These test scripts are in the root of the project, all starting
-with _jenkins-_ since they are run on https://jenkins.debian.net.
+with _jenkins-_ since they used to be run on https://jenkins.debian.net.
 
 
 ## Documentation

fdroidserver-2.3a0/README.md

@@ -0,0 +1,128 @@
+<div align="center">
+
+<p><img src="https://gitlab.com/fdroid/artwork/-/raw/master/fdroid-logo-2015/fdroid-logo.svg" width="200"></p>
+
+# F-Droid Server
+### Tools for maintaining an F-Droid repository system.
+
+</div>
+
+---
+
+## What is F-Droid Server?
+
+_fdroidserver_ is a suite of tools to publish and work with collections of
+Android apps (APK files) and other kinds of packages.  It is used to maintain
+the [f-droid.org application repository](https://f-droid.org/packages).  These
+same tools can be used to create additional or alternative repositories for
+publishing, or to assist in creating, testing and submitting metadata to the
+f-droid.org repository, also known as
+[_fdroiddata_](https://gitlab.com/fdroid/fdroiddata).
+
+For documentation, please see <https://f-droid.org/docs>.
+
+In the beginning, _fdroidserver_ was the complete server-side setup that ran
+f-droid.org.  Since then, the website and other parts have been split out into
+their own projects.  The name for this suite of tooling has stayed
+_fdroidserver_ even though it no longer contains any proper server component.
+
+
+## Installing
+
+There are many ways to install _fdroidserver_, including using a range of
+package managers.  All of the options are documented on the website:
+https://f-droid.org/docs/Installing_the_Server_and_Repo_Tools
+
+
+## Tests
+
+To run the full test suite:
+
+    tests/run-tests
+
+To run the tests for individual Python modules, see the _.TestCase_ files, e.g.:
+
+    tests/metadata.TestCase
+
+It is also possible to run individual tests:
+
+    tests/metadata.TestCase MetadataTest.test_rewrite_yaml_special_build_params
+
+There is a growing test suite that has good coverage on a number of key parts of
+this code base.  It does not yet cover all the code, and there are some parts
+where the technical debt makes it difficult to write unit tests.  New tests
+should be standard Python _unittest_ test cases.  Whenever possible, the old
+tests written in _bash_ in _tests/run-tests_ should be ported to Python.
+
+This test suite has built over time a bit haphazardly, so it is not as clean,
+organized, or complete as it could be.  We welcome contributions.  The goal is
+to move towards standard Python testing patterns and to expand the unit test
+coverage.  Before rearchitecting any parts of it, be sure to [contact
+us](https://f-droid.org/about) to discuss the changes beforehand.
+
+
+### Additional tests for different linux distributions
+
+These tests are also run on various configurations through GitLab CI. This is
+only enabled for `master@fdroid/fdroidserver` because it takes longer to
+complete than the regular CI tests.  Most of the time you won't need to worry
+about them, but sometimes it might make sense to also run them for your merge
+request. In that case you need to remove [these lines from .gitlab-ci.yml](https://gitlab.com/fdroid/fdroidserver/-/blob/0124b9dde99f9cab19c034cbc7d8cc6005a99b48/.gitlab-ci.yml#L90-91)
+and push this to a new branch of your fork.
+
+Alternatively [run them
+locally](https://docs.gitlab.com/runner/commands/README.html#gitlab-runner-exec)
+like this: `gitlab-runner exec docker ubuntu_lts`
+
+
+### Buildserver
+
+The tests for the whole build server setup are entirely separate
+because they require at least 200 GB of disk space, and 8 GB of
+RAM. These test scripts are in the root of the project, all starting
+with _jenkins-_ since they used to be run on https://jenkins.debian.net.
+
+
+## Documentation
+
+The API documentation based on the docstrings gets automatically
+published [here](https://fdroid.gitlab.io/fdroidserver) on every commit
+on the `master` branch.
+
+It can be built locally via
+
+```bash
+pip install -e .[docs]
+cd docs
+sphinx-apidoc -o ./source ../fdroidserver -M -e
+sphinx-autogen -o generated source/*.rst
+make html
+```
+
+To additionally lint the code call
+```bash
+pydocstyle fdroidserver --count
+```
+
+When writing docstrings you should follow the
+[numpy style guide](https://numpydoc.readthedocs.io/en/latest/format.html).
+
+
+## Translation
+
+Everything can be translated.  See
+[Translation and Localization](https://f-droid.org/docs/Translation_and_Localization)
+for more info.
+
+<div align="center">
+
+[![](https://hosted.weblate.org/widgets/f-droid/-/287x66-white.png)](https://hosted.weblate.org/engage/f-droid)
+
+<details>
+<summary>View translation status for all languages.</summary>
+
+[![](https://hosted.weblate.org/widgets/f-droid/-/fdroidserver/multi-auto.svg)](https://hosted.weblate.org/engage/f-droid/?utm_source=widget)
+
+</details>
+
+</div>

{fdroidserver-2.2.1 → fdroidserver-2.3a0}/buildserver/Vagrantfile

@@ -35,7 +35,7 @@ Vagrant.configure("2") do |config|
     config.cache.enable :chef
   end
 
-  config.vm.box = "fdroid/bullseye64"
+  config.vm.box = "debian/bookworm64"
 
   if not configfile.has_key? "vm_provider" or configfile["vm_provider"] == "virtualbox"
     # default to VirtualBox if not set
@@ -53,6 +53,8 @@ Vagrant.configure("2") do |config|
       libvirt.uri = "qemu:///system"
       libvirt.cpus = configfile["cpus"]
       libvirt.memory = configfile["memory"]
+      # Debian Vagrant image is only 20G, so allocate more
+      libvirt.machine_virtual_size = 1024
       if configfile.has_key? "libvirt_disk_bus"
         libvirt.disk_bus = configfile["libvirt_disk_bus"]
       end
@@ -86,6 +88,12 @@ Vagrant.configure("2") do |config|
   # necessary with 9p synced folders
   Dir.mkdir('cache') unless File.exists?('cache')
 
+  # Root partition needs to be resized to the new allocated space
+  config.vm.provision "shell", inline: <<-SHELL
+    growpart -v -u auto /dev/vda 1
+    resize2fs /dev/vda1
+  SHELL
+
   config.vm.provision "shell", name: "setup-env-vars", path: "setup-env-vars",
     args: ["/opt/android-sdk"]
   config.vm.provision "shell", name: "apt-get-install", path: "provision-apt-get-install",

{fdroidserver-2.2.1 → fdroidserver-2.3a0}/buildserver/provision-android-sdk

@@ -160,3 +160,8 @@ chmod g+w $ANDROID_HOME/{build-tools,platforms}
 test -d $ANDROID_HOME/extras/m2repository || mkdir -p $ANDROID_HOME/extras/m2repository
 find $ANDROID_HOME/extras/m2repository -type d | xargs chgrp vagrant
 find $ANDROID_HOME/extras/m2repository -type d | xargs chmod g+w
+
+# allow gradle/sdkmanager to install extras;android;m2repository
+test -d $ANDROID_HOME/extras/android || mkdir -p $ANDROID_HOME/extras/android
+find $ANDROID_HOME/extras/android -type d | xargs chgrp vagrant
+find $ANDROID_HOME/extras/android -type d | xargs chmod g+w

{fdroidserver-2.2.1 → fdroidserver-2.3a0}/buildserver/provision-apt-get-install

@@ -10,7 +10,7 @@ export DEBIAN_FRONTEND=noninteractive
 printf 'APT::Install-Recommends "0";\nAPT::Install-Suggests "0";\n' \
        > /etc/apt/apt.conf.d/99no-install-recommends
 
-printf 'APT::Acquire::Retries "20";\n' \
+printf 'Acquire::Retries "20";\n' \
        > /etc/apt/apt.conf.d/99acquire-retries
 
 cat <<EOF > /etc/apt/apt.conf.d/99no-auto-updates
@@ -39,28 +39,29 @@ if echo $debian_mirror | grep '^https' 2>&1 > /dev/null; then
 fi
 
 cat << EOF > /etc/apt/sources.list
-deb ${debian_mirror} bullseye main
-deb https://security.debian.org/debian-security bullseye-security main
-deb ${debian_mirror} bullseye-updates main
+deb ${debian_mirror} bookworm main
+deb https://security.debian.org/debian-security bookworm-security main
+deb ${debian_mirror} bookworm-updates main
 EOF
-echo "deb ${debian_mirror} bullseye-backports main" > /etc/apt/sources.list.d/backports.list
+echo "deb ${debian_mirror} bookworm-backports main" > /etc/apt/sources.list.d/backports.list
 
 apt-get update || apt-get update
 
 # purge things that might come from the base box, but we don't want
 # https://salsa.debian.org/cloud-team/debian-vagrant-images/-/tree/master/config_space/package_config
 # cat config_space/package_config/* | sort -u | grep -v '[A-Z#]'
+
 purge="
  apt-listchanges
  apt-utils
  bash-completion
  bind9-*
  bsdextrautils
- build-essential
  bzip2
  chrony
  cloud-utils
  cron
+ cron-daemon-common
  dbus
  debconf-i18n
  debian-faq
@@ -69,6 +70,7 @@ purge="
  fdisk
  file
  groff-base
+ inetutils-telnet
  krb5-locales
  less
  locales
@@ -82,14 +84,13 @@ purge="
  reportbug
  rsyslog
  tasksel
- telnet
  traceroute
  unattended-upgrades
+ usrmerge
  vim-*
  wamerican
  wget
  whiptail
- xxd
  xz-utils
 "
 # clean up files packages to be purged, then purge the packages
@@ -106,15 +107,18 @@ packages="
  apksigner
  default-jdk-headless
  default-jre-headless
+ curl
  dexdump
  fdroidserver
  git-svn
  gnupg
  mercurial
  patch
+ python3-packaging
  rsync
  sdkmanager
  sudo
+ unzip
 "
 
 apt-get install $packages --download-only

{fdroidserver-2.2.1 → fdroidserver-2.3a0}/completion/bash-completion

@@ -155,7 +155,7 @@ __complete_publish() {
 
 __complete_checkupdates() {
 	opts="-v -q"
-	lopts="--verbose --quiet --auto --autoonly --commit --gplay --allow-dirty"
+	lopts="--verbose --quiet --auto --autoonly --commit --allow-dirty"
 	case "${cur}" in
 		-*)
 			__complete_options

{fdroidserver-2.2.1 → fdroidserver-2.3a0}/examples/Vagrantfile.yaml

@@ -1,3 +1,4 @@
+---
 
 # You may want to alter these before running ./makebuildserver
 

{fdroidserver-2.2.1 → fdroidserver-2.3a0}/examples/config.yml

@@ -178,6 +178,12 @@
 # serverwebroot:
 #   - foo.com:/usr/share/nginx/www/fdroid
 #   - bar.info:/var/www/fdroid
+#
+# There is a special mode to only deploy the index file:
+#
+# serverwebroot:
+#   - url: 'me@b.az:/srv/fdroid'
+#     indexOnly: true
 
 
 # When running fdroid processes on a remote server, it is possible to
@@ -192,14 +198,18 @@
 # deploy_process_logs: true
 
 # The full URL to a git remote repository. You can include
-# multiple servers to mirror to by wrapping the whole thing in {} or [], and
-# including the servergitmirrors strings in a comma-separated list.
+# multiple servers to mirror to by adding strings to a YAML list or map.
 # Servers listed here will also be automatically inserted in the mirrors list.
 #
 # servergitmirrors: https://github.com/user/repo
 # servergitmirrors:
 #   - https://github.com/user/repo
 #   - https://gitlab.com/user/repo
+#
+# servergitmirrors:
+#   - url: https://github.com/user/repo
+#   - url: https://gitlab.com/user/repo
+#     indexOnly: true
 
 # Most git hosting services have hard size limits for each git repo.
 # `fdroid deploy` will delete the git history when the git mirror repo
@@ -220,6 +230,18 @@
 # mirrors:
 #   - https://foo.bar/fdroid
 #   - http://foobarfoobarfoobar.onion/fdroid
+#
+# Or additional metadata can also be included by adding key/value pairs:
+#
+# mirrors:
+#   - url: https://foo.bar/fdroid
+#     countryCode: BA
+#   - url: http://foobarfoobarfoobar.onion/fdroid
+#
+# The list of mirrors can also be maintained in config/mirrors.yml, a
+# standalone YAML file in the optional configuration directory.  In
+# that case, mirrors: should be removed from this file (config.yml).
+
 
 # optionally specify which identity file to use when using rsync or git over SSH
 #
@@ -355,3 +377,9 @@
 #   - suss
 #   - exodus
 #   - https://example.com/signatures.json
+
+# The scanner can use signature sources from the internet. These are
+# cached locally.  To force them to be refreshed from the network on
+# every run, set this to true:
+#
+# refresh_scanner: true

{fdroidserver-2.2.1 → fdroidserver-2.3a0}/examples/fdroid_fetchsrclibs.py

@@ -29,8 +29,12 @@ def main():
     srclibpaths = []
     for appid, app in apps.items():
         vcs, _ignored = common.setup_vcs(app)
-        vcs.gotorevision('HEAD', refresh=False)
         for build in app.get('Builds', []):
+            vcs.gotorevision(build.commit, refresh=False)
+            if build.submodules:
+                vcs.initsubmodules()
+            else:
+                vcs.deinitsubmodules()
             for lib in build.srclibs:
                 srclibpaths.append(common.getsrclib(lib, srclib_dir, prepare=False, build=build))
     print('Set up srclibs:')

{fdroidserver-2.2.1 → fdroidserver-2.3a0}/fdroidserver/__init__.py

@@ -55,7 +55,9 @@ scan_apk  # NOQA: B101
 scan_repo_files  # NOQA: B101
 from fdroidserver.deploy import (update_awsbucket,
                                  update_servergitmirrors,
+                                 update_serverwebroots,
                                  update_serverwebroot)  # NOQA: E402
 update_awsbucket  # NOQA: B101
 update_servergitmirrors  # NOQA: B101
+update_serverwebroots  # NOQA: B101
 update_serverwebroot  # NOQA: B101

{fdroidserver-2.2.1 → fdroidserver-2.3a0}/fdroidserver/__main__.py

@@ -23,7 +23,9 @@ import sys
 import os
 import pkgutil
 import logging
+import importlib.metadata
 
+import git
 import fdroidserver.common
 import fdroidserver.metadata
 from fdroidserver import _
@@ -134,7 +136,7 @@ def main():
         sys.exit(0)
 
     command = sys.argv[1]
-    if command not in COMMANDS and command not in available_plugins.keys():
+    if command not in COMMANDS and command not in available_plugins:
         if command in ('-h', '--help'):
             print_help(available_plugins=available_plugins)
             sys.exit(0)
@@ -142,31 +144,21 @@ def main():
             print(_("""ERROR: The "server" subcommand has been removed, use "deploy"!"""))
             sys.exit(1)
         elif command == '--version':
-            output = _('no version info found!')
-            cmddir = os.path.realpath(os.path.dirname(os.path.dirname(__file__)))
-            moduledir = os.path.realpath(os.path.dirname(fdroidserver.common.__file__) + '/..')
-            if cmddir == moduledir:
-                # running from git
-                os.chdir(cmddir)
-                if os.path.isdir('.git'):
-                    import subprocess
-                    try:
-                        output = subprocess.check_output(['git', 'describe'],
-                                                         stderr=subprocess.STDOUT,
-                                                         universal_newlines=True)
-                    except subprocess.CalledProcessError:
-                        output = 'git commit ' + subprocess.check_output(['git', 'rev-parse', 'HEAD'],
-                                                                         universal_newlines=True)
-                elif os.path.exists('setup.py'):
-                    m = re.search(r'''.*[\s,\(]+version\s*=\s*["']([0-9a-z.]+)["'].*''',
-                                  open('setup.py').read(), flags=re.MULTILINE)
-                    if m:
-                        output = m.group(1) + '\n'
-            else:
-                from pkg_resources import get_distribution
-                output = get_distribution('fdroidserver').version + '\n'
-            print(output)
-            sys.exit(0)
+            try:
+                print(importlib.metadata.version("fdroidserver"))
+                sys.exit(0)
+            except importlib.metadata.PackageNotFoundError:
+                pass
+            try:
+                print(
+                    git.repo.Repo(
+                        os.path.dirname(os.path.dirname(__file__))
+                    ).git.describe(always=True, tags=True)
+                )
+                sys.exit(0)
+            except git.exc.InvalidGitRepositoryError:
+                print(_('No version information could be found.'))
+                sys.exit(1)
         else:
             print(_("Command '%s' not recognised.\n" % command))
             print_help(available_plugins=available_plugins)