Skip to content
This repository has been archived by the owner on Nov 29, 2021. It is now read-only.

Replace pipenv with poetry #252

Merged
merged 12 commits into from
Apr 16, 2020
37 changes: 10 additions & 27 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,18 @@ executors:
python-35:
docker:
- image: circleci/python:3.5
environment:
PIPENV_VENV_IN_PROJECT: true
working_directory: ~/repo
python-36:
docker:
- image: circleci/python:3.6
environment:
PIPENV_VENV_IN_PROJECT: true
working_directory: ~/repo
python-37:
docker:
- image: circleci/python:3.7
environment:
PIPENV_VENV_IN_PROJECT: true
working_directory: ~/repo
python-38:
docker:
- image: circleci/python:3.8
environment:
PIPENV_VENV_IN_PROJECT: true
working_directory: ~/repo

commands:
Expand All @@ -33,55 +25,46 @@ commands:
- checkout
- run:
name: Install dependencies
command: |
pipenv install

- run:
name: Install ospd
command: |
pipenv run pip install .
command: poetry install
test:
description: "Download and run tests"
steps:
- checkout
- run:
name: Install dependencies
command: |
pipenv install
command: poetry install --no-dev
- run:
name: Run unit tests
command: pipenv run python -m unittest
command: poetry run python -m unittest
test-with-codecov:
description: "Download and run tests with code coverage"
steps:
- checkout
- run:
name: Install dependencies
command: pipenv install
command: poetry install
- run:
name: Install codecov
command: |
pipenv run pip install codecov
command: poetry run pip install codecov
- run:
name: Run unit tests
command: |
pipenv run coverage run -m unittest
command: poetry run coverage run -m unittest
- run:
name: Upload coverage to Codecov
command: pipenv run codecov
command: poetry run codecov
lint:
description: "Lint python files"
steps:
- checkout
- run:
name: Install dependencies
command: pipenv install --dev
command: poetry install
- run:
name: Check formatting with black
command: pipenv run black --check ospd
command: poetry run black --check ospd
- run:
name: Run pylint
command: pipenv run pylint --score=n --disable=R ospd tests
command: poetry run pylint --score=n --disable=R ospd tests

jobs:
lint-python-files:
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Start the server before initialize to respond to the client.[#209](https://github.com/greenbone/ospd/pull/209)
- Use an iterator to get the vts when get_vts cmd is called. [#216](https://github.com/greenbone/ospd/pull/216)
- Update license to AGPL-3.0+ [#241](https://github.com/greenbone/ospd/pull/241)
- Replaced pipenv with poetry for dependency management. `poetry install` works
a bit different then `pipenv install`. It installs dev packages by default and
also ospd in editable mode. This means after running poetry install ospd will
directly be importable in the virtual python environment. [#252](https://github.com/greenbone/ospd/pull/252)

### Fixed
- Fix stop scan. Wait for the scan process to be stopped before delete it from the process table. [#204](https://github.com/greenbone/ospd/pull/204)
Expand Down
103 changes: 0 additions & 103 deletions INSTALL

This file was deleted.

2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
include CHANGES COPYING INSTALL Pipfile Pipfile.lock README.md setup.py
include CHANGLOG.md COPYING Poetry.toml Poetry.lock pyproject.toml README.md setup.py
recursive-include tests *.py
20 changes: 0 additions & 20 deletions Pipfile

This file was deleted.

Loading