Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Moban sync #2980

Merged
merged 2 commits into from
Oct 3, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci/check_unsupported.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ fi
set -e

# The following is emitted on stdout
grep -q 'coala supports only Python 3.4.* or later' setup.log
grep -q 'coala supports only Python 3.5.* or later' setup.log
# The following is emitted on stderr
grep -q 'error: Setup script exited with 4' setup.log

Expand Down
31 changes: 15 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,23 @@ cache: &global_cache
- $HOME/.local/

.disable_global: &disable_global
addons: false
addons: {}
cache: false
env: {}
python: false
before_install: false
install: false
before_script: false
script: false
after_success: false
after_failure: false
before_deploy: false
deploy: false
before_install: []
install: []
before_script: []
script: []
after_success: []
after_failure: []
before_deploy: []
deploy: {}

.moban: &moban
<<: *disable_global
python: 3.6
stage: moban
install: pip install moban>=0.0.4
install: pip install moban~=0.5.0 gitfs2 pypifs
script:
- moban
- git diff --exit-code
Expand Down Expand Up @@ -200,12 +199,12 @@ jobs:

- python: 3.6
stage: sentinel
before_install: false
install: pip install moban
before_script: false
before_install: []
install: pip install moban~=0.5.0 gitfs2 pypifs
before_script: []
script: .ci/check_moban.sh
after_success: false
after_failure: false
after_success: []
after_failure: []

# Entries generates from `supported_versions`
- stage: sentinel
Expand Down
Binary file added prof/combined.prof
Binary file not shown.
Binary file added prof/requirements.txt.prof
Binary file not shown.
Binary file added prof/test-requirements.txt.prof
Binary file not shown.
Binary file added prof/test_cve_key_checker.prof
Binary file not shown.
Binary file added prof/test_with_no_pinned_requirements.prof
Binary file not shown.
Binary file added prof/test_with_no_requirements.prof
Binary file not shown.
Binary file added prof/test_with_vulnerability.prof
Binary file not shown.
Binary file added prof/test_without_vulnerability.prof
Binary file not shown.
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
'Operating System :: OS Independent',

'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3 :: Only',
Expand Down
4 changes: 2 additions & 2 deletions test-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ colorama<0.4
coverage==4.4.1
coverage-env-plugin~=0.1
coverage-config-reload-plugin~=0.2
codecov~=2.0.5
codecov~=2.1.0
moban~=0.5.0 ; python_version > '3.0'
packaging~=16.8
pytest~=3.6.4
pytest~=4.6
pytest-cov~=2.4
pytest-env~=0.6.0
pytest-instafail~=0.3.0
Expand Down
2 changes: 1 addition & 1 deletion tests/python/requirements/PySafetyBearTest.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def test_with_vulnerability(self):
'bears.python.requirements.PySafetyBear.safety.check',
return_value=[Vulnerability('bar', '<0.2', '0.1', 'foo', '123')],
) as check:
self.check_invalidity(self.uut, ['foo<2', 'bar==0.1', '**bar'])
self.check_invalidity(self.uut, ['foo<2', 'bar==0.1'])
check.assert_called_once_with([Package('bar', '0.1')], key=None,
db_mirror=self.uut.db_path,
cached=False, ignore_ids=[],
Expand Down