Skip to content

Commit

Permalink
Merge pull request #6 from coolbho3k/pypi_submit
Browse files Browse the repository at this point in the history
Pypi submit
  • Loading branch information
coolbho3k authored Aug 23, 2017
2 parents fb6cf9b + 71d1db2 commit b21554a
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 1 deletion.
10 changes: 10 additions & 0 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
manuf.py: Parser library for Wireshark's OUI database.
Copyright (c) 2017 Michael Huang

This library is free software. It is dual licensed under the terms of the GNU Lesser General
Public License version 3.0 (or any later version) and the Apache License version 2.0.

For more information, see:

<http://www.gnu.org/licenses/>
<http://www.apache.org/licenses/>
2 changes: 1 addition & 1 deletion manuf/manuf.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python

# manuf.py: Parser library for Wireshark's OUI database.
# Copyright (c) 2016 Michael Huang
# Copyright (c) 2017 Michael Huang
#
# This library is free software. It is dual licensed under the terms of the GNU Lesser General
# Public License version 3.0 (or any later version) and the Apache License version 2.0.
Expand Down
3 changes: 3 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[metadata]
description-file = README.md

13 changes: 13 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
from setuptools import setup

setup(
name = 'manuf',
packages = ['manuf'],
version = '1.0.0',
description = 'Parser library for Wireshark\'s OUI database',
author = 'Michael Huang',
url = 'https://github.com/coolbho3k/manuf/',
license = 'Apache License 2.0 or GPLv3',
keywords = ['manuf', 'mac address', 'networking'],
)

0 comments on commit b21554a

Please sign in to comment.