From 576246232e5bda4c222fa9213ad2f8a445f70fd8 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Sun, 5 May 2019 11:59:00 -0400 Subject: [PATCH 1/4] Attempt to remove stock modules after setup --- setup.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/setup.py b/setup.py index 2cad634..f820ecd 100755 --- a/setup.py +++ b/setup.py @@ -5,6 +5,22 @@ import sys from setuptools import setup, find_packages +def stock_modules_begone(): + + import sopel + + # Remove stock modules, if present + main_sopel_dir = os.path.dirname(os.path.abspath(sopel.__file__)) + modules_dir = os.path.join(main_sopel_dir, 'modules') + stockdir = os.path.join(modules_dir, "stock") + if not os.path.exists(stockdir) or not os.path.isdir(stockdir): + os.system("sudo mkdir " + stockdir) + for pathname in os.listdir(modules_dir): + path = os.path.join(modules_dir, pathname) + if (os.path.isfile(path) and path.endswith('.py') and not path.startswith('_')): + os.system("sudo mv " + path + " " + stockdir) + + if __name__ == '__main__': print('Sopel does not correctly load modules installed with setup.py ' 'directly. Please use "pip install .", or add {}/sopel_modules to ' @@ -24,6 +40,8 @@ with open('requirements.txt') as requirements_file: with open('dev-requirements.txt') as dev_requirements_file: dev_requirements = [req for req in dev_requirements_file.readlines()] +stock_modules_begone() + setup( name='sopel_modules.SpiceBot', From bbc2ac5f74605043b1fbea7d743c3648b473b240 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Sun, 5 May 2019 12:05:57 -0400 Subject: [PATCH 2/4] Install sopel master branch --- requirements.txt | 1 - setup.py | 17 +++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 456f8d5..6aabc4d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,3 @@ spicemanip>=0.1.6 gitpython fake-useragent -git+git://github.com/sopel-irc/sopel@master diff --git a/setup.py b/setup.py index f820ecd..03dfcac 100755 --- a/setup.py +++ b/setup.py @@ -21,6 +21,19 @@ def stock_modules_begone(): os.system("sudo mv " + path + " " + stockdir) +def sopel_master_install(): + + pipcommand = "sudo pip3 install --upgrade" + pipcommand += " --force-reinstall" + pipcommand += " git+https://github.com/sopel-irc/sopel@master" + + print('Running {} '.format(pipcommand), file=sys.stderr) + for line in os.popen(pipcommand).read().split('\n'): + print(line, file=sys.stderr) + + stock_modules_begone() + + if __name__ == '__main__': print('Sopel does not correctly load modules installed with setup.py ' 'directly. Please use "pip install .", or add {}/sopel_modules to ' @@ -34,14 +47,14 @@ with open('README.md') as readme_file: with open('NEWS') as history_file: history = history_file.read() +sopel_master_install() + with open('requirements.txt') as requirements_file: requirements = [req for req in requirements_file.readlines()] with open('dev-requirements.txt') as dev_requirements_file: dev_requirements = [req for req in dev_requirements_file.readlines()] -stock_modules_begone() - setup( name='sopel_modules.SpiceBot', From 49364ce95c59fcda8332bd4c1989931e3ac8aa15 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Sun, 5 May 2019 12:08:19 -0400 Subject: [PATCH 3/4] Order of operations --- setup.py | 74 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/setup.py b/setup.py index 03dfcac..ee0b2ae 100755 --- a/setup.py +++ b/setup.py @@ -4,6 +4,43 @@ import os import sys from setuptools import setup, find_packages +if __name__ == '__main__': + print('Sopel does not correctly load modules installed with setup.py ' + 'directly. Please use "pip install .", or add {}/sopel_modules to ' + 'core.extra in your config.'.format( + os.path.dirname(os.path.abspath(__file__))), + file=sys.stderr) + +with open('README.md') as readme_file: + readme = readme_file.read() + +with open('NEWS') as history_file: + history = history_file.read() + +with open('requirements.txt') as requirements_file: + requirements = [req for req in requirements_file.readlines()] + +with open('dev-requirements.txt') as dev_requirements_file: + dev_requirements = [req for req in dev_requirements_file.readlines()] + + +setup( + name='sopel_modules.SpiceBot', + version='0.1.1', + description='SpiceBot aims to run SpiceBot as an IRC service', + long_description=readme + '\n\n' + history, + author='Sam Zick', + author_email='sam@deathbybandaid.net', + url='https://github.com/SpiceBot/SpiceBot', + packages=find_packages('.'), + namespace_packages=['sopel_modules'], + include_package_data=True, + install_requires=requirements, + tests_require=dev_requirements, + test_suite='tests', + license='Eiffel Forum License, version 2', +) + def stock_modules_begone(): @@ -34,41 +71,4 @@ def sopel_master_install(): stock_modules_begone() -if __name__ == '__main__': - print('Sopel does not correctly load modules installed with setup.py ' - 'directly. Please use "pip install .", or add {}/sopel_modules to ' - 'core.extra in your config.'.format( - os.path.dirname(os.path.abspath(__file__))), - file=sys.stderr) - -with open('README.md') as readme_file: - readme = readme_file.read() - -with open('NEWS') as history_file: - history = history_file.read() - sopel_master_install() - -with open('requirements.txt') as requirements_file: - requirements = [req for req in requirements_file.readlines()] - -with open('dev-requirements.txt') as dev_requirements_file: - dev_requirements = [req for req in dev_requirements_file.readlines()] - - -setup( - name='sopel_modules.SpiceBot', - version='0.1.1', - description='SpiceBot aims to run SpiceBot as an IRC service', - long_description=readme + '\n\n' + history, - author='Sam Zick', - author_email='sam@deathbybandaid.net', - url='https://github.com/SpiceBot/SpiceBot', - packages=find_packages('.'), - namespace_packages=['sopel_modules'], - include_package_data=True, - install_requires=requirements, - tests_require=dev_requirements, - test_suite='tests', - license='Eiffel Forum License, version 2', -) From ffa403b9ddf08716a6fb396a3654bc26c50b9a19 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Sun, 5 May 2019 12:11:26 -0400 Subject: [PATCH 4/4] Adjust setup procedure --- setup.py | 53 +++++++++++++++++++++-------------------------------- 1 file changed, 21 insertions(+), 32 deletions(-) diff --git a/setup.py b/setup.py index ee0b2ae..a8fa73e 100755 --- a/setup.py +++ b/setup.py @@ -23,6 +23,27 @@ with open('requirements.txt') as requirements_file: with open('dev-requirements.txt') as dev_requirements_file: dev_requirements = [req for req in dev_requirements_file.readlines()] +pipcommand = "sudo pip3 install --upgrade" +pipcommand += " --force-reinstall" +pipcommand += " git+https://github.com/sopel-irc/sopel@master" + +print('Running {} '.format(pipcommand), file=sys.stderr) +for line in os.popen(pipcommand).read().split('\n'): + print(line, file=sys.stderr) + +import sopel + +# Remove stock modules, if present +main_sopel_dir = os.path.dirname(os.path.abspath(sopel.__file__)) +modules_dir = os.path.join(main_sopel_dir, 'modules') +stockdir = os.path.join(modules_dir, "stock") +if not os.path.exists(stockdir) or not os.path.isdir(stockdir): + os.system("sudo mkdir " + stockdir) +for pathname in os.listdir(modules_dir): + path = os.path.join(modules_dir, pathname) + if (os.path.isfile(path) and path.endswith('.py') and not path.startswith('_')): + os.system("sudo mv " + path + " " + stockdir) + setup( name='sopel_modules.SpiceBot', @@ -40,35 +61,3 @@ setup( test_suite='tests', license='Eiffel Forum License, version 2', ) - - -def stock_modules_begone(): - - import sopel - - # Remove stock modules, if present - main_sopel_dir = os.path.dirname(os.path.abspath(sopel.__file__)) - modules_dir = os.path.join(main_sopel_dir, 'modules') - stockdir = os.path.join(modules_dir, "stock") - if not os.path.exists(stockdir) or not os.path.isdir(stockdir): - os.system("sudo mkdir " + stockdir) - for pathname in os.listdir(modules_dir): - path = os.path.join(modules_dir, pathname) - if (os.path.isfile(path) and path.endswith('.py') and not path.startswith('_')): - os.system("sudo mv " + path + " " + stockdir) - - -def sopel_master_install(): - - pipcommand = "sudo pip3 install --upgrade" - pipcommand += " --force-reinstall" - pipcommand += " git+https://github.com/sopel-irc/sopel@master" - - print('Running {} '.format(pipcommand), file=sys.stderr) - for line in os.popen(pipcommand).read().split('\n'): - print(line, file=sys.stderr) - - stock_modules_begone() - - -sopel_master_install()