Skip to content

Commit 7da4941

Browse files
committed
Fix travis syntax and update submodules
1 parent 5dc0330 commit 7da4941

File tree

4 files changed

+55
-49
lines changed

4 files changed

+55
-49
lines changed

.gitignore

Lines changed: 42 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,10 @@ htmlcov/
5252
nosetests.xml
5353
coverage.xml
5454
*.cover
55+
*.py,cover
5556
.hypothesis/
5657
.pytest_cache/
58+
cover/
5759

5860
# Translations
5961
*.mo
@@ -63,6 +65,7 @@ coverage.xml
6365
*.log
6466
local_settings.py
6567
db.sqlite3
68+
db.sqlite3-journal
6669

6770
# Flask stuff:
6871
instance/
@@ -75,6 +78,7 @@ instance/
7578
docs/_build/
7679

7780
# PyBuilder
81+
.pybuilder/
7882
target/
7983

8084
# Jupyter Notebook
@@ -85,17 +89,23 @@ profile_default/
8589
ipython_config.py
8690

8791
# pyenv
88-
.python-version
92+
# For a library or package, you might want to ignore these files since the code is
93+
# intended to run in multiple environments; otherwise, check them in:
94+
# .python-version
8995

9096
# pipenv
9197
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
9298
# However, in case of collaboration, if having platform-specific dependencies or dependencies
93-
# having no cross-platform support, pipenv may install dependencies that dont work, or not
99+
# having no cross-platform support, pipenv may install dependencies that don't work, or not
94100
# install all needed dependencies.
95101
#Pipfile.lock
96102

97-
# celery beat schedule file
103+
# PEP 582; used by e.g. github.com/David-OConnor/pyflow
104+
__pypackages__/
105+
106+
# Celery stuff
98107
celerybeat-schedule
108+
celerybeat.pid
99109

100110
# SageMath parsed files
101111
*.sage.py
@@ -127,6 +137,16 @@ dmypy.json
127137
# Pyre type checker
128138
.pyre/
129139

140+
# pytype static type analyzer
141+
.pytype/
142+
143+
# Cython debug symbols
144+
cython_debug/
145+
146+
# static files generated from Django application using `collectstatic`
147+
media
148+
static
149+
130150
# VirtualEnv rules
131151
# Virtualenv
132152
# http://iamzed.com/2009/05/07/a-primer-on-virtualenv/
@@ -159,6 +179,7 @@ pip-selfcheck.json
159179
# Windows rules
160180
# Windows thumbnail cache files
161181
Thumbs.db
182+
Thumbs.db:encryptable
162183
ehthumbs.db
163184
ehthumbs_vista.db
164185

@@ -264,13 +285,15 @@ flycheck_*.el
264285
# Vim rules
265286
# Swap
266287
[._]*.s[a-v][a-z]
288+
!*.svg # comment out if you don't need vector files
267289
[._]*.sw[a-p]
268290
[._]s[a-rt-v][a-z]
269291
[._]ss[a-gi-z]
270292
[._]sw[a-p]
271293

272294
# Session
273295
Session.vim
296+
Sessionx.vim
274297

275298
# Temporary
276299
.netrwhist
@@ -281,7 +304,7 @@ tags
281304
[._]*.un~
282305

283306
# JetBrains rules
284-
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
307+
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
285308
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
286309

287310
# User-specific stuff
@@ -311,9 +334,14 @@ tags
311334
# When using Gradle or Maven with auto-import, you should exclude module files,
312335
# since they will be recreated, and may cause churn. Uncomment if using
313336
# auto-import.
337+
# .idea/artifacts
338+
# .idea/compiler.xml
339+
# .idea/jarRepositories.xml
314340
# .idea/modules.xml
315341
# .idea/*.iml
316342
# .idea/modules
343+
# *.iml
344+
# *.ipr
317345

318346
# CMake
319347
cmake-build-*/
@@ -363,6 +391,7 @@ fabric.properties
363391

364392
# SFTP configuration file
365393
sftp-config.json
394+
sftp-config-alt*.json
366395

367396
# Package control specific files
368397
Package Control.last-run
@@ -400,6 +429,7 @@ tmtags
400429
!.vscode/tasks.json
401430
!.vscode/launch.json
402431
!.vscode/extensions.json
432+
*.code-workspace
403433

404434
# Xcode rules
405435
# Xcode
@@ -426,6 +456,9 @@ DerivedData/
426456
*.perspectivev3
427457
!default.perspectivev3
428458

459+
## Gcc Patch
460+
/*.gcno
461+
429462
# Eclipse rules
430463
.metadata
431464
bin/
@@ -477,12 +510,17 @@ local.properties
477510

478511
# Annotation Processing
479512
.apt_generated/
513+
.apt_generated_test/
480514

481515
# Scala IDE specific (Scala & Java development for Eclipse)
482516
.cache-main
483517
.scala_dependencies
484518
.worksheet
485519

520+
# Uncomment this line if you wish to ignore the project description file.
521+
# Typically, this file would be tracked if it contains build/dependency configurations:
522+
#.project
523+
486524
# TortoiseGit rules
487525
# Project-level settings
488526
/.tgitconfig

.travis.yml

Lines changed: 10 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -7,47 +7,6 @@ python:
77
- 3.7
88
- 2.7
99

10-
stages:
11-
- lint
12-
- moban
13-
- test
14-
15-
.disable_global: &disable_global
16-
addons: false
17-
cache: false
18-
env: {}
19-
python: false
20-
before_install: false
21-
install: false
22-
before_script: false
23-
script: false
24-
after_success: false
25-
after_failure: false
26-
before_deploy: false
27-
deploy: false
28-
29-
.lint: &lint
30-
<<: *disable_global
31-
git:
32-
submodules: false
33-
python: 3.6
34-
stage: lint
35-
script: make install_test lint
36-
37-
.moban: &moban
38-
<<: *disable_global
39-
python: 3.6
40-
stage: moban
41-
install: pip install moban>=0.0.4 gitfs2 pypifs
42-
script: make upstreaming git-diff-check
43-
44-
jobs:
45-
include:
46-
- *moban
47-
- *lint
48-
49-
stage: test
50-
5110
before_install:
5211
- if [[ -f min_requirements.txt && "$MINREQ" -eq 1 ]]; then
5312
mv min_requirements.txt requirements.txt ;
@@ -65,3 +24,13 @@ script:
6524
- pytest
6625
after_success:
6726
codecov
27+
28+
29+
jobs:
30+
include:
31+
- stage: lint
32+
before_install: false
33+
script: make install_test lint
34+
- stage: moban
35+
install: pip install moban>=0.0.4 gitfs2 pypifs
36+
script: make upstreaming git-diff-check

README.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@ pypi-mobans
77

88
.. image:: https://codecov.io/github/moremoban/pypi-mobans/coverage.png
99
:target: https://codecov.io/github/moremoban/pypi-mobans
10-
.. image:: https://img.shields.io/github/stars/moremoban/pypi-mobans.svg?style=social&maxAge=3600&label=Star
11-
:target: https://github.com/moremoban/pypi-mobans/stargazers
12-
1310
.. image:: https://img.shields.io/gitter/room/gitterHQ/gitter.svg
1411
:target: https://gitter.im/chfw_moban/Lobby
12+
.. image:: https://img.shields.io/github/stars/moremoban/pypi-mobans.svg?style=social&maxAge=3600&label=Star
13+
:target: https://github.com/moremoban/pypi-mobans/stargazers
1514

1615

1716
Scaffolding templates for your Python project.

0 commit comments

Comments
 (0)