Remove requirements/setup.txt and setup_requires
parent
930f3825d7
commit
1946a1204d
|
|
@ -15,14 +15,12 @@ jobs:
|
||||||
python: '3.7'
|
python: '3.7'
|
||||||
dist: xenial
|
dist: xenial
|
||||||
sudo: required
|
sudo: required
|
||||||
-
|
- python: '3.6'
|
||||||
python: '3.6'
|
|
||||||
env: TOXENV=djmaster
|
env: TOXENV=djmaster
|
||||||
- # readthedocs uses python 3.5 for building
|
- # readthedocs uses python 3.5 for building
|
||||||
python: '3.5'
|
python: '3.5'
|
||||||
env: TOXENV=docs
|
env: TOXENV=docs
|
||||||
-
|
- python: '3.6'
|
||||||
python: '3.6'
|
|
||||||
env: TOXENV=lint
|
env: TOXENV=lint
|
||||||
|
|
||||||
- stage: publish
|
- stage: publish
|
||||||
|
|
@ -45,6 +43,7 @@ jobs:
|
||||||
fast_finish: true
|
fast_finish: true
|
||||||
|
|
||||||
install:
|
install:
|
||||||
|
- python -m pip install -U pip
|
||||||
- pip install -r requirements/ci.txt
|
- pip install -r requirements/ci.txt
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
-r requirements/setup.txt
|
# this file is only used when deploying to heroku, because heroku insists on having a root-level requirements.txt
|
||||||
|
# for normal usage see the requirements/ directory
|
||||||
.[validation]
|
.[validation]
|
||||||
-r requirements/heroku.txt
|
-r requirements/heroku.txt
|
||||||
|
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
||||||
# needed to build the package setup_requires in setup.py
|
|
||||||
|
|
||||||
setuptools-scm>=3.0.6
|
|
||||||
|
|
@ -1,4 +1,2 @@
|
||||||
# requirements for building and running tox
|
# requirements for building and running tox
|
||||||
tox>=3.1.2
|
tox>=3.1.2
|
||||||
|
|
||||||
-r setup.txt
|
|
||||||
|
|
|
||||||
2
setup.py
2
setup.py
|
|
@ -17,7 +17,6 @@ with io.open('README.rst', encoding='utf-8') as readme:
|
||||||
description = readme.read()
|
description = readme.read()
|
||||||
|
|
||||||
requirements = read_req('base.txt')
|
requirements = read_req('base.txt')
|
||||||
requirements_setup = read_req('setup.txt')
|
|
||||||
requirements_validation = read_req('validation.txt')
|
requirements_validation = read_req('validation.txt')
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -28,7 +27,6 @@ def drf_yasg_setup(**kwargs):
|
||||||
package_dir={'': 'src'},
|
package_dir={'': 'src'},
|
||||||
include_package_data=True,
|
include_package_data=True,
|
||||||
install_requires=requirements,
|
install_requires=requirements,
|
||||||
setup_requires=requirements_setup,
|
|
||||||
extras_require={
|
extras_require={
|
||||||
'validation': requirements_validation,
|
'validation': requirements_validation,
|
||||||
},
|
},
|
||||||
|
|
|
||||||
2
tox.ini
2
tox.ini
|
|
@ -21,7 +21,6 @@ deps =
|
||||||
djmaster: https://github.com/django/django/archive/master.tar.gz
|
djmaster: https://github.com/django/django/archive/master.tar.gz
|
||||||
|
|
||||||
# other dependencies
|
# other dependencies
|
||||||
-rrequirements/setup.txt
|
|
||||||
-rrequirements/validation.txt
|
-rrequirements/validation.txt
|
||||||
-rrequirements/test.txt
|
-rrequirements/test.txt
|
||||||
|
|
||||||
|
|
@ -37,7 +36,6 @@ commands =
|
||||||
|
|
||||||
[testenv:docs]
|
[testenv:docs]
|
||||||
deps =
|
deps =
|
||||||
-rrequirements/setup.txt
|
|
||||||
-rrequirements/docs.txt
|
-rrequirements/docs.txt
|
||||||
commands =
|
commands =
|
||||||
python setup.py check --restructuredtext --metadata --strict
|
python setup.py check --restructuredtext --metadata --strict
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue