This repository has been archived by the owner. It is now read-only.

Issue #55: added ML2 license preamble to all .py files #59

Closed
wants to merge 1 commit into
from

Conversation

Projects
None yet
6 participants
@bmacri
Contributor

bmacri commented Jul 17, 2012

No description provided.

@rhelmer

This comment has been minimized.

Show comment
Hide comment
@rhelmer

rhelmer Jul 17, 2012

Member

All files are covered, but #!/usr/bin/env python (if present) needs to be at the top, so the shell knows what interpreter to run (it defaults to /bin/sh):

./manage.py runserver
./manage.py: line 6: import: command not found
./manage.py: line 7: import: command not found
./manage.py: line 10: syntax error near unexpected token `'DJANGO_SETTINGS_MODULE','
./manage.py: line 10: `os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'crashstats.settings')'
Member

rhelmer commented Jul 17, 2012

All files are covered, but #!/usr/bin/env python (if present) needs to be at the top, so the shell knows what interpreter to run (it defaults to /bin/sh):

./manage.py runserver
./manage.py: line 6: import: command not found
./manage.py: line 7: import: command not found
./manage.py: line 10: syntax error near unexpected token `'DJANGO_SETTINGS_MODULE','
./manage.py: line 10: `os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'crashstats.settings')'
@twobraids

This comment has been minimized.

Show comment
Hide comment
@twobraids

twobraids Jul 17, 2012

Member

I looks to me like this change overreaches. there are files in .../vendor-local that we don't own and shouldn't brand with our license statement.

example: .../vendor-local/lib/python/rsa/varblock.py

Member

twobraids commented Jul 17, 2012

I looks to me like this change overreaches. there are files in .../vendor-local that we don't own and shouldn't brand with our license statement.

example: .../vendor-local/lib/python/rsa/varblock.py

@brandonsavage

This comment has been minimized.

Show comment
Hide comment
@brandonsavage

brandonsavage Jul 17, 2012

Contributor

We had the same issue with Gerv's patch, because some files and libraries aren't MPL'ed. We should make sure we ONLY MPL anything in the apps directory, I believe, especially since Funfactory is under a different license.

Contributor

brandonsavage commented Jul 17, 2012

We had the same issue with Gerv's patch, because some files and libraries aren't MPL'ed. We should make sure we ONLY MPL anything in the apps directory, I believe, especially since Funfactory is under a different license.

@rhelmer

This comment has been minimized.

Show comment
Hide comment
@rhelmer

rhelmer Jul 17, 2012

Member

I wonder if we can just go BSD for the django crashstats project (leaving socorro MPL and in a separate repo)?

Maybe @lauraxt has ideas here.

Member

rhelmer commented Jul 17, 2012

I wonder if we can just go BSD for the django crashstats project (leaving socorro MPL and in a separate repo)?

Maybe @lauraxt has ideas here.

@rhelmer

This comment has been minimized.

Show comment
Hide comment
@rhelmer

rhelmer Jul 17, 2012

Member

OK sorry for the delay here, we're going to have to contact the Mozilla legal team for advice on this. All the python code is new so perhaps this can be BSD (I don't know), and we can just do headers in the JS?

Will get back to this soon :)

Member

rhelmer commented Jul 17, 2012

OK sorry for the delay here, we're going to have to contact the Mozilla legal team for advice on this. All the python code is new so perhaps this can be BSD (I don't know), and we can just do headers in the JS?

Will get back to this soon :)

@peterbe

This comment has been minimized.

Show comment
Hide comment
@peterbe

peterbe Jul 23, 2012

Contributor

r-

To summorize:

  • don't change any of the files in vendor or vendor-local
  • don't insert it into empty files (like 0 byte __init__.py files)
  • likes like #!/usr/bin/env and coding: utf-8 need to appear before the preamble

Also, because it's such a massive change, make sure this is up-to-date with the latest master to avoid unnecessary trouble with the merge later.

Contributor

peterbe commented Jul 23, 2012

r-

To summorize:

  • don't change any of the files in vendor or vendor-local
  • don't insert it into empty files (like 0 byte __init__.py files)
  • likes like #!/usr/bin/env and coding: utf-8 need to appear before the preamble

Also, because it's such a massive change, make sure this is up-to-date with the latest master to avoid unnecessary trouble with the merge later.

@bmacri

This comment has been minimized.

Show comment
Hide comment
@bmacri

bmacri Jul 24, 2012

Contributor

Working on this now

Contributor

bmacri commented Jul 24, 2012

Working on this now

@lonnen

This comment has been minimized.

Show comment
Hide comment
@lonnen

lonnen Aug 16, 2012

Member

+1 to BSD instead of MPL.

prior art:
https://groups.google.com/forum/?fromgroups#!msg/mozilla.legal/vSr8Gat9LAY/0mAHQyFiQ78J[1-25]
https://bugzilla.mozilla.org/show_bug.cgi?id=539671

Zamboni (including Marketplace), Playdoh, Kitsune, are BSD.

Member

lonnen commented Aug 16, 2012

+1 to BSD instead of MPL.

prior art:
https://groups.google.com/forum/?fromgroups#!msg/mozilla.legal/vSr8Gat9LAY/0mAHQyFiQ78J[1-25]
https://bugzilla.mozilla.org/show_bug.cgi?id=539671

Zamboni (including Marketplace), Playdoh, Kitsune, are BSD.

@peterbe

This comment has been minimized.

Show comment
Hide comment
@peterbe

peterbe Oct 4, 2012

Contributor

CLosed in favor of #121

Contributor

peterbe commented Oct 4, 2012

CLosed in favor of #121

@peterbe peterbe closed this Oct 4, 2012

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.