Skip to content

Commit 1af5ac8

Browse files
authored
Merge pull request #1708 from nexB/111-new-version-notification
New version notification #111 #1688 Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
2 parents 7466489 + 6bb9822 commit 1af5ac8

File tree

7 files changed

+617
-9
lines changed

7 files changed

+617
-9
lines changed

azure-pipelines.yml

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,39 @@ jobs:
1515
bin/py.test -n 2 -vvs --reruns=3 --test-suite=all \
1616
--ignore=tests/scancode \
1717
--ignore=tests/cluecode \
18-
--ignore=tests/licensedcode
18+
--ignore=tests/licensedcode \
19+
--cov=src --cov-report=term --cov-report=xml
20+
bin/codecov --token "$CODECOV_TOKEN"
1921
20-
scancode: bin/py.test --reruns=3 -vvs --test-suite=all tests/scancode
22+
scancode: |
23+
bin/py.test --reruns=3 -vvs --test-suite=all tests/scancode \
24+
--cov=src --cov-report=term --cov-report=xml
25+
bin/codecov --token "$CODECOV_TOKEN"
2126
22-
cluecode: bin/py.test -n 2 --reruns=3 -vvs --test-suite=all tests/cluecode
27+
cluecode: |
28+
bin/py.test -n 2 --reruns=3 -vvs --test-suite=all tests/cluecode \
29+
--cov=src --cov-report=term --cov-report=xml
30+
bin/codecov --token "$CODECOV_TOKEN"
2331
2432
license_base: |
2533
bin/py.test -n 2 --reruns=3 -vvs --test-suite=all \
2634
--ignore=tests/licensedcode/test_zzzz_cache.py \
2735
--ignore=tests/licensedcode/test_detection_datadriven1.py \
28-
tests/licensedcode
36+
tests/licensedcode \
37+
--cov=src --cov-report=term --cov-report=xml
38+
bin/codecov --token "$CODECOV_TOKEN"
2939
3040
license_main: |
3141
bin/py.test -n 2 --reruns=3 -vvs --test-suite=all \
32-
tests/licensedcode/test_detection_datadriven1.py
42+
tests/licensedcode/test_detection_datadriven1.py \
43+
--cov=src --cov-report=term --cov-report=xml
44+
bin/codecov --token "$CODECOV_TOKEN"
3345
3446
license_cache: |
3547
bin/py.test -n 2 --reruns=3 -vvs --test-suite=all \
36-
tests/licensedcode/test_zzzz_cache.py
48+
tests/licensedcode/test_zzzz_cache.py \
49+
--cov=src --cov-report=term --cov-report=xml
50+
bin/codecov --token "$CODECOV_TOKEN"
3751
3852
- template: etc/ci/azure-win.yml
3953
parameters:

src/scancode/cli.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,6 @@ def scancode(ctx, input, # NOQA
483483
Other **kwargs are passed down to plugins as CommandOption indirectly
484484
through Click context machinery.
485485
"""
486-
487486
success = False
488487
try:
489488
# Validate CLI UI options dependencies and other CLI-specific inits
@@ -513,6 +512,12 @@ def scancode(ctx, input, # NOQA
513512
echo_func=echo_stderr,
514513
*args, **kwargs)
515514

515+
# check for updates
516+
from scancode.outdated import check_scancode_version
517+
outdated = check_scancode_version()
518+
if not quiet and outdated:
519+
echo_stderr(outdated, fg='yellow')
520+
516521
except click.UsageError as e:
517522
# this will exit
518523
raise e
@@ -1180,7 +1185,7 @@ def scan_codebase(codebase, scanners, processes=1, timeout=DEFAULT_TIMEOUT,
11801185
location, rid, scan_errors, scan_time, scan_result, scan_timings = scans.next()
11811186
else:
11821187
location, rid, scan_errors, scan_time, scan_result, scan_timings = next(scans)
1183-
1188+
11841189
if TRACE_DEEP:
11851190
logger_debug(
11861191
'scan_codebase: location:', location, 'results:', scan_result)
@@ -1253,7 +1258,7 @@ def terminate_pool(pool):
12531258

12541259

12551260
def terminate_pool_with_backoff(pool, number_of_trials=3):
1256-
# try a few times to terminate,
1261+
# try a few times to terminate,
12571262
for trial in range(number_of_trials, 1):
12581263
try:
12591264
pool.terminate()

src/scancode/outdated.ABOUT

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
about_resource: outdated.py
2+
name: pip
3+
version: 9974f2
4+
download_url: https://raw.githubusercontent.com/pypa/pip/9974f274e1c86fb556b5d51dcfd2d4dc637b7b67/pip/utils/outdated.py
5+
license: mit
6+
notice_file: outdated.NOTICE
7+
license_text_file: outdated.LICENSE
8+
notes: this code was derived and heavily modified from pip/utils/outdated.py.

src/scancode/outdated.LICENSE

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
Copyright (c) 2008-2014 The pip developers (see outdated.NOTICE file)
2+
3+
Permission is hereby granted, free of charge, to any person obtaining
4+
a copy of this software and associated documentation files (the
5+
"Software"), to deal in the Software without restriction, including
6+
without limitation the rights to use, copy, modify, merge, publish,
7+
distribute, sublicense, and/or sell copies of the Software, and to
8+
permit persons to whom the Software is furnished to do so, subject to
9+
the following conditions:
10+
11+
The above copyright notice and this permission notice shall be
12+
included in all copies or substantial portions of the Software.
13+
14+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
15+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
17+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
18+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
19+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
20+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

src/scancode/outdated.NOTICE

Lines changed: 213 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,213 @@
1+
The following authors have contributed to pip:
2+
Adam Wentz <awentz@theonion.com>
3+
Aleks Bunin <github@compuix.com>
4+
Alex Gaynor <alex.gaynor@gmail.com>
5+
Alex Grönholm <alex.gronholm@nextday.fi>
6+
Alex Morega <alex@grep.ro>
7+
Alexandre Conrad <alexandre.conrad@gmail.com>
8+
Alli <alzeih@users.noreply.github.com>
9+
Anatoly Techtonik <techtonik@gmail.com>
10+
Andrei Geacar <andrei.geacar@gmail.com>
11+
Andrey Bulgakov <mail@andreiko.ru>
12+
Anrs Hu <anrs@douban.com>
13+
Anton Patrushev <apatrushev@gmail.com>
14+
Antonio Alvarado Hernandez <tnotstar@gmail.com>
15+
Antti Kaihola <akaihol+github@ambitone.com>
16+
Armin Ronacher <armin.ronacher@active-4.com>
17+
Ashley Manton <ajd.manton@googlemail.com>
18+
Baptiste Mispelon <bmispelon@gmail.com>
19+
Ben Darnell <ben@bendarnell.com>
20+
Ben Rosser <rosser.bjr@gmail.com>
21+
Bence Nagy <bence@underyx.me>
22+
Berker Peksag <berker.peksag@gmail.com>
23+
Bernardo B. Marques <bernardo.fire@gmail.com>
24+
Bogdan Opanchuk <bogdan@opanchuk.net>
25+
Brad Erickson <eosrei@gmail.com>
26+
Bradley Ayers <bradley.ayers@gmail.com>
27+
Brian Rosner <brosner@gmail.com>
28+
Bruno Renié <brutasse@gmail.com>
29+
Buck Golemon <buck@yelp.com>
30+
Bussonnier Matthias <bussonniermatthias@gmail.com>
31+
Carl Meyer <carl@oddbird.net>
32+
Chris Brinker <chris.brinker@gmail.com>
33+
Chris Jerdonek <chris.jerdonek@gmail.com>
34+
Chris McDonough <chrism@plope.com>
35+
Chris Wolfe <chriswwolfe@gmail.com>
36+
Christian Oudard <christian.oudard@gmail.com>
37+
Clark Boylan <clark.boylan@gmail.com>
38+
Clay McClure <clay@daemons.net>
39+
Cody Soyland <codysoyland@gmail.com>
40+
Cory Benfield <lukasaoz@gmail.com>
41+
Craig Kerstiens <craig.kerstiens@gmail.com>
42+
Cristian Sorinel <cristian.sorinel@gmail.com>
43+
Dan Savilonis <djs@n-cube.org>
44+
Dan Sully <daniel-github@electricrain.com>
45+
Daniel Collins <accounts@dac.io>
46+
Daniel Hahler <git@thequod.de>
47+
Daniel Holth <dholth@fastmail.fm>
48+
Daniel Jost <torpedojost@gmail.com>
49+
Daniele Procida <daniele@vurt.org>
50+
Dav Clark <davclark@gmail.com>
51+
Dave Abrahams <dave@boostpro.com>
52+
David Aguilar <davvid@gmail.com>
53+
David Black <db@d1b.org>
54+
David Evans <d@drhevans.com>
55+
David Pursehouse <david.pursehouse@gmail.com>
56+
David Wales <daviewales@gmail.com>
57+
Davidovich <david.genest@gmail.com>
58+
derwolfe <chriswwolfe@gmail.com>
59+
Dmitry Gladkov <dmitry.gladkov@gmail.com>
60+
Donald Stufft <donald@stufft.io>
61+
Dongweiming <dongweiming@admaster.com.cn>
62+
Dwayne Bailey <dwayne@translate.org.za>
63+
Endoh Takanao <djmchl@gmail.com>
64+
enoch <lanxenet@gmail.com>
65+
Eric Gillingham <Gillingham@bikezen.net>
66+
Eric Hanchrow <eric.hanchrow@gmail.com>
67+
Erik M. Bray <embray@stsci.edu>
68+
Eugene Vereshchagin <evvers@gmail.com>
69+
Florian Briand <ownerfrance+github@hotmail.com>
70+
Francesco <f.guerrieri@gmail.com>
71+
Gabriel de Perthuis <g2p.code@gmail.com>
72+
Garry Polley <garrympolley@gmail.com>
73+
Geoffrey Lehée <geoffrey@lehee.name>
74+
George Song <george@55minutes.com>
75+
Georgi Valkov <georgi.t.valkov@gmail.com>
76+
gizmoguy1 <gizmoguy1@gmail.com>
77+
Guilherme Espada <porcariadagata@gmail.com>
78+
Guy Rozendorn <guy@rzn.co.il>
79+
Herbert Pfennig <herbert@albinen.com>
80+
Hsiaoming Yang <lepture@me.com>
81+
Hugo Lopes Tavares <hltbra@gmail.com>
82+
Hynek Schlawack <hs@ox.cx>
83+
Ian Bicking <ianb@colorstudy.com>
84+
Ian Cordasco <graffatcolmingov@gmail.com>
85+
Igor Sobreira <igor@igorsobreira.com>
86+
Ilya Baryshev <baryshev@gmail.com>
87+
INADA Naoki <songofacandy@gmail.com>
88+
Ionel Cristian Mărieș <contact@ionelmc.ro>
89+
Ionel Maries Cristian <ionel.mc@gmail.com>
90+
Jakub Stasiak <kuba.stasiak@gmail.com>
91+
Jakub Vysoky <jakub@borka.cz>
92+
James Cleveland <jc@blit.cc>
93+
James Polley <jp@jamezpolley.com>
94+
Jan Pokorný <jpokorny@redhat.com>
95+
Jannis Leidel <jannis@leidel.info>
96+
jarondl <me@jarondl.net>
97+
Jay Graves <jay@skabber.com>
98+
Jeff Dairiki <dairiki@dairiki.org>
99+
Jim Garrison <jim@garrison.cc>
100+
John-Scott Atlakson <john.scott.atlakson@gmail.com>
101+
Jon Parise <jon@indelible.org>
102+
Jon Wayne Parrott <jjramone13@gmail.com>
103+
Jonas Nockert <jonasnockert@gmail.com>
104+
Jorge Niedbalski <niedbalski@gmail.com>
105+
Joseph Long <jdl@fastmail.fm>
106+
Josh Bronson <jabronson@gmail.com>
107+
Josh Hansen <josh@skwash.net>
108+
Josh Schneier <josh.schneier@gmail.com>
109+
Jyrki Pulliainen <jyrki@spotify.com>
110+
Kamal Bin Mustafa <kamal@smach.net>
111+
Kelsey Hightower <kelsey.hightower@gmail.com>
112+
Kenneth Belitzky <kenny@belitzky.com>
113+
Kenneth Reitz <me@kennethreitz.com>
114+
Kevin Burke <kev@inburke.com>
115+
Kevin Frommelt <kevin.frommelt@webfilings.com>
116+
Kumar McMillan <kumar.mcmillan@gmail.com>
117+
Kyle Persohn <kyle.persohn@gmail.com>
118+
Laurent Bristiel <laurent@bristiel.com>
119+
Leon Sasson <leonsassonha@gmail.com>
120+
Lev Givon <lev@columbia.edu>
121+
Lincoln de Sousa <lincoln@comum.org>
122+
Ludovic Gasc <gmludo@gmail.com>
123+
Luke Macken <lmacken@redhat.com>
124+
Marc Abramowitz <marc@marc-abramowitz.com>
125+
Marc Tamlyn <marc.tamlyn@gmail.com>
126+
Marcus Smith <qwcode@gmail.com>
127+
Mark Kohler <mark.kohler@proteinsimple.com>
128+
Markus Hametner <fin+github@xbhd.org>
129+
Masklinn <bitbucket.org@masklinn.net>
130+
Matej Stuchlik <mstuchli@redhat.com>
131+
Matt Good <matt@matt-good.net>
132+
Matt Maker <trip@monstro.us>
133+
Matt Robenolt <matt@ydekproductions.com>
134+
Matthew Einhorn <moiein2000@gmail.com>
135+
Matthew Gilliard <matthew.gilliard@gmail.com>
136+
Matthew Iversen <teh.ivo@gmail.com>
137+
Matthew Trumbell <matthew@thirdstonepartners.com>
138+
Maxime Rouyrre <rouyrre+git@gmail.com>
139+
Michael E. Karpeles <michael.karpeles@gmail.com>
140+
Michael Williamson <mike@zwobble.org>
141+
Miguel Araujo Perez <miguel.araujo.perez@gmail.com>
142+
Mihir Singh <git.service@mihirsingh.com>
143+
MinRK <benjaminrk@gmail.com>
144+
Monty Taylor <mordred@inaugust.com>
145+
Nick Stenning <nick@whiteink.com>
146+
Nowell Strite <nowell@strite.org>
147+
Oliver Tonnhofer <olt@bogosoft.com>
148+
Olivier Girardot <ssaboum@gmail.com>
149+
Ollie Rutherfurd <orutherfurd@gmail.com>
150+
Oren Held <orenhe@il.ibm.com>
151+
Oscar Benjamin <oscar.j.benjamin@gmail.com>
152+
Patrick Dubroy <pdubroy@gmail.com>
153+
Patrick Jenkins <patrick@socialgrowthtechnologies.com>
154+
Patrick Lawson <pl@foursquare.com>
155+
patricktokeeffe <patricktokeeffe@users.noreply.github.com>
156+
Paul Moore <p.f.moore@gmail.com>
157+
Paul Nasrat <pnasrat@gmail.com>
158+
Paul Oswald <pauloswald@gmail.com>
159+
Paul van der Linden <mail@paultjuh.org>
160+
Pawel Jasinski <pawel.jasinski@gmail.com>
161+
Peter Waller <peter.waller@gmail.com>
162+
Phaneendra Chiruvella <hi@pcx.io>
163+
Phil Freo <phil@philfreo.com>
164+
Phil Whelan <phil123@gmail.com>
165+
Philippe Ombredanne <pombredanne@gmail.com>
166+
Pierre-Yves Rofes <github@rofes.fr>
167+
Piet Delport <pjdelport@gmail.com>
168+
Preston Holmes <preston@ptone.com>
169+
Przemek Wrzos <hetmankp@none>
170+
Qiangning Hong <hongqn@gmail.com>
171+
Rafael Caricio <rafael.jacinto@gmail.com>
172+
Ralf Schmitt <ralf@systemexit.de>
173+
Razzi Abuissa <razzi53@gmail.com>
174+
Remi Rampin <remirampin@gmail.com>
175+
Rene Dudfield <renesd@gmail.com>
176+
Richard Jones <r1chardj0n3s@gmail.com>
177+
RobberPhex <robberphex@gmail.com>
178+
Robert Collins <rbtcollins@hp.com>
179+
Roey Berman <roey.berman@gmail.com>
180+
Roman Bogorodskiy <roman.bogorodskiy@ericsson.com>
181+
Romuald Brunet <romuald@chivil.com>
182+
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
183+
Rory McCann <rory@technomancy.org>
184+
Ross Brattain <ross.b.brattain@intel.com>
185+
schlamar <marc.schlaich@gmail.com>
186+
Sergey Vasilyev <nolar@nolar.info>
187+
Seth Woodworth <seth@sethish.com>
188+
Simeon Visser <svisser@users.noreply.github.com>
189+
Simon Cross <hodgestar@gmail.com>
190+
Stavros Korokithakis <stavros@korokithakis.net>
191+
Stefan Scherfke <stefan@sofa-rockers.org>
192+
Steven Myint <git@stevenmyint.com>
193+
Stéphane Klein <contact@stephane-klein.info>
194+
Takayuki SHIMIZUKAWA <shimizukawa@gmail.com>
195+
Thomas Fenzl <thomas.fenzl@gmail.com>
196+
Thomas Guettler <tguettler@tbz-pariv.de>
197+
Thomas Johansson <devnull@localhost>
198+
Thomas Kluyver <takowl@gmail.com>
199+
Tim Harder <radhermit@gmail.com>
200+
Tomer Chachamu <tomer.chachamu@gmail.com>
201+
Toshio Kuratomi <toshio@fedoraproject.org>
202+
Travis Swicegood <development@domain51.com>
203+
Valentin Haenel <valentin.haenel@gmx.de>
204+
Victor Stinner <victor.stinner@gmail.com>
205+
Vinay Sajip <vinay_sajip@yahoo.co.uk>
206+
Vitaly Babiy <vbabiy86@gmail.com>
207+
W. Trevor King <wking@drexel.edu>
208+
Wil Tan <wil@dready.org>
209+
Xavier Fernandez <xav.fernandez@gmail.com>
210+
Yoval P <yoval@gmx.com>
211+
Yu Jian <askingyj@gmail.com>
212+
Zearin <zearin@gonk.net>
213+
Zhiping Deng <kofreestyler@gmail.com>

0 commit comments

Comments
 (0)