From 269e394dba83b77beffc519b4865b65ac1fe7779 Mon Sep 17 00:00:00 2001 From: ifrit98 Date: Sat, 30 Sep 2023 14:52:36 +0000 Subject: [PATCH 1/2] add msgpack-numpy to ci --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 34f1050f6d..d6dbbbcd88 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -88,6 +88,7 @@ jobs: python -m venv env/ . env/bin/activate python -m pip install --upgrade pip + python -m pip install git+https://github.com/opentensor/msgpack-numpy.git#egg=msgpack-numpy python -m pip install '.[dev]' - save_cache: From 8e9765430e4208c63d223b0161b5e3819b49d51d Mon Sep 17 00:00:00 2001 From: ifrit98 Date: Sat, 30 Sep 2023 15:08:12 +0000 Subject: [PATCH 2/2] revamp parsing to correct VCS link --- .circleci/config.yml | 1 - setup.py | 7 ++----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d6dbbbcd88..34f1050f6d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -88,7 +88,6 @@ jobs: python -m venv env/ . env/bin/activate python -m pip install --upgrade pip - python -m pip install git+https://github.com/opentensor/msgpack-numpy.git#egg=msgpack-numpy python -m pip install '.[dev]' - save_cache: diff --git a/setup.py b/setup.py index 6a3707d106..e3254a89dd 100644 --- a/setup.py +++ b/setup.py @@ -33,14 +33,11 @@ def read_requirements(path): with pathlib.Path(path).open() as requirements_txt: for line in requirements_txt: if line.startswith("git+"): - git_requirements.append(line.strip()) + pkg_name = re.search(r'egg=([a-zA-Z0-9_-]+)', line.strip()).group(1) + requirements.append(pkg_name + ' @ ' + line.strip()) else: requirements.append(line.strip()) - # Install git dependencies - for git_req in git_requirements: - subprocess.check_call(["python", "-m", "pip", "install", git_req]) - return requirements