From b06b01329eb19e362c08b6e53b2abe61abf7d727 Mon Sep 17 00:00:00 2001
From: Greg Albrecht <gba@onbeep.com>
Date: Sat, 23 Apr 2016 14:52:06 -1000
Subject: [PATCH] updated copyright and email
---
.gitignore | 33 ++++++++++++++++++++++++++-------
LICENSE | 2 +-
Makefile | 4 ++--
README.rst | 10 ++++++----
aprs/__init__.py | 4 ++--
aprs/classes.py | 4 ++--
aprs/cmd.py | 4 ++--
aprs/constants.py | 4 ++--
aprs/util.py | 4 ++--
requirements.txt | 8 ++++----
setup.cfg | 4 ++--
setup.py | 14 +++++---------
tests/constants.py | 4 ++--
tests/context.py | 4 ++--
tests/test_aprs.py | 4 ++--
tests/test_util.py | 4 ++--
16 files changed, 64 insertions(+), 47 deletions(-)
diff --git a/.gitignore b/.gitignore
index e4eea93..ffa0c21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,31 @@
-*.py[co]
-*.egg-info/
+*.deb
*.egg
-cover/
+*.egg-info/
+*.egg/
+*.ignore
+*.py[co]
+*.py[oc]
+*.spl
+*.vagrant
+.DS_Store
.coverage
-output.xml
+.eggs/
+.eggs/*
+.idea
+.idea/
+.pt
+.vagrant/
+RELEASE-VERSION.txt
+build/
+cover/
+dist/
+dump.rdb
flake8.log
+local/
+local_*
+metadata/
nosetests.xml
+output.xml
pylint.log
-.idea/
-dist/
-.eggs/
+redis-server.log
+redis-server/
diff --git a/LICENSE b/LICENSE
index 4c8225b..8e95c59 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2015 Orion Labs, Inc.
+Copyright 2016 Orion Labs, Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/Makefile b/Makefile
index 38ec6b2..ec9f060 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
# Makefile for APRS Python Module.
#
# Source:: https://github.com/ampledata/aprs
-# Author:: Greg Albrecht W2GMD <gba@orionlabs.co>
-# Copyright:: Copyright 2015 Orion Labs, Inc.
+# Author:: Greg Albrecht W2GMD <gba@orionlabs.io>
+# Copyright:: Copyright 2016 Orion Labs, Inc.
# License:: Apache License, Version 2.0
#
diff --git a/README.rst b/README.rst
index 62c49f2..46a3e8b 100644
--- a/README.rst
+++ b/README.rst
@@ -1,7 +1,8 @@
Python Module for APRS-IS
*************************
-Includes Python module with bindings for APRS as well as ``aprs_tracker`` command-line APRS location tracking utility.
+Includes Python module with bindings for APRS as well as ``aprs_tracker``
+command-line APRS location tracking utility.
Examples
@@ -62,7 +63,8 @@ Example 2 Output
Example 3: Library Usage - Send
----------------------------------
-The following example connects to APRS-IS as W2GMD (me!) and sends an APRS frame.
+The following example connects to APRS-IS as W2GMD (me!) and sends an APRS
+frame.
Example 3 Code
^^^^^^^^^^^^^^
@@ -81,11 +83,11 @@ Github: https://github.com/ampledata/aprs
Author
======
-Greg Albrecht W2GMD <gba@orionlabs.co>
+Greg Albrecht W2GMD <gba@orionlabs.io>
Copyright
=========
-Copyright 2015 Orion Labs, Inc.
+Copyright 2016 Orion Labs, Inc.
License
=======
diff --git a/aprs/__init__.py b/aprs/__init__.py
index c54b669..8862727 100644
--- a/aprs/__init__.py
+++ b/aprs/__init__.py
@@ -8,8 +8,8 @@ APRS Python Module.
~~~~
-:author: Greg Albrecht W2GMD <gba@orionlabs.co>
-:copyright: Copyright 2015 Orion Labs, Inc.
+:author: Greg Albrecht W2GMD <gba@orionlabs.io>
+:copyright: Copyright 2016 Orion Labs, Inc.
:license: Apache License, Version 2.0
:source: <https://github.com/ampledata/aprs>
diff --git a/aprs/classes.py b/aprs/classes.py
index fc7bb78..3765e79 100755
--- a/aprs/classes.py
+++ b/aprs/classes.py
@@ -3,9 +3,9 @@
"""APRS Class Definitions"""
-__author__ = 'Greg Albrecht W2GMD <gba@orionlabs.co>'
+__author__ = 'Greg Albrecht W2GMD <gba@orionlabs.io>'
__license__ = 'Apache License, Version 2.0'
-__copyright__ = 'Copyright 2015 Orion Labs, Inc.'
+__copyright__ = 'Copyright 2016 Orion Labs, Inc.'
import logging
diff --git a/aprs/cmd.py b/aprs/cmd.py
index b868d03..841ba3e 100644
--- a/aprs/cmd.py
+++ b/aprs/cmd.py
@@ -3,8 +3,8 @@
"""APRS commands."""
-__author__ = 'Greg Albrecht W2GMD <gba@orionlabs.co>'
-__copyright__ = 'Copyright 2015 Orion Labs, Inc.'
+__author__ = 'Greg Albrecht W2GMD <gba@orionlabs.io>'
+__copyright__ = 'Copyright 2016 Orion Labs, Inc.'
__license__ = 'All rights reserved. Do not redistribute.'
diff --git a/aprs/constants.py b/aprs/constants.py
index 79dd8dc..c243a7a 100644
--- a/aprs/constants.py
+++ b/aprs/constants.py
@@ -5,9 +5,9 @@
Constants for APRS Module.
"""
-__author__ = 'Greg Albrecht W2GMD <gba@orionlabs.co>'
+__author__ = 'Greg Albrecht W2GMD <gba@orionlabs.io>'
__license__ = 'Apache License, Version 2.0'
-__copyright__ = 'Copyright 2015 Orion Labs, Inc.'
+__copyright__ = 'Copyright 2016 Orion Labs, Inc.'
import logging
diff --git a/aprs/util.py b/aprs/util.py
index 2beeac5..da9284b 100755
--- a/aprs/util.py
+++ b/aprs/util.py
@@ -3,9 +3,9 @@
"""Utilities for the APRS Python Module."""
-__author__ = 'Greg Albrecht W2GMD <gba@orionlabs.co>'
+__author__ = 'Greg Albrecht W2GMD <gba@orionlabs.io>'
__license__ = 'Apache License, Version 2.0'
-__copyright__ = 'Copyright 2015 Orion Labs, Inc.'
+__copyright__ = 'Copyright 2016 Orion Labs, Inc.'
import logging
diff --git a/requirements.txt b/requirements.txt
index 1842708..198481a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,10 +1,10 @@
# Python Distribution Package Requirements for APRS.
#
# Source:: https://github.com/ampledata/aprs
-# Author:: Greg Albrecht W2GMD <gba@orionlabs.co>
-# Copyright:: Copyright 2015 Orion Labs, Inc.
+# Author:: Greg Albrecht W2GMD <gba@orionlabs.io>
+# Copyright:: Copyright 2016 Orion Labs, Inc.
# License:: Apache License, Version 2.0
-flake8==2.1.0
-pylint==1.2.1
+flake8
+pylint
diff --git a/setup.cfg b/setup.cfg
index 7711093..95f68cb 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,8 +1,8 @@
# Nosetests configuration for APRS.
#
# Source:: https://github.com/ampledata/aprs
-# Author:: Greg Albrecht W2GMD <gba@orionlabs.co>
-# Copyright:: Copyright 2015 Orion Labs, Inc.
+# Author:: Greg Albrecht W2GMD <gba@orionlabs.io>
+# Copyright:: Copyright 2016 Orion Labs, Inc.
# License:: Apache License, Version 2.0
#
diff --git a/setup.py b/setup.py
index 78c2ac7..7e7d5c8 100644
--- a/setup.py
+++ b/setup.py
@@ -10,19 +10,15 @@ Source:: https://github.com/ampledata/aprs
__title__ = 'aprs'
__version__ = '4.0.0'
-__author__ = 'Greg Albrecht W2GMD <gba@orionlabs.co>'
+__author__ = 'Greg Albrecht W2GMD <gba@orionlabs.io>'
__license__ = 'Apache License, Version 2.0'
-__copyright__ = 'Copyright 2015 Orion Labs, Inc.'
+__copyright__ = 'Copyright 2016 Orion Labs, Inc.'
import os
+import setuptools
import sys
-try:
- from setuptools import setup
-except ImportError:
- from distutils.core import setup # pylint: disable=F0401,E0611
-
def publish():
"""Function for publishing package to pypi."""
@@ -34,12 +30,12 @@ def publish():
publish()
-setup(
+setuptools.setup(
name='aprs',
version=__version__,
description='Python Bindings for APRS.',
author='Greg Albrecht',
- author_email='gba@orionlabs.co',
+ author_email='gba@orionlabs.io',
packages=['aprs'],
package_data={'': ['LICENSE']},
license=open('LICENSE').read(),
diff --git a/tests/constants.py b/tests/constants.py
index 01db6f7..c0a22b0 100644
--- a/tests/constants.py
+++ b/tests/constants.py
@@ -3,9 +3,9 @@
"""Constants for APRS Module Tests."""
-__author__ = 'Greg Albrecht W2GMD <gba@orionlabs.co>'
+__author__ = 'Greg Albrecht W2GMD <gba@orionlabs.io>'
__license__ = 'Apache License, Version 2.0'
-__copyright__ = 'Copyright 2015 Orion Labs, Inc.'
+__copyright__ = 'Copyright 2016 Orion Labs, Inc.'
TEST_FRAMES = 'tests/test_frames.log'
diff --git a/tests/context.py b/tests/context.py
index 37f3193..aa6f0ba 100644
--- a/tests/context.py
+++ b/tests/context.py
@@ -3,9 +3,9 @@
"""Context for tests for APRS Python Module."""
-__author__ = 'Greg Albrecht W2GMD <gba@orionlabs.co>'
+__author__ = 'Greg Albrecht W2GMD <gba@orionlabs.io>'
__license__ = 'Apache License, Version 2.0'
-__copyright__ = 'Copyright 2015 Orion Labs, Inc.'
+__copyright__ = 'Copyright 2016 Orion Labs, Inc.'
import os
diff --git a/tests/test_aprs.py b/tests/test_aprs.py
index be9c476..6fc3992 100644
--- a/tests/test_aprs.py
+++ b/tests/test_aprs.py
@@ -3,9 +3,9 @@
"""Tests for Python APRS-IS Bindings."""
-__author__ = 'Greg Albrecht W2GMD <gba@orionlabs.co>'
+__author__ = 'Greg Albrecht W2GMD <gba@orionlabs.io>'
__license__ = 'Apache License, Version 2.0'
-__copyright__ = 'Copyright 2015 Orion Labs, Inc.'
+__copyright__ = 'Copyright 2016 Orion Labs, Inc.'
import random
diff --git a/tests/test_util.py b/tests/test_util.py
index 04c8aff..cbe6940 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -3,9 +3,9 @@
"""Tests for Python APRS util methods."""
-__author__ = 'Greg Albrecht W2GMD <gba@orionlabs.co>'
+__author__ = 'Greg Albrecht W2GMD <gba@orionlabs.io>'
__license__ = 'Apache License, Version 2.0'
-__copyright__ = 'Copyright 2015 Orion Labs, Inc.'
+__copyright__ = 'Copyright 2016 Orion Labs, Inc.'
import unittest
--
GitLab