Skip to content

Commit 157b7be

Browse files
pombredannepombredanne
authored
Merge pull request #15 from nexB/v21.01.21-prep
V21.01.21 prep
2 parents 8e92668 + a6e24d0 commit 157b7be

411 files changed

Lines changed: 1478 additions & 1825 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.

‎.gitattributes‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
# Set configure.bat's line ending to CRLF. Sometimes batch scripts don't work
2-
# properly on Windows if the line ending is LF and not CRLF
3-
configure.bat eol=crlf
1+
# Ignore all Git auto CR/LF line endings conversions
2+
* binary

‎AUTHORS.rst‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
11
The following organizations or individuals have contributed to this repo:
22

3-
-
3+
- Abhishek Kumar @Abhishek-Dev09
4+
- AlexB @a-tinsmith
5+
- Ayan Sinha Mahapatra @AyanSinhaMahapatra
6+
- Jillian Daguil @jdaguil
7+
- Jiri Popelka @jpopelka
8+
- Jono Yang @JonoYang
9+
- Philippe Ombredanne @pombredanne
10+
- Sebastian Schuberth @sschuberth
11+
- Sharikzama @ZamaSharik
12+
- Steven Esser @majurg
13+
- Thomas Druez @tdruez

‎CHANGELOG.rst‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
Release notes
22
=============
33

4+
vNext
5+
-----
6+
7+
8+
Version 21.1.21
9+
---------------
10+
11+
*2021-01-21*
12+
- Fix testing issues and testing requirements
13+
- Make typecode-libmagic
14+
- Various documentation and comment normalization and updates
15+
416

517
Version 21.1.9.1
618
----------------

‎MANIFEST.in‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
graft src
2+
3+
include *.LICENSE
4+
include NOTICE
5+
include *.ABOUT
6+
include *.toml
7+
include *.yml
8+
include *.rst
9+
include setup.*
10+
include configure*
11+
include requirements*
12+
include .git*
13+
14+
global-exclude *.py[co] __pycache__ *.*~
15+

‎NOTICE‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#
2+
# Copyright (c) nexB Inc. and others.
3+
# SPDX-License-Identifier: Apache-2.0
4+
#
5+
# Visit https://aboutcode.org and https://github.com/nexB/ for support and download.
6+
# ScanCode is a trademark of nexB Inc.
7+
#
8+
# Licensed under the Apache License, Version 2.0 (the "License");
9+
# you may not use this file except in compliance with the License.
10+
# You may obtain a copy of the License at
11+
#
12+
# http://www.apache.org/licenses/LICENSE-2.0
13+
#
14+
# Unless required by applicable law or agreed to in writing, software
15+
# distributed under the License is distributed on an "AS IS" BASIS,
16+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17+
# See the License for the specific language governing permissions and
18+
# limitations under the License.
19+
#

‎README.rst‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ TypeCode
99
TypeCode provides comprehensive filetype and mimetype detection using multiple
1010
detectors including libmagic (included as a dependency for Linux, Windows and
1111
macOS) and Pygments. It started as library in scancode-toolkit.
12+
Visit https://aboutcode.org and https://github.com/nexB/ for support and download.
13+
1214

1315
To install this package with its full capability (where the binaries for
1416
libmagic are installed), use the `full` option::
@@ -18,9 +20,10 @@ libmagic are installed), use the `full` option::
1820
If you want to use the version of libmagic (possibly) provided by your operating
1921
system, use the `minimal` option::
2022

21-
pip install typecode[minimal]
23+
pip install typecode
24+
2225

23-
To set up the typecode development environment::
26+
To set up the development environment::
2427

2528
source configure
2629

‎azure-pipelines.yml‎

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,64 @@
11

22
################################################################################
3-
# We use Azure to run the full tests suites on Pythons
4-
# on Windows64, macOS and Linux 64
3+
# We use Azure to run the full tests suites on multiple Python 3.x
4+
# on multiple Windows, macOS and Linux versions all on 64 bits
5+
# These jobs are using VMs with Azure-provided Python builds
56
################################################################################
67

78
jobs:
89

9-
################################################################################
10-
# These jobs are using VMs and Azure-provided Pythons
11-
################################################################################
12-
1310
- template: etc/ci/azure-linux.yml
1411
parameters:
15-
job_name: ubuntu16_py3
12+
job_name: ubuntu16_cpython
1613
image_name: ubuntu-16.04
17-
python_versions: ['3.6', '3.7', '3.8', '3.9',]
14+
python_versions: ['3.6', '3.7', '3.8', '3.9']
1815
test_suites:
19-
all: tmp/bin/pytest -n 2 -vvs
16+
all: tmp/bin/pytest -vvs
2017

2118
- template: etc/ci/azure-linux.yml
2219
parameters:
23-
job_name: ubuntu18_py3
20+
job_name: ubuntu18_cpython
2421
image_name: ubuntu-18.04
25-
python_versions: ['3.6', '3.7', '3.8', '3.9',]
22+
python_versions: ['3.6', '3.7', '3.8', '3.9']
2623
test_suites:
2724
all: tmp/bin/pytest -n 2 -vvs
2825

2926
- template: etc/ci/azure-linux.yml
3027
parameters:
31-
job_name: ubuntu20_py3
28+
job_name: ubuntu20_cpython
3229
image_name: ubuntu-20.04
33-
python_versions: ['3.6', '3.7', '3.8', '3.9',]
30+
python_versions: ['3.6', '3.7', '3.8', '3.9']
3431
test_suites:
3532
all: tmp/bin/pytest -n 2 -vvs
3633

3734
- template: etc/ci/azure-mac.yml
3835
parameters:
39-
job_name: macos1014_py3
36+
job_name: macos1014_cpython
4037
image_name: macos-10.14
41-
python_versions: ['3.6', '3.7', '3.8', '3.9',]
38+
python_versions: ['3.6', '3.7', '3.8', '3.9']
4239
test_suites:
4340
all: tmp/bin/pytest -n 2 -vvs
4441

4542
- template: etc/ci/azure-mac.yml
4643
parameters:
47-
job_name: macos1015_py3
44+
job_name: macos1015_cpython
4845
image_name: macos-10.15
49-
python_versions: ['3.6', '3.7', '3.8', '3.9',]
46+
python_versions: ['3.6', '3.7', '3.8', '3.9']
5047
test_suites:
5148
all: tmp/bin/pytest -n 2 -vvs
5249

5350
- template: etc/ci/azure-win.yml
5451
parameters:
55-
job_name: win2017_64_py3
52+
job_name: win2016_cpython
5653
image_name: vs2017-win2016
57-
python_versions: ['3.6', '3.7', '3.8', '3.9',]
54+
python_versions: ['3.6', '3.7', '3.8', '3.9']
5855
test_suites:
59-
all: tmp\Scripts\pytest -vvs
56+
all: tmp\Scripts\pytest -n 2 -vvs
6057

6158
- template: etc/ci/azure-win.yml
6259
parameters:
63-
job_name: win2019_64_py3
60+
job_name: win2019_cpython
6461
image_name: windows-2019
65-
python_versions: ['3.6', '3.7', '3.8', '3.9',]
62+
python_versions: ['3.6', '3.7', '3.8', '3.9']
6663
test_suites:
67-
all: tmp\Scripts\pytest -vvs
64+
all: tmp\Scripts\pytest -n 2 -vvs

‎configure‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/usr/bin/env bash
22
#
3-
# Copyright (c) nexB Inc. http://www.nexb.com/ - All rights reserved.
3+
# Copyright (c) nexB Inc. and others.
4+
# SPDX-License-Identifier: Apache-2.0
45
#
56

67
set -e
@@ -34,8 +35,7 @@ function setup {
3435

3536
setup
3637

37-
$CONFIGURE_ROOT_DIR/tmp/bin/pip install -e .[testing]
38-
$CONFIGURE_ROOT_DIR/tmp/bin/pip install typecode_libmagic
38+
$CONFIGURE_ROOT_DIR/tmp/bin/pip install -e .[testing] -e .[full]
3939

4040
if [ -f "$CONFIGURE_ROOT_DIR/tmp/bin/activate" ]; then
4141
source "$CONFIGURE_ROOT_DIR/tmp/bin/activate"

0 commit comments

Comments
 (0)