diff options
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | MANIFEST.in | 12 | ||||
| -rw-r--r-- | requirements/dev-requirements.in (renamed from tools/dev-requirements.in) | 0 | ||||
| -rw-r--r-- | requirements/dev-requirements.txt (renamed from tools/dev-requirements.txt) | 0 | ||||
| -rw-r--r-- | requirements/plugin-requirements.in (renamed from tools/plugin-requirements.in) | 0 | ||||
| -rw-r--r-- | requirements/plugin-requirements.txt (renamed from tools/plugin-requirements.txt) | 0 | ||||
| -rw-r--r-- | requirements/requirements.in (renamed from tools/requirements.in) | 0 | ||||
| -rw-r--r-- | requirements/requirements.txt (renamed from tools/requirements.txt) | 0 | ||||
| -rwxr-xr-x | setup.py | 4 | ||||
| -rw-r--r-- | tox.ini | 16 |
10 files changed, 17 insertions, 17 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 67248bc26..b6be45a88 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -276,7 +276,7 @@ coverage: coverage: '/TOTAL +\d+ +\d+ +(\d+\.\d+)%/' script: - cd dist && ./unpack.sh && cd buildstream - - pip3 install -r tools/requirements.txt -r tools/dev-requirements.txt + - pip3 install -r requirements/requirements.txt -r requirements/dev-requirements.txt - pip3 install --no-index . - mkdir report - cd report diff --git a/MANIFEST.in b/MANIFEST.in index 7b86e7cb1..d23bb79cc 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -32,12 +32,12 @@ include .pylintrc recursive-include buildstream/_protos *.proto # Requirements files -include tools/requirements.in -include tools/requirements.txt -include tools/dev-requirements.in -include tools/dev-requirements.txt -include tools/plugin-requirements.in -include tools/plugin-requirements.txt +include requirements/requirements.in +include requirements/requirements.txt +include requirements/dev-requirements.in +include requirements/dev-requirements.txt +include requirements/plugin-requirements.in +include requirements/plugin-requirements.txt # Versioneer include versioneer.py diff --git a/tools/dev-requirements.in b/requirements/dev-requirements.in index 9edb23423..9edb23423 100644 --- a/tools/dev-requirements.in +++ b/requirements/dev-requirements.in diff --git a/tools/dev-requirements.txt b/requirements/dev-requirements.txt index d706bc9f5..d706bc9f5 100644 --- a/tools/dev-requirements.txt +++ b/requirements/dev-requirements.txt diff --git a/tools/plugin-requirements.in b/requirements/plugin-requirements.in index e3527285d..e3527285d 100644 --- a/tools/plugin-requirements.in +++ b/requirements/plugin-requirements.in diff --git a/tools/plugin-requirements.txt b/requirements/plugin-requirements.txt index 6841612bd..6841612bd 100644 --- a/tools/plugin-requirements.txt +++ b/requirements/plugin-requirements.txt diff --git a/tools/requirements.in b/requirements/requirements.in index a3c62c79b..a3c62c79b 100644 --- a/tools/requirements.in +++ b/requirements/requirements.in diff --git a/tools/requirements.txt b/requirements/requirements.txt index 7bf3205f7..7bf3205f7 100644 --- a/tools/requirements.txt +++ b/requirements/requirements.txt @@ -270,10 +270,10 @@ def get_cmdclass(): ##################################################### # Gather requirements # ##################################################### -with open('tools/dev-requirements.in') as dev_reqs: +with open('requirements/dev-requirements.in') as dev_reqs: dev_requires = dev_reqs.read().splitlines() -with open('tools/requirements.in') as install_reqs: +with open('requirements/requirements.in') as install_reqs: install_requires = install_reqs.read().splitlines() ##################################################### @@ -5,9 +5,9 @@ skip_missing_interpreters = true [testenv] commands = pytest {posargs} deps = - -rtools/requirements.txt - -rtools/dev-requirements.txt - -rtools/plugin-requirements.txt + -rrequirements/requirements.txt + -rrequirements/dev-requirements.txt + -rrequirements/plugin-requirements.txt passenv = BST_FORCE_BACKEND GI_TYPELIB_PATH @@ -18,9 +18,9 @@ commands = pycodestyle pylint buildstream deps = - -rtools/requirements.txt - -rtools/dev-requirements.txt - -rtools/plugin-requirements.txt + -rrequirements/requirements.txt + -rrequirements/dev-requirements.txt + -rrequirements/plugin-requirements.txt [testenv:docs] commands = @@ -30,8 +30,8 @@ deps = sphinx==1.7.9 sphinx-click sphinx_rtd_theme - -rtools/requirements.txt - -rtools/plugin-requirements.txt + -rrequirements/requirements.txt + -rrequirements/plugin-requirements.txt passenv = BST_FORCE_SESSION_REBUILD BST_SOURCE_CACHE |