Skip to content

Commit a9b7d7f

Browse files
authored
Merge pull request #9 from nexB/v21.01.21-prep
V21.01.21 prep
2 parents 07770e5 + fb23eea commit a9b7d7f

230 files changed

Lines changed: 41 additions & 11 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.travis.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# This is a skeleton Travis CI config file that provides a starting point for adding CI
2+
# to a Python project. Since we primarily develop in python3, this skeleton config file
3+
# will be specific to that language.
4+
#
15
# See https://config.travis-ci.com/ for a full list of configuration options.
26

37
os: linux
@@ -9,9 +13,10 @@ python:
913
- "3.6"
1014
- "3.7"
1115
- "3.8"
16+
- "3.9"
1217

1318
# Scripts to run at install stage
1419
install: ./configure
1520

1621
# Scripts to run at script stage
17-
script: tmp/bin/pytest
22+
script: tmp/bin/pytest -vvs -n 2

CHANGELOG.rst

Lines changed: 8 additions & 1 deletion

README.rst

Lines changed: 7 additions & 3 deletions

commoncode.ABOUT

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
about_resource: .
2+
copyright: copyright (c) nexB. Inc. and others
3+
description: Commoncode provides a set of common functions and utilities for
4+
handling various things like paths, dates, files and hashes. It started as
5+
library in scancode-toolkit.
6+
keywords: utilities, commoncode, scancode-toolkit
7+
homepage_url: https://github.com/nexB/commoncode
8+
holder: nexB. Inc. and others
9+
holder_contact: info@aboutcode.org
10+
homepage_url: https://github.com/nexB/commoncode
11+
license_expression: apache-2.0
12+
name: commoncode
13+
package_url: pkg:pypi/commoncode
14+
primary_language: Python

etc/ci/azure-win.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ parameters:
33
image_name: ''
44
python_versions: []
55
test_suites: {}
6-
python_architecture: x86
6+
python_architecture: x64
77

88
jobs:
99
- job: ${{ parameters.job_name }}

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ norecursedirs = [
3131
"thirdparty",
3232
"tmp",
3333
"tests/data",
34-
".eggs"
34+
".eggs",
3535
]
36-
36+
3737
python_files = "*.py"
3838

3939
python_classes = "Test"

src/commoncode/command.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,11 +201,11 @@ def load_shared_library(dll_path, lib_dir):
201201
`lib_dir` to the path.
202202
"""
203203

204-
if not path.exists(dll_path):
205-
raise ImportError('Shared library does not exists: %(dll_path)r' % locals())
204+
if not dll_path or not path.exists(dll_path):
205+
raise ImportError(f'Shared library "dll_path" does not exists: dll_path="{dll_path}" and lib_dir={lib_dir})')
206206

207207
if lib_dir and not path.exists(lib_dir):
208-
raise ImportError('Shared library "lib_dir" does not exists: %(lib_dir)r' % locals())
208+
raise ImportError(f'Shared library "lib_dir" does not exists: dll_path="{dll_path}" and lib_dir={lib_dir})')
209209

210210
if not isinstance(dll_path, str):
211211
dll_path = os.fsdecode(dll_path)
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)