summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--MANIFEST.in1
-rw-r--r--docs/conf.py (renamed from docs/conf.orig.py)0
-rw-r--r--docs/requirements.rst2
-rwxr-xr-xsetup.py6
5 files changed, 2 insertions, 8 deletions
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
index 5115570..5115570 100644
--- a/docs/conf.orig.py
+++ b/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 <http://www.gnu.org/licenses/>.
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={