Skip to content

Commit

Permalink
Revert "include fix for missing provider_namespace.namespace" (#3082)
Browse files Browse the repository at this point in the history
* Revert "Initial CI implementation with github actions (#3065)"

This reverts commit 7ed4a08.

* Revert "Handle role repositories that do not have a provider_namespace.namespace (#3062)"

This reverts commit 2331fc3.

* Revert "add alisonlhart to namespace requests"

This reverts commit db793df.
  • Loading branch information
jctanner committed Jan 12, 2023
1 parent 7ed4a08 commit 37b3cf7
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 110 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/New_namespace.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Request a Namespace
about: Request a new namespace for one of your GitHub Orgs
title: 'namespace: FIXME'
labels: area/namespace
assignees: JohnLieske, thedoubl3j, alisonlhart
assignees: JohnLieske, thedoubl3j

---

Expand Down
39 changes: 0 additions & 39 deletions .github/workflows/ci_lint.yml

This file was deleted.

45 changes: 0 additions & 45 deletions .github/workflows/ci_unit.yml

This file was deleted.

1 change: 0 additions & 1 deletion .yamllint
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@ ignore: |

rules:
line-length: disable
truthy: disable
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ dev/test:
# Other option are:
# - install side packages globally or
# - call tools using python api instead of shell commands.
@$(DOCKER_COMPOSE) exec -T galaxy bash -c '\
@$(DOCKER_COMPOSE) exec galaxy bash -c '\
source $(GALAXY_VENV)/bin/activate; \
export DJANGO_SETTINGS_MODULE=galaxy.settings.testing; \
pytest galaxy \
Expand Down
32 changes: 9 additions & 23 deletions galaxy/api/serializers/roles.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,29 +108,15 @@ def get_summary_fields(self, obj):
name=obj.content_type.name,
description=obj.content_type.description)
d['dependencies'] = [str(g) for g in obj.dependencies.all()]
if obj.repository.provider_namespace.namespace is not None:
a_url = obj.repository.provider_namespace.namespace.avatar_url,
d['namespace'] = dict(
id=obj.repository.provider_namespace.namespace.pk,
name=obj.repository.provider_namespace.namespace.name,
avatar_url=a_url,
location=obj.repository.provider_namespace.namespace.location,
company=obj.repository.provider_namespace.namespace.company,
email=obj.repository.provider_namespace.namespace.email,
html_url=obj.repository.provider_namespace.namespace.html_url,
is_vendor=obj.repository.provider_namespace.namespace.is_vendor
)
else:
d['namespace'] = dict(
id=None,
name=None,
avatar_url=None,
location=None,
company=None,
email=None,
html_url=None,
is_vendor=None
)
d['namespace'] = dict(
id=obj.repository.provider_namespace.namespace.pk,
name=obj.repository.provider_namespace.namespace.name,
avatar_url=obj.repository.provider_namespace.namespace.avatar_url,
location=obj.repository.provider_namespace.namespace.location,
company=obj.repository.provider_namespace.namespace.company,
email=obj.repository.provider_namespace.namespace.email,
html_url=obj.repository.provider_namespace.namespace.html_url,
is_vendor=obj.repository.provider_namespace.namespace.is_vendor)
d['platforms'] = [
dict(name=g.name, release=g.release) for g in obj.platforms.all()]
d['provider_namespace'] = dict(
Expand Down

0 comments on commit 37b3cf7

Please sign in to comment.