Merge pull request #22 from haasad/replace-eidl7zip-with-py7zr

Replace eidl7zip with py7zr

.github/environment-build.yaml

@@ -2,7 +2,6 @@ name: build
 channels:
   - conda-forge
   - cmutel
-  - haasad
 dependencies:
   - conda-build
   - anaconda-client

.github/environment-test.yaml

@@ -2,10 +2,9 @@ name: test
 channels:
   - conda-forge
   - cmutel
-  - haasad
 dependencies:
   - brightway2
   - requests
   - beautifulsoup4
-  - eidl7zip
+  - py7zr
   - flake8

conda-recipe/meta.yaml

@@ -1,5 +1,5 @@
 {% set name = "eidl" %}
-{% set version = "1.3.3" %}
+{% set version = "1.4.0" %}
 
 package:
   name: {{ name|lower }}
@@ -25,7 +25,7 @@ requirements:
     - brightway2
     - requests
     - beautifulsoup4
-    - eidl7zip
+    - py7zr
     - appdirs
 
 test:

eidl/core.py

@@ -154,7 +154,7 @@ def download(self):
             out_file.write(file_content)
 
     def extract(self, target_dir):
-        extract_cmd = ['7za', 'x', self.out_path, '-o{}'.format(target_dir)]
+        extract_cmd = ['py7zr', 'x', self.out_path, target_dir]
         try:
             self.extraction_process = subprocess.Popen(extract_cmd)
             self.extraction_process.wait()

setup.py

@@ -3,7 +3,7 @@
 setup(
     name='eidl',
     packages=['eidl'],
-    version='1.3.3',
+    version='1.4.0',
     author="Adrian Haas",
     url="https://github.com/haasad/EcoInventDownLoader",
     license=open('LICENSE').read(),