Skip to content

Commit

Permalink
Move dependencies in requirements.txt & devel.txt
Browse files Browse the repository at this point in the history
and start using them everywhere in CI
  • Loading branch information
atodorov committed Mar 22, 2020
1 parent 333f740 commit 4bc9162
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 16 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/integration.yml
Expand Up @@ -40,7 +40,7 @@ jobs:
if: matrix.os == 'ubuntu-latest'
run: |
sudo apt-get install libkrb5-dev
pip install kerberos requests
pip install -r devel.txt
- name: Build & start services
run: |
Expand Down Expand Up @@ -72,10 +72,6 @@ jobs:
make verify-web-login
klist
- name: Install coverage tools
run: |
pip install coverage codecov
- name: Verify tcms-api can communicate via username/password
run: |
cat > ~/.tcms.conf << _EOF_
Expand Down
7 changes: 3 additions & 4 deletions .travis.yml
Expand Up @@ -11,15 +11,14 @@ env:
- MAKE=build

install:
- pip install coverage pylint flake8 twine kerberos requests
- pip install -r devel.txt

script:
- make $MAKE

after_success:
- |
pip install coveralls
coveralls
- coveralls

notifications:
email:
on_failure: change
Expand Down
2 changes: 1 addition & 1 deletion MANIFEST.in
@@ -1 +1 @@
include README.rst LICENSE
include README.rst LICENSE requirements.txt
2 changes: 1 addition & 1 deletion appveyor.yml
Expand Up @@ -15,7 +15,7 @@ install:

- "python --version"
- "python -m pip install --disable-pip-version-check --user --upgrade pip wheel"
- "python -m pip install coverage pylint flake8 twine winkerberos requests"
- "python -m pip install -r devel.txt"

build: off

Expand Down
6 changes: 6 additions & 0 deletions devel.txt
@@ -0,0 +1,6 @@
-r requirements.txt

coveralls
flake8
pylint
twine
2 changes: 2 additions & 0 deletions requirements.txt
@@ -0,0 +1,2 @@
gssapi
requests
17 changes: 12 additions & 5 deletions setup.py
Expand Up @@ -10,12 +10,22 @@ def get_version():
).replace('__version__=', '').strip().strip("'").strip('"')


def get_install_requires(path):
requires = []

with open(path, 'r') as file:
for line in file:
if line.startswith('-r '):
continue
requires.append(line.strip())
return requires


with open("README.rst") as readme:
LONG_DESCRIPTION = readme.read()


setup(name='tcms-api',
# always update version/release in docs/conf.py
version=get_version(),
packages=['tcms_api'],
description='Python API for Kiwi',
Expand All @@ -25,10 +35,7 @@ def get_version():
license='LGPLv2+',
url='https://github.com/kiwitcms/tcms-api',
python_requires='>=3.6',
install_requires=[
'requests',
'gssapi',
],
install_requires=get_install_requires('requirements.txt'),
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Console',
Expand Down

0 comments on commit 4bc9162

Please sign in to comment.