mirror of
https://github.com/Cog-Creators/Red-DiscordBot.git
synced 2025-11-06 11:18:54 -05:00
[V3 Dependencies] Fix travis/gh 429s (#1109)
* Fix travis/gh 429s * JK this fixes it * Keep pip updated * Ok lets just use pip * ONE...MORE...
This commit is contained in:
parent
e983e1cefb
commit
02d3aec33e
@ -4,7 +4,11 @@ python:
|
|||||||
- "3.5.3"
|
- "3.5.3"
|
||||||
- "3.6.1"
|
- "3.6.1"
|
||||||
install:
|
install:
|
||||||
- pip install --process-dependency-links -e .[test]
|
- 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
|
||||||
|
- pip install -r requirements.txt
|
||||||
|
- pip install -e .
|
||||||
script:
|
script:
|
||||||
- python -m compileall ./redbot/cogs
|
- python -m compileall ./redbot/cogs
|
||||||
- python -m pytest
|
- python -m pytest
|
||||||
|
|||||||
22
setup.py
22
setup.py
@ -2,8 +2,16 @@ from distutils.core import setup
|
|||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from subprocess import run, PIPE
|
from subprocess import run, PIPE
|
||||||
|
|
||||||
|
import os
|
||||||
|
|
||||||
from setuptools import find_packages
|
from setuptools import find_packages
|
||||||
|
|
||||||
|
IS_TRAVIS = 'TRAVIS' in os.environ
|
||||||
|
|
||||||
|
dep_links = ['https://github.com/Rapptz/discord.py/tarball/rewrite#egg=discord.py-1.0']
|
||||||
|
if IS_TRAVIS:
|
||||||
|
dep_links = []
|
||||||
|
|
||||||
|
|
||||||
def get_package_list():
|
def get_package_list():
|
||||||
core = find_packages(include=['redbot', 'redbot.*'])
|
core = find_packages(include=['redbot', 'redbot.*'])
|
||||||
@ -13,7 +21,10 @@ 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()
|
||||||
requirements.append('discord.py>=1.0.0a0') # Because RTD
|
if IS_TRAVIS:
|
||||||
|
requirements.remove('git+https://github.com/Rapptz/discord.py.git@rewrite#egg=discord.py[voice]')
|
||||||
|
else:
|
||||||
|
requirements.append('discord.py>=1.0.0a0') # Because RTD
|
||||||
return requirements
|
return requirements
|
||||||
|
|
||||||
|
|
||||||
@ -72,6 +83,7 @@ def find_locale_folders():
|
|||||||
|
|
||||||
return ret
|
return ret
|
||||||
|
|
||||||
|
|
||||||
setup(
|
setup(
|
||||||
name='Red-DiscordBot',
|
name='Red-DiscordBot',
|
||||||
version="{}.{}.{}b2".format(*get_version()),
|
version="{}.{}.{}b2".format(*get_version()),
|
||||||
@ -101,11 +113,11 @@ setup(
|
|||||||
python_requires='>=3.5',
|
python_requires='>=3.5',
|
||||||
setup_requires=get_requirements(),
|
setup_requires=get_requirements(),
|
||||||
install_requires=get_requirements(),
|
install_requires=get_requirements(),
|
||||||
dependency_links=[
|
dependency_links=dep_links,
|
||||||
'https://github.com/Rapptz/discord.py/tarball/rewrite#egg=discord.py-1.0'
|
|
||||||
],
|
|
||||||
extras_require={
|
extras_require={
|
||||||
'test': ['pytest>=3', 'pytest-asyncio'],
|
'test': [
|
||||||
|
'pytest>=3', 'pytest-asyncio'
|
||||||
|
],
|
||||||
'mongo': ['motor'],
|
'mongo': ['motor'],
|
||||||
'docs': ['sphinx', 'sphinxcontrib-asyncio', 'sphinx_rtd_theme'],
|
'docs': ['sphinx', 'sphinxcontrib-asyncio', 'sphinx_rtd_theme'],
|
||||||
'voice': ['PyNaCl']
|
'voice': ['PyNaCl']
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user