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

Fix views referenced by context_urls #51

Merged
merged 3 commits into from
Sep 6, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,12 @@ language: python
sudo: false
python:
- "2.7"
- "3.3"
- "3.4"
- "3.5"
env:
- DJANGO=1.7
- DJANGO=1.8
- DJANGO=1.9
- DJANGO=1.10
- DJANGO=master
matrix:
exclude:
- python: "3.3"
env: DJANGO=1.9
- python: "3.3"
env: DJANGO=master
- python: "3.5"
env: DJANGO=1.7
install:
- pip install tox coveralls
script:
Expand Down
31 changes: 15 additions & 16 deletions pinax/teams/context_urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,22 @@

from django.conf.urls import patterns, url

from . import views

urlpatterns = patterns(
"pinax.teams.views",

urlpatterns = patterns(
# team specific
url(r"^detail/$", "team_detail", name="team_detail"),
url(r"^join/$", "team_join", name="team_join"),
url(r"^leave/$", "team_leave", name="team_leave"),
url(r"^apply/$", "team_apply", name="team_apply"),
url(r"^edit/$", "team_update", name="team_edit"),
url(r"^manage/$", "team_manage", name="team_manage"),
url(r"^ac/users-to-invite/$", "autocomplete_users", name="team_autocomplete_users"), # noqa
url(r"^invite-user/$", "team_invite", name="team_invite"),
url(r"^members/(?P<pk>\d+)/revoke-invite/$", "team_member_revoke_invite", name="team_member_revoke_invite"), # noqa
url(r"^members/(?P<pk>\d+)/resend-invite/$", "team_member_resend_invite", name="team_member_resend_invite"), # noqa
url(r"^members/(?P<pk>\d+)/promote/$", "team_member_promote", name="team_member_promote"), # noqa
url(r"^members/(?P<pk>\d+)/demote/$", "team_member_demote", name="team_member_demote"), # noqa
url(r"^members/(?P<pk>\d+)/remove/$", "team_member_remove", name="team_member_remove"), # noqa

url(r"^detail/$", views.team_detail, name="team_detail"),
url(r"^join/$", views.team_join, name="team_join"),
url(r"^leave/$", views.team_leave, name="team_leave"),
url(r"^apply/$", views.team_apply, name="team_apply"),
url(r"^edit/$", views.team_update, name="team_edit"),
url(r"^manage/$", views.TeamManageView.as_view(), name="team_manage"),
url(r"^ac/users-to-invite/$", views.autocomplete_users, name="team_autocomplete_users"), # noqa
url(r"^invite-user/$", views.TeamInviteView.as_view(), name="team_invite"),
url(r"^members/(?P<pk>\d+)/revoke-invite/$", views.team_member_revoke_invite, name="team_member_revoke_invite"), # noqa
url(r"^members/(?P<pk>\d+)/resend-invite/$", views.team_member_resend_invite, name="team_member_resend_invite"), # noqa
url(r"^members/(?P<pk>\d+)/promote/$", views.team_member_promote, name="team_member_promote"), # noqa
url(r"^members/(?P<pk>\d+)/demote/$", views.team_member_demote, name="team_member_demote"), # noqa
url(r"^members/(?P<pk>\d+)/remove/$", views.team_member_remove, name="team_member_remove"), # noqa
)
10 changes: 4 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,16 @@ exclude = migrations/*,docs/*

[tox]
envlist =
py27-{1.7,1.8,1.9,master},
py33-{1.7,1.8},
py34-{1.7,1.8,1.9,master},
py35-{1.8,1.9,master}
py27-{1.8,1.10,master},
py34-{1.8,1.10,master},
py35-{1.8,1.10,master}

[testenv]
deps =
coverage == 4.0.2
flake8 == 2.5.0
1.7: Django>=1.7,<1.8
1.8: Django>=1.8,<1.9
1.9: Django>=1.9,<1.10
1.10: Django>=1.10,<1.11
master: https://github.com/django/django/tarball/master
usedevelop = True
setenv =
Expand Down