From 0e21fcffd0f4f4480ee372b0b02058a826600362 Mon Sep 17 00:00:00 2001
From: Ondrej Nosek <onosek@redhat.com>
Date: Apr 28 2021 08:46:04 +0000
Subject: Enable flatpak tests that require libmodulemd


These tests were skipped previously.
A virtual environment in Jenkins tests needs access to site packages.
Currently, the latest libmodulemd package is installed for Python 3.9
and therefore the tests for flatpak can run only in this environment.
Other minor changes are for synchronization of environment versions
with Jenkins dockerfile.

Signed-off-by: Ondrej Nosek <onosek@redhat.com>

---

diff --git a/Makefile b/Makefile
index e8b8e3d..f0008b3 100644
--- a/Makefile
+++ b/Makefile
@@ -5,5 +5,5 @@ test: $(default_targets)
 tox:
 	@python3 -m venv .env
 	@.env/bin/pip install tox
-	@.env/bin/tox -e py27,py36,py37,flake8,flake8python2 --parallel=auto ${TOX_POSARGS}
+	@.env/bin/tox -e py27,py36,py39,flake8,flake8python2 --parallel=auto ${TOX_POSARGS}
 .PHONY: tox
diff --git a/README.rst b/README.rst
index 8219fd8..e98cadd 100644
--- a/README.rst
+++ b/README.rst
@@ -5,7 +5,7 @@ This is the rpkg project, which mostly is a python library for dealing with
 rpm packaging in a git source control.  pyrpkg is the base library that sites
 can subclass to create useful tools.
 
-rpkg works with Python 2.6, 2.7, 3.6, 3.7 and 3.8.
+rpkg works with Python 2.6, 2.7, 3.6 and 3.9.
 
 License
 =======
@@ -80,7 +80,7 @@ Before make a pull request, ensure local changes pass all test cases.
 
 Before run tests, install these packages::
 
-    sudo dnf install python27 python36 python37 git make gcc rpm-build \
+    sudo dnf install python27 python36 python39 git make gcc rpm-build \
     rpm-devel libcurl-devel krb5-devel openssl-devel python3-devel
 
 To run tests simply, ``make test``.
diff --git a/jenkins_test.dockerfile b/jenkins_test.dockerfile
index 3a0dfb1..403cbde 100644
--- a/jenkins_test.dockerfile
+++ b/jenkins_test.dockerfile
@@ -8,6 +8,7 @@ LABEL \
 RUN dnf -y update && dnf -y install \
         python3-devel \
         python3-openidc-client \
+        python3-libmodulemd \
         python3-setuptools \
         rpmlint \
         rpm-build
diff --git a/setup.py b/setup.py
index b66ad6d..b74e044 100755
--- a/setup.py
+++ b/setup.py
@@ -82,9 +82,8 @@ setup(
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.9',
         'Topic :: Software Development :: Build Tools',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
diff --git a/tox.ini b/tox.ini
index f1acbba..701110f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -22,6 +22,10 @@ commands =
 setenv=
     PYCURL_SSL_LIBRARY=openssl
 
+[testenv:py39]
+# allow gi & libmodulemd for flatpak tests. System libraries are available for Python 3.9
+sitepackages=true
+
 [testenv:flake8]
 deps = flake8
 commands = python -m flake8 pyrpkg/ tests/
@@ -30,7 +34,6 @@ commands = python -m flake8 pyrpkg/ tests/
 deps = flake8
 commands = python -m flake8 pyrpkg/ tests/
 
-
 [testenv:doc]
 basepython = python3
 skip_install = True