Skip to content

Commit

Permalink
Merge pull request #440 from pyupio/develop
Browse files Browse the repository at this point in the history
2.3.4 Patch
  • Loading branch information
yeisonvargasf committed Dec 8, 2022
2 parents 78e2525 + 68049bb commit 9e4f843
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 7 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Expand Up @@ -5,6 +5,8 @@ All notable changes to this project will be documented in this file.
The format is partly based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html) and [PEP 440](https://peps.python.org/pep-0440/)

## [Unreleased] 2.3.4.dev

## [2.3.3] - 2022-11-27
- Fixed recursive requirements issue when an unpinned package is found.

Expand Down
8 changes: 4 additions & 4 deletions README.md
Expand Up @@ -50,7 +50,7 @@ For detailed documentation, please see [Safety's documentation portal](https://d
# Basic Usage

To check your currently selected virtual environment for dependencies with known security
vulnerabilites, run:
vulnerabilities, run:

```bash
safety check
Expand Down Expand Up @@ -142,15 +142,15 @@ Run `safety check` again:
## Starter documentation

### Configuring the target of the scan
Safety can scan requirements.txt files, the local environemnt as well as direct input piped into Safety.
Safety can scan requirements.txt files, the local environment as well as direct input piped into Safety.

To scan a requirements file:

```bash
safety check -r requirements.txt
```

To scan the local enviroment:
To scan the local environment:

```bash
safety check
Expand Down Expand Up @@ -547,7 +547,7 @@ safety license --key=12345-ABCDEFGH

### `--output json` (Optional)

This license command can also be used in conjuction with optional arguments `--output bare` and `--output json` for structured, parsable outputs that can be fed into other tools and pipelines.
This license command can also be used in conjunction with optional arguments `--output bare` and `--output json` for structured, parsable outputs that can be fed into other tools and pipelines.

___

Expand Down
2 changes: 1 addition & 1 deletion safety/VERSION
@@ -1 +1 @@
2.3.3
2.3.4.dev
4 changes: 2 additions & 2 deletions safety/safety.py
Expand Up @@ -11,7 +11,7 @@
import requests
from packaging.specifiers import SpecifierSet
from packaging.utils import canonicalize_name
from packaging.version import parse as parse_version, Version, LegacyVersion, parse
from packaging.version import parse as parse_version

from .constants import (API_MIRRORS, CACHE_FILE, OPEN_MIRRORS, REQUEST_TIMEOUT, API_BASE_URL)
from .errors import (DatabaseFetchError, DatabaseFileNotFoundError,
Expand Down Expand Up @@ -458,7 +458,7 @@ def review(report=None, params=None):
major = None
if recommended:
secure_v.append(recommended)
major = parse(recommended)
major = parse_version(recommended)

remediations[key] = {'vulns_found': value.get('vulnerabilities_found', 0),
'version': value.get('current_version'),
Expand Down
1 change: 1 addition & 0 deletions setup.cfg
Expand Up @@ -27,6 +27,7 @@ classifiers =
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11

[options]
zip_safe = False
Expand Down

0 comments on commit 9e4f843

Please sign in to comment.