Skip to content

Commit 289a0ba

Browse files
committed
Work on license and README
We need to do some .gitattributes futzing to make sure Git doesn't interpret reStructuredText markup as conflict markers.
1 parent 3fa308a commit 289a0ba

File tree

7 files changed

+47
-4
lines changed

7 files changed

+47
-4
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.rst conflict-marker-size=120

LICENSE

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Copyright 2014 Peter Williams and collaborators
2+
3+
Permission is hereby granted, free of charge, to any person obtaining a copy
4+
of this software and associated documentation files (the "Software"), to deal
5+
in the Software without restriction, including without limitation the rights
6+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7+
copies of the Software, and to permit persons to whom the Software is
8+
furnished to do so, subject to the following conditions:
9+
10+
The above copyright notice and this permission notice shall be included in all
11+
copies or substantial portions of the Software.
12+
13+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
19+
SOFTWARE.

Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2014 Peter Williams <[email protected]>
1+
# Copyright 2014 Peter Williams <[email protected]> and collaborators.
22
# Licensed under the MIT License.
33

44
install_args = @install_args@

README.rst

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
*****************************************************
2+
pwkit: miscellaneous Python for science and astronomy
3+
*****************************************************
4+
5+
This is a collection of Peter Williams’ miscellaneous Python tools. I’m
6+
packaging them so that other people can install them off of PyPI and run my
7+
code without having to go to too much work. That’s the hope, at least.
8+
9+
=======
10+
Authors
11+
=======
12+
13+
Peter K. G. Williams and collaborators. Despite this package being named after
14+
me, contributions are welcome and will be given full credit. I just don’t want
15+
to have to make up a decent name for this package right now.
16+
17+
=======
18+
License
19+
=======
20+
21+
The `MIT license`_. See the file LICENSE.
22+
23+
.. _MIT license: http://opensource.org/licenses/MIT

devconfig.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#! /bin/sh
2-
# Copyright 2014 Peter Williams <[email protected]>
2+
# Copyright 2014 Peter Williams <[email protected]> and collaborators.
33
# Licensed under the MIT License.
44
#
55
# I'm kind of annoyed by the setuptools, so I have a quick system to smooth

pwkit/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- mode: python; coding: utf-8 -*-
2-
# Copyright 2014 Peter Williams <[email protected]>
2+
# Copyright 2014 Peter Williams <[email protected]> and collaborators.
33
# Licensed under the MIT License.
44

55
"""

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#! /usr/bin/env python
2-
# Copyright 2014 Peter Williams <[email protected]>
2+
# Copyright 2014 Peter Williams <[email protected]> and collaborators.
33
# Licensed under the MIT License.
44

55
# I don't use the ez_setup module because it causes us to automatically build

0 commit comments

Comments
 (0)