From ea3f247a28c71c22826a55fad55dae5fe186323a Mon Sep 17 00:00:00 2001 From: Oleksii Shevchuk Date: Thu, 4 Jan 2018 21:31:30 +0200 Subject: [PATCH] Add KCP as subrepo --- .gitmodules | 3 +++ client/additional_imports.py | 1 + client/requirements.txt | 1 - pupy/external/pykcp | 1 + pupy/requirements.txt | 1 - 5 files changed, 5 insertions(+), 2 deletions(-) create mode 160000 pupy/external/pykcp diff --git a/.gitmodules b/.gitmodules index c3df9125..871b79a2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -33,3 +33,6 @@ [submodule "pupy/external/Inveigh"] path = pupy/external/Inveigh url = https://github.com/Kevin-Robertson/Inveigh.git +[submodule "pupy/external/pykcp"] + path = pupy/external/pykcp + url = https://github.com/alxchk/pykcp diff --git a/client/additional_imports.py b/client/additional_imports.py index d5d02570..1f84a88a 100644 --- a/client/additional_imports.py +++ b/client/additional_imports.py @@ -39,6 +39,7 @@ import getpass import __future__ import netaddr import psutil +import kcp if 'win' in sys.platform: import ctypes.wintypes else: diff --git a/client/requirements.txt b/client/requirements.txt index f4d0e848..a584a7ac 100644 --- a/client/requirements.txt +++ b/client/requirements.txt @@ -4,4 +4,3 @@ psutil rsa netaddr tinyec -git+https://github.com/alxchk/pykcp diff --git a/pupy/external/pykcp b/pupy/external/pykcp new file mode 160000 index 00000000..a2f917e1 --- /dev/null +++ b/pupy/external/pykcp @@ -0,0 +1 @@ +Subproject commit a2f917e1bc100f6a5891966d3bbf057c1853a2a9 diff --git a/pupy/requirements.txt b/pupy/requirements.txt index b8199fd8..c5579fcb 100644 --- a/pupy/requirements.txt +++ b/pupy/requirements.txt @@ -23,4 +23,3 @@ logutils secretstorage pygments requests -git+https://github.com/alxchk/pykcp