From e76d1e14bd680882b8b3eb39116dd2d8b08185f4 Mon Sep 17 00:00:00 2001 From: Brian May Date: Sun, 9 Jul 2017 09:01:57 +1000 Subject: [PATCH] Fix error in requirements.rst --- .gitignore | 1 - MANIFEST.in | 1 - docs/{conf.orig.py => conf.py} | 0 docs/requirements.rst | 2 +- setup.py | 6 +----- 5 files changed, 2 insertions(+), 8 deletions(-) rename docs/{conf.orig.py => conf.py} (100%) diff --git a/.gitignore b/.gitignore index a8a10d0..64bc44d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ /sshuttle/version.py -/docs/conf.py /tmp/ /.cache/ /.eggs/ diff --git a/MANIFEST.in b/MANIFEST.in index 71e7068..f1488ca 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -6,7 +6,6 @@ include LICENSE include run include tox.ini exclude sshuttle/version.py -exclude docs/conf.py recursive-include docs *.bat recursive-include docs *.py recursive-include docs *.rst diff --git a/docs/conf.orig.py b/docs/conf.py similarity index 100% rename from docs/conf.orig.py rename to docs/conf.py diff --git a/docs/requirements.rst b/docs/requirements.rst index 9e9b54f..9d3b957 100644 --- a/docs/requirements.rst +++ b/docs/requirements.rst @@ -42,7 +42,7 @@ information. MacOS / FreeBSD / OpenBSD / pfSense -~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Method: pf Supports: diff --git a/setup.py b/setup.py index 52f9191..1561b77 100755 --- a/setup.py +++ b/setup.py @@ -18,18 +18,14 @@ # along with python-tldap If not, see . from setuptools import setup, find_packages -import shutil -with open("./docs/conf.orig.py", "r") as src: - with open("./docs/conf.py", "w") as dst: - dst.write("# FILE COPIED FROM conf.orig.py; DO NOT CHANGE\n") - shutil.copyfileobj(src, dst) def version_scheme(version): from setuptools_scm.version import guess_next_dev_version version = guess_next_dev_version(version) return version.lstrip("v") + setup( name="sshuttle", use_scm_version={