From 9fd3808f689cd69a6bb03485a39cacb8c1e55a7c Mon Sep 17 00:00:00 2001
From: Vanessasaurus <814322+vsoch@users.noreply.github.com>
Date: Sat, 28 May 2022 23:12:55 -0600
Subject: [PATCH] adding from_file to package_base for single serving usage
 (#39)

* adding from_file to package_base for single serving usage
also removing deprecated argument from pypi parser and setting default
to not use user site

Signed-off-by: vsoch <vsoch@users.noreply.github.com>
---
 CHANGELOG.md                          |  1 +
 citelang/main/packages/base.py        | 15 ++++++++++++++-
 citelang/main/packages/pip_wrapper.py |  3 +--
 citelang/version.py                   |  2 +-
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c41673..67d1dfb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ and **Merged pull requests**. Critical items to know are:
 The versions coincide with releases on pip. Only major versions will be released as tags on GitHub.
 
 ## [0.0.x](https://github.com/vsoch/citelang/tree/main) (0.0.x)
+ - removing deprecated pypi argument and adding from_file to package base (0.0.31)
  - contrib does not count commits from other REFs, now uses git log without `--all` (0.0.30)
  - Default contrib does a deep search, with option to add `--shallow` (0.0.29)
  - Adding basic support for parsing CMakeLists.txt (0.0.28)
diff --git a/citelang/main/packages/base.py b/citelang/main/packages/base.py
index c56e227..8de5796 100644
--- a/citelang/main/packages/base.py
+++ b/citelang/main/packages/base.py
@@ -4,13 +4,15 @@
 
 # Custom package managers not in libraries IO
 
-import sys
 from citelang.logger import logger
 import citelang.main.cache as cache
 import citelang.main.endpoints as endpoints
 import citelang.utils as utils
 import requests
 
+import os
+import sys
+
 
 class PackageManager:
     """
@@ -161,6 +163,17 @@ def package(self, name, **kwargs):
         """
         return self.data.get("package")
 
+    def from_file(self, filename, **kwargs):
+        """
+        From file reads in the filename and presents to parse.
+
+        This is a means for a specific package manager to be used directly.
+        We trust the user to provide the correct content file to parse.
+        """
+        self.filename = os.path.abspath(filename)
+        content = utils.read_file(filename)
+        return self.parse(content, **kwargs)
+
     def parse(self, content, **kwargs):
         """
         Parse the self.content
diff --git a/citelang/main/packages/pip_wrapper.py b/citelang/main/packages/pip_wrapper.py
index aeb97e4..0be33ec 100644
--- a/citelang/main/packages/pip_wrapper.py
+++ b/citelang/main/packages/pip_wrapper.py
@@ -68,14 +68,13 @@ def run(self, options, args):
                 session=session,
                 finder=finder,
                 use_user_site=options.use_user_site,
-                verbosity=self.verbosity,
             )
             resolver = self.make_resolver(
                 preparer=preparer,
                 finder=finder,
                 options=options,
                 wheel_cache=wheel_cache,
-                use_user_site=options.use_user_site,
+                use_user_site=False,
                 ignore_installed=options.ignore_installed,
                 ignore_requires_python=options.ignore_requires_python,
                 force_reinstall=options.force_reinstall,
diff --git a/citelang/version.py b/citelang/version.py
index ba87444..b221d21 100644
--- a/citelang/version.py
+++ b/citelang/version.py
@@ -2,7 +2,7 @@
 __copyright__ = "Copyright 2022, Vanessa Sochat"
 __license__ = "MPL 2.0"
 
-__version__ = "0.0.30"
+__version__ = "0.0.31"
 AUTHOR = "Vanessa Sochat"
 EMAIL = "vsoch@users.noreply.github.com"
 NAME = "citelang"