Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make the pagure namespace for 'flatpaks' configurable #3052

Merged
merged 1 commit into from Mar 14, 2019

Conversation

Projects
None yet
3 participants
@owtaylor
Copy link
Contributor

owtaylor commented Mar 5, 2019

The previous change to look up Flatpaks under 'flatpaks/' rather than
'modules/' was backwards incompatible - to restore compatibility, make
this a new config setting: pagure_flatpak_namespace.

Signed-off-by: Owen W. Taylor otaylor@fishsoup.net

@owtaylor owtaylor requested a review from fedora-infra/bodhi as a code owner Mar 5, 2019

@bowlofeggs
Copy link
Member

bowlofeggs left a comment

Thanks!

if self.type.name == 'container':
namespace = self.type.name
elif self.type.name == 'flatpak':

This comment has been minimized.

Copy link
@bowlofeggs

bowlofeggs Mar 13, 2019

Member

Since this is an Enum, we can compare it directly:

Suggested change
elif self.type.name == 'flatpak':
elif self.type == ContentType.flatpak:

Since there's another one above this, I'll just file a new PR to fix this and the other one together.

@bowlofeggs bowlofeggs force-pushed the owtaylor:namespace-config-setting branch from 2a5004a to c49153a Mar 13, 2019

@bowlofeggs

This comment has been minimized.

Copy link
Member

bowlofeggs commented Mar 14, 2019

I'm applying a small patch:

diff --git a/bodhi/tests/server/test_models.py b/bodhi/tests/server/test_models.py
index 0ef20007..39d8eeaf 100644
--- a/bodhi/tests/server/test_models.py
+++ b/bodhi/tests/server/test_models.py
@@ -1081,7 +1081,7 @@ class TestFlatpakPackage(ModelTest, unittest.TestCase):
     klass = model.FlatpakPackage
     attrs = dict(name=u"flatpak-runtime")
 
-    def patch_http_session(http_session, namespace):
+    def patch_http_session(self, http_session, namespace):
         """Patch in the correct pagure API result for the particular flatpaks namespace."""
         json_output = {
             "access_groups": {
Make the pagure namespace for 'flatpaks' configurable
The previous change to look up Flatpaks under 'flatpaks/' rather than
'modules/' was backwards incompatible - to restore compatibility, make
this a new config setting: pagure_flatpak_namespace.

Signed-off-by: Owen W. Taylor <otaylor@fishsoup.net>

@bowlofeggs bowlofeggs force-pushed the owtaylor:namespace-config-setting branch from c49153a to 0e73eb5 Mar 14, 2019

@bowlofeggs

This comment has been minimized.

Copy link
Member

bowlofeggs commented Mar 14, 2019

The f30-flake8 test actually passed, but CI failed to report it to GitHub. I will manually merge this.

@bowlofeggs bowlofeggs merged commit 0e73eb5 into fedora-infra:develop Mar 14, 2019

40 of 42 checks passed

continuous-integration/jenkins/pr-head This commit cannot be built
Details
f30-flake8
Details
f28-build
Details
f28-diff-cover
Details
f28-docs
Details
f28-flake8
Details
f28-integration
Details
f28-integration-build
Details
f28-pydocstyle
Details
f28-unit
Details
f29-build
Details
f29-diff-cover
Details
f29-docs
Details
f29-flake8
Details
f29-integration
Details
f29-integration-build
Details
f29-pydocstyle
Details
f29-unit
Details
f30-build
Details
f30-diff-cover
Details
f30-docs
Details
f30-integration
Details
f30-integration-build
Details
f30-pydocstyle
Details
f30-unit
Details
pip-build
Details
pip-diff-cover
Details
pip-docs
Details
pip-flake8
Details
pip-integration
Details
pip-integration-build
Details
pip-mypy
Details
pip-pydocstyle
Details
pip-unit
Details
rawhide-build
Details
rawhide-diff-cover
Details
rawhide-docs
Details
rawhide-flake8
Details
rawhide-integration
Details
rawhide-integration-build
Details
rawhide-pydocstyle
Details
rawhide-unit
Details

@bowlofeggs bowlofeggs referenced this pull request Mar 22, 2019

Closed

Release Bodhi 3.14.0 #3084

0 of 3 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.