Potentially fix auto deploy issues (#1357)

This commit is contained in:
Will 2018-02-28 07:08:47 -05:00 committed by Kowlin
parent 29d9bbad32
commit cf48a13fc7
2 changed files with 7 additions and 6 deletions

View File

@ -8,11 +8,9 @@ python:
- 3.5.3 - 3.5.3
- 3.6.1 - 3.6.1
install: install:
- echo "pytest>3" >> requirements.txt
- echo "pytest-asyncio" >> requirements.txt
- echo "git+https://github.com/Rapptz/discord.py.git@rewrite#egg=discord.py[voice]" >> requirements.txt - echo "git+https://github.com/Rapptz/discord.py.git@rewrite#egg=discord.py[voice]" >> requirements.txt
- pip install -r requirements.txt - pip install -r requirements.txt
- pip install . - pip install .[test]
script: script:
- python -m compileall ./redbot/cogs - python -m compileall ./redbot/cogs
- python -m pytest - python -m pytest

View File

@ -23,9 +23,12 @@ def get_package_list():
def get_requirements(): def get_requirements():
with open('requirements.txt') as f: with open('requirements.txt') as f:
requirements = f.read().splitlines() requirements = f.read().splitlines()
if IS_TRAVIS and not IS_DEPLOYING: try:
requirements.remove('git+https://github.com/Rapptz/discord.py.git@rewrite#egg=discord.py[voice]') requirements.remove('git+https://github.com/Rapptz/discord.py.git@rewrite#egg=discord.py[voice]')
else: except IndexError:
pass
if IS_DEPLOYING or not IS_TRAVIS:
requirements.append('discord.py>=1.0.0a0') # Because RTD requirements.append('discord.py>=1.0.0a0') # Because RTD
if sys.platform.startswith("linux"): if sys.platform.startswith("linux"):
requirements.append("distro") requirements.append("distro")
@ -122,7 +125,7 @@ setup(
dependency_links=dep_links, dependency_links=dep_links,
extras_require={ extras_require={
'test': [ 'test': [
'pytest>=3', 'pytest-asyncio' 'pytest>3', 'pytest-asyncio'
], ],
'mongo': ['motor'], 'mongo': ['motor'],
'docs': ['sphinx', 'sphinxcontrib-asyncio', 'sphinx_rtd_theme'], 'docs': ['sphinx', 'sphinxcontrib-asyncio', 'sphinx_rtd_theme'],