Skip to content

Commit 9f7d4fd

Browse files
pombredannepombredanne
committed
Merge branch Abhishek-Dev09/295-./configure #2184
Signed-off-by: Philippe Ombredanne <[email protected]>
2 parents 2a2721f + 91de2b4 commit 9f7d4fd

13 files changed

+573
-51
lines changed

‎.travis.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ matrix:
1010
include:
1111
# Run minimal test suite
1212
- os: osx
13-
env: PYTHON=36
13+
env:
14+
- PYTHON=36
15+
- TEST_SUITE="bin/py.test -vvs --reruns 3 tests/scancode"
1416
language: generic
1517

1618
- os: linux

‎azure-pipelines.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
################################################################################
3-
# We use Azure to run the full tests suites on Python 3.6
3+
# We use Azure to run the full tests suites on Pythons 3.6 and above.
44
# on Windows (32 and 64), macOS and Linux (64 various distro)
55
################################################################################
66

@@ -31,6 +31,7 @@ jobs:
3131
- script: ./etc/release/pip-install-editable.sh
3232
displayName: 'Test pip editable installation'
3333

34+
3435
################################################################################
3536
# These jobs are using VMs and Azure-provided Pythons 3.6
3637
################################################################################

‎configure‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@ fi
1919
export TPP_DIR="thirdparty"
2020

2121
# default configurations for dev
22-
CONF_DEFAULT="etc/conf/dev"
22+
CONF_DEFAULT="etc/conf/dev"
2323

24-
if [[ "$CONF_DEFAULT" == "etc/conf/dev" ]]; then
24+
if [[ "$CONF_DEFAULT" == "etc/conf" ]]; then
2525
export TPP_DIR_DEV="thirdparty/dev"
26+
#export TPP_DIR_links="https://github.com/Abhishek-Dev09/thirdparty/releases/tag/v2.0"
2627
fi
2728

2829

‎configure.bat‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,12 @@
2626
set "TPP_DIR=thirdparty"
2727

2828
@rem # default configurations for dev
29-
set "CONF_DEFAULT=etc/conf/dev"
29+
set "CONF_DEFAULT=etc/conf"
3030

3131
@rem # default thirdparty dist for dev
32-
if ""%CONF_DEFAULT%""==""etc/conf/dev"" (
33-
set "TPP_DIR_DEV=thirdparty/dev"
32+
if ""%CONF_DEFAULT%""==""etc/conf"" (
33+
@rem # set "TPP_DIR_DEV=thirdparty/dev"
34+
set "TPP_DIR_links=https://github.com/Abhishek-Dev09/thirdparty/releases/tag/v2.0"
3435
)
3536

3637
@rem # default supported version for Python 3

‎etc/conf/dev/requirements_base.txt‎

Lines changed: 109 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,109 @@
1-
# Testing
2-
aboutcode-toolkit
3-
apipkg
4-
py
5-
pytest
6-
colorama
7-
execnet
8-
pytest-xdist
9-
bumpversion
10-
coverage
11-
pytest-cov
12-
codecov
13-
pytest-rerunfailures
1+
aboutcode-toolkit==4.0.1 \
2+
--hash=sha256:ac13e6814854285f501a8bbd361d85a8e133d1b1900a335075b24b0e16c3238b \
3+
# via -r etc/conf/dev/requirements_base.txt
4+
apipkg==1.5 \
5+
--hash=sha256:58587dd4dc3daefad0487f6d9ae32b4542b185e1c36db6993290e7c41ca2b47c \
6+
# via -r etc/conf/dev/requirements_base.txt, execnet
7+
atomicwrites==1.3.0 \
8+
--hash=sha256:03472c30eb2c5d1ba9227e4c2ca66ab8287fbfbbda3888aa93dc2e28fc6811b4 \
9+
# via pytest
10+
attrs==19.3.0 \
11+
--hash=sha256:08a96c641c3a74e44eb59afb61a24f2cb9f4d7188748e76ba4bb5edfa3cb7d1c \
12+
# via pytest
13+
boolean.py==3.7 \
14+
--hash=sha256:82ae181f9c85cb5c893a5a4daba9f24d60b538a7dd27fd0c6752a77eba4fbeff \
15+
# via aboutcode-toolkit, license-expression
16+
bumpversion==0.5.4.dev0 \
17+
--hash=sha256:d70f665b9f8fb4ff3064d1905ff76e31f51dd0aba3fed82ddf2da358e00d7ebc \
18+
# via -r etc/conf/dev/requirements_base.txt
19+
certifi==2018.4.16 \
20+
--hash=sha256:9fa520c1bacfb634fa7af20a76bcbd3d5fb390481724c597da32c719a7dca4b0 \
21+
# via requests
22+
chardet==3.0.4 \
23+
--hash=sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691 \
24+
# via requests
25+
click==6.7 \
26+
--hash=sha256:29f99fc6125fbc931b758dc053b3114e55c77a6e4c6c3a2674a2dc986016381d \
27+
# via aboutcode-toolkit
28+
codecov==2.0.15 \
29+
--hash=sha256:ae00d68e18d8a20e9c3288ba3875ae03db3a8e892115bf9b83ef20507732bed4 \
30+
# via -r etc/conf/dev/requirements_base.txt
31+
colorama==0.3.9 \
32+
--hash=sha256:463f8483208e921368c9f306094eb6f725c6ca42b0f97e313cb5d5512459feda \
33+
# via -r etc/conf/dev/requirements_base.txt
34+
coverage==4.4.1 \
35+
--hash=sha256:4f99551b229643c9638c028b3a097ffd827f7a6b558356b940c6a3cc847bdb6e \
36+
--hash=sha256:7a9c44400ee0f3b4546066e0710e1250fd75831adc02ab99dda176ad8726f424 \
37+
# via -r etc/conf/dev/requirements_base.txt, codecov, pytest-cov
38+
execnet==1.6.0 \
39+
--hash=sha256:027ee5d961afa01e97b90d6ccc34b4ed976702bc58e7f092b3c513ea288cb6d2 \
40+
# via -r etc/conf/dev/requirements_base.txt, pytest-xdist
41+
idna==2.6 \
42+
--hash=sha256:8c7309c718f94b3a625cb648ace320157ad16ff131ae0af362c9f21b80ef6ec4 \
43+
# via requests
44+
importlib-metadata==0.18 \
45+
--hash=sha256:6dfd58dfe281e8d240937776065dd3624ad5469c835248219bd16cf2e12dbeb7 \
46+
# via pluggy, pytest
47+
jinja2==2.10 \
48+
--hash=sha256:74c935a1b8bb9a3947c50a54766a969d4846290e1e788ea44c1392163723c3bd \
49+
# via aboutcode-toolkit
50+
license-expression==1.2 \
51+
--hash=sha256:6d97906380cecfc758a77f6d38c6760f2afade7e83d2b8295e234fe21f486fb8 \
52+
# via aboutcode-toolkit
53+
markupsafe==1.0 \
54+
--hash=sha256:198e2d4a8bfcf9d59edd8e870454c21a7c1fc8e7e4dde85f20f1a033ac539a4e \
55+
--hash=sha256:a6be69091dac236ea9c6bc7d012beab42010fa914c459791d627dad4910eb665 \
56+
# via jinja2
57+
more-itertools==5.0.0 \
58+
--hash=sha256:fe7a7cae1ccb57d33952113ff4fa1bc5f879963600ed74918f1236e212ee50b9 \
59+
# via pytest
60+
packaging==19.0 \
61+
--hash=sha256:9e1cbf8c12b1f1ce0bb5344b8d7ecf66a6f8a6e91bcb0c84593ed6d3ab5c4ab3 \
62+
# via pytest
63+
pluggy==0.12.0 \
64+
--hash=sha256:b9817417e95936bf75d85d3f8767f7df6cdde751fc40aed3bb3074cbcb77757c \
65+
# via pytest
66+
py==1.8.0 \
67+
--hash=sha256:64f65755aee5b381cea27766a3a147c3f15b9b6b9ac88676de66ba2ae36793fa \
68+
# via -r etc/conf/dev/requirements_base.txt, pytest
69+
pyparsing==2.4.0 \
70+
--hash=sha256:9b6323ef4ab914af344ba97510e966d64ba91055d6b9afa6b30799340e89cc03 \
71+
# via packaging
72+
pytest-cov==2.7.1 \
73+
--hash=sha256:2b097cde81a302e1047331b48cadacf23577e431b61e9c6f49a1170bbe3d3da6 \
74+
# via -r etc/conf/dev/requirements_base.txt
75+
pytest-forked==1.0.2 \
76+
--hash=sha256:5fe33fbd07d7b1302c95310803a5e5726a4ff7f19d5a542b7ce57c76fed8135f \
77+
# via pytest-xdist
78+
pytest-rerunfailures==7.0 \
79+
--hash=sha256:1180a0f98975e1e1a2e055c87c1159cbd3bace8ceb71b1e7ffe4ace6121e7801 \
80+
# via -r etc/conf/dev/requirements_base.txt
81+
pytest-xdist==1.29.0 \
82+
--hash=sha256:501795cb99e567746f30fe78850533d4cd500c93794128e6ab9988e92a17b1f8 \
83+
# via -r etc/conf/dev/requirements_base.txt
84+
pytest==4.6.3 \
85+
--hash=sha256:926855726d8ae8371803f7b2e6ec0a69953d9c6311fa7c3b6c1b929ff92d27da \
86+
# via -r etc/conf/dev/requirements_base.txt, pytest-cov, pytest-forked, pytest-rerunfailures, pytest-xdist
87+
pyyaml==3.12 \
88+
--hash=sha256:592766c6303207a20efc445587778322d7f73b161bd994f227adaa341ba212ab \
89+
--hash=sha256:bb35246803f4e91ccb7e160d4c872dc8ea93cd664082033b6feacd72e25653d3 \
90+
--hash=sha256:d154a918f5da478a1823d0a4190408e4ad450ce8965de8d4913ef37a58e56563 \
91+
# via aboutcode-toolkit, saneyaml
92+
requests==2.18.4 \
93+
--hash=sha256:6a1b267aa90cac58ac3a765d067950e7dbbf75b1da07e895d1f594193a40a38b \
94+
# via codecov
95+
saneyaml==0.1 \
96+
--hash=sha256:ffef9eed0de856fc2a1d5807c962d22e2b9bbadc0eba2e0375cb64c145006c96 \
97+
# via aboutcode-toolkit
98+
six==1.12.0 \
99+
--hash=sha256:3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c \
100+
# via more-itertools, packaging, pytest, pytest-xdist
101+
urllib3==1.22 \
102+
--hash=sha256:06330f386d6e4b195fbfc736b297f58c5a892e4440e54d294d7004e3a9bbea1b \
103+
# via requests
104+
wcwidth==0.1.7 \
105+
--hash=sha256:f4ebe71925af7b40a864553f761ed559b43544f8f71746c2d756c7fe788ade7c \
106+
# via pytest
107+
zipp==0.5.1 \
108+
--hash=sha256:8c1019c6aad13642199fbe458275ad6a84907634cc9f0989877ccc4a2840139d \
109+
# via importlib-metadata

0 commit comments

Comments
 (0)