Skip to content

Commit 0ca1619

Browse files
committed
binary clean by pip uninstall & installation works for venv
1 parent 624fe40 commit 0ca1619

File tree

7 files changed

+15
-12
lines changed

7 files changed

+15
-12
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
pspy_placeholder/pspy-blueprint*
12
# Byte-compiled / optimized / DLL files
23
__pycache__/
34
*.py[cod]

actual_setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from setuptools import setup, find_packages
1+
from setuptools import setup
22
from pathlib import Path
33

44
version = 0.1
@@ -22,7 +22,7 @@
2222
# above option specifies what commands to install,
2323
# e.g: entry_points={"console_scripts": ["yapypy=yapypy.cmd:compiler"]}
2424
install_requires=['purescripto>=0.7.5', 'requests'], # dependencies
25-
scripts=['pspy_proxy/install_binary.py'],
25+
2626
platforms="any",
2727
classifiers=[
2828
"Programming Language :: Python :: 3.5",
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import requests
55
import zipfile
66
import stat
7-
from pspy_proxy.common import out_path
7+
from pspy_placeholder import out_path
88
from distutils.util import get_platform
99

1010
tag = re.compile('refs/tags/v(\S+)')

pspy_placeholder/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
from pathlib import Path
2+
out_path = Path(__file__).parent

pspy_proxy/common.py

Lines changed: 0 additions & 3 deletions
This file was deleted.

pspy_proxy/proxy.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from subprocess import call
2-
from pspy_proxy.common import out_path
2+
from pspy_placeholder import out_path
33
import sys
44

55

setup.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
1-
from setuptools import setup, find_packages
1+
from setuptools import setup
22
import sys
33
import os
44
from pathlib import Path
55
from subprocess import call
6-
from distutils.util import get_platform
7-
exe_suffix = 'win' in get_platform() and '.exe' or ''
86
dir = Path(__file__).parent.absolute()
97
os.chdir(str(dir))
108
call([sys.executable, 'actual_setup.py', 'install'])
11-
# call([sys.executable, 'install_binary.py'])
12-
call(['install_binary.py'])
9+
call([sys.executable, 'install_binary.py'])
1310

1411
version = 0.1
1512
readme = ''
@@ -28,6 +25,12 @@
2825
author_email='[email protected]',
2926
packages=['pspy_placeholder'],
3027
install_requires=[],
28+
package_data={
29+
'pspy_placeholder': [
30+
each.name for each in Path('pspy_placeholder').iterdir()
31+
if each.name.startswith('pspy')
32+
]
33+
},
3134
platforms="any",
3235
classifiers=[
3336
"Programming Language :: Python :: 3.5",

0 commit comments

Comments
 (0)