From 82cfbae9005e19889a9099cd8d2b0ba61e2ec714 Mon Sep 17 00:00:00 2001 From: Kevin Date: Sun, 4 Jul 2021 16:18:00 +0200 Subject: [PATCH] Fix/drone setup missing packages (#4) * Trying explicitly defining colored package version. * Try first installing from requirements. * Tried defining pyproject file. * Requirements references setup packages. * Import __version__ from import statement directly. * Removed unused packages and restored requirements file. * Install dependencies before running setup. --- .drone.yml | 3 ++- pyproject.toml | 7 +++++++ requirements.txt | 2 -- setup.py | 4 +--- 4 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 pyproject.toml diff --git a/.drone.yml b/.drone.yml index 3c642dd..ba56ad9 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,6 +11,7 @@ steps: - name: Install python image: python:3.8 commands: + - pip install -r requirements.txt - python setup.py install - pip install pytest - pytest @@ -18,8 +19,8 @@ steps: - name: Upload coverage report image: python:3.8 commands: - - python setup.py install - pip install -r requirements-dev.txt + - python setup.py install - coverage run -m pytest - codecov -t $CODECOV_TOKEN environment: diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..86cc085 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,7 @@ +[build-system] +requires = [ + "setuptools>=42", + "wheel" +] + +build-backend = "setuptools.build_meta" \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 4a10510..c910e71 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,2 @@ -beautifulsoup4>=4.6.0 -termcolor>=1.1.0 docopt==0.6.2 colored==1.3.5 diff --git a/setup.py b/setup.py index 039d39e..ae3a374 100644 --- a/setup.py +++ b/setup.py @@ -23,9 +23,7 @@ setup( long_description_content_type='text/markdown', install_requires=[ 'docopt', - 'beautifulsoup4', - 'termcolor', - 'colored', + 'colored' ], url='https://github.com/KevinMidboe/torrent_search', classifiers=[