Merge pull request #1781 from gpotter2/fixsetup

Fix PyPi dist

Author: guedou

.travis.yml

@@ -6,7 +6,7 @@ matrix:
         - os: linux
           python: 2.7
           env:
-            - TOXENV=flake8,docs,spell
+            - TOXENV=flake8,twine,docs,spell
 
         # Run as a regular user
         - os: linux

MANIFEST.in

@@ -1,6 +1,4 @@
 include MANIFEST.in
 include run_scapy
 recursive-include bin *
-recursive-include doc *
-recursive-include test *
 include scapy/VERSION

README.md

@@ -1,13 +1,15 @@
 <p align="center">
-  <img src="doc/scapy_logo.png" width=200>
+<img src="doc/scapy_logo.png" width=200>
 </p>
 
+<!-- start_ppi_description -->
+
 # Scapy
 
 [![Travis Build Status](https://travis-ci.org/secdev/scapy.svg?branch=master)](https://travis-ci.org/secdev/scapy)
 [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/secdev/scapy?svg=true)](https://ci.appveyor.com/project/secdev/scapy)
 [![Codecov Status](https://codecov.io/gh/secdev/scapy/branch/master/graph/badge.svg)](https://codecov.io/gh/secdev/scapy)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/30ee6772bb264a689a2604f5cdb0437b)](https://www.codacy.com/app/secdev/scapy?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=secdev/scapy&amp;utm_campaign=Badge_Grade)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/30ee6772bb264a689a2604f5cdb0437b)](https://www.codacy.com/app/secdev/scapy?utm_source=github.com&utm_medium=referral&utm_content=secdev/scapy&utm_campaign=Badge_Grade)
 [![PyPI Version](https://img.shields.io/pypi/v/scapy.svg)](https://pypi.python.org/pypi/scapy/)
 [![Python Versions](https://img.shields.io/pypi/pyversions/scapy.svg)](https://pypi.python.org/pypi/scapy/)
 [![License: GPL v2](https://img.shields.io/badge/License-GPL%20v2-blue.svg)](LICENSE)
@@ -57,13 +59,12 @@ Received 2 packets, got 1 answers, remaining 0 packets
 ### Python module
 
 It is straightforward to use Scapy as a regular Python module, for example to
-check if a TCP port is opened. First, save the following code in a file names
-`send_tcp_syn.py`
+check if a TCP port is opened.
+First, save the following code in a file names e.g. `send_tcp_syn.py`
 
 ```python
 from scapy.all import *
 conf.verb = 0
-
 p = IP(dst="github.com")/TCP()
 r = sr1(p)
 print(r.summary())
@@ -110,7 +111,7 @@ Python modules, such as `matplotlib` or `cryptography`. See the
 [documentation](http://scapy.readthedocs.io/en/latest/installation.html) and
 follow the instructions to install them.
 
-<!--- stop_ppi_description -->
+<!-- stop_ppi_description -->
 
 ## Contributing
 

setup.py

@@ -6,9 +6,10 @@
 
 
 from distutils import archive_util
-from distutils import sysconfig
-from distutils.core import setup
-from distutils.command.sdist import sdist
+try:
+    from setuptools import setup
+except ImportError:
+    from distutils.core import setup
 import io
 import os
 
@@ -41,13 +42,18 @@ def make_ezipfile(base_name, base_dir, verbose=0, dry_run=0, **kwargs):
 archive_util.ARCHIVE_FORMATS["ezip"] = (
     make_ezipfile, [], 'Executable ZIP file')
 
+
 def get_long_description():
     try:
         with io.open(os.path.join(os.path.dirname(__file__), "README.md"), encoding="utf-8") as f:
-            return f.read().partition("<!--- stop_ppi_description -->")[0]
+            readme = f.read()
+            desc = readme.partition("<!-- start_ppi_description -->")[2]
+            desc = desc.partition("<!-- stop_ppi_description -->")[0]
+            return desc.strip()
     except IOError:
         return None
 
+
 SCRIPTS = ['bin/scapy', 'bin/UTscapy']
 # On Windows we also need additional batch files to run the above scripts
 if os.name == "nt":

tox.ini

@@ -97,6 +97,15 @@ deps = codespell
 # inet6, dhcp6 and the ipynb files contains french: ignore them
 commands = codespell --ignore-words=.travis/codespell_ignore.txt --skip="*.pyc,*.png,*.raw,*.pdf,*.pcap,*.js,*.html,*.der,*_build*,*inet6.py,*dhcp6.py,*.ipynb" scapy/ doc/ test/ .github/
 
+[testenv:twine]
+description = "Check Scapy code distribution"
+skip_install = true
+deps = twine
+       setuptools>=38.6.0
+       cmarkgfm
+commands = python setup.py sdist
+           twine check dist/*
+
 [testenv:flake8]
 description = "Check Scapy code style & quality"
 skip_install = true