Skip to content

Commit 07d6d51

Browse files
committed
Sync moban
1 parent 569c3cc commit 07d6d51

File tree

2 files changed

+16
-66
lines changed

2 files changed

+16
-66
lines changed

.gitignore

Lines changed: 15 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ parts/
2525
sdist/
2626
var/
2727
wheels/
28+
pip-wheel-metadata/
29+
share/python-wheels/
2830
*.egg-info/
2931
.installed.cfg
3032
*.egg
@@ -248,6 +250,10 @@ flycheck_*.el
248250
# directory configuration
249251
.dir-locals.el
250252

253+
# network security
254+
/network-security.data
255+
256+
251257
# Vim rules
252258
# Swap
253259
[._]*.s[a-v][a-z]
@@ -393,11 +399,17 @@ tmtags
393399
#
394400
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
395401

396-
## Build generated
402+
## User settings
403+
xcuserdata/
404+
405+
## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
406+
*.xcscmblueprint
407+
*.xccheckout
408+
409+
## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
397410
build/
398411
DerivedData/
399-
400-
## Various settings
412+
*.moved-aside
401413
*.pbxuser
402414
!default.pbxuser
403415
*.mode1v3
@@ -406,68 +418,6 @@ DerivedData/
406418
!default.mode2v3
407419
*.perspectivev3
408420
!default.perspectivev3
409-
xcuserdata/
410-
411-
## Other
412-
*.moved-aside
413-
*.xccheckout
414-
*.xcscmblueprint
415-
416-
## Obj-C/Swift specific
417-
*.hmap
418-
*.ipa
419-
*.dSYM.zip
420-
*.dSYM
421-
422-
## Playgrounds
423-
timeline.xctimeline
424-
playground.xcworkspace
425-
426-
# Swift Package Manager
427-
#
428-
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
429-
# Packages/
430-
# Package.pins
431-
# Package.resolved
432-
.build/
433-
434-
# CocoaPods
435-
#
436-
# We recommend against adding the Pods directory to your .gitignore. However
437-
# you should judge for yourself, the pros and cons are mentioned at:
438-
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
439-
#
440-
# Pods/
441-
#
442-
# Add this line if you want to avoid checking in source code from the Xcode workspace
443-
# *.xcworkspace
444-
445-
# Carthage
446-
#
447-
# Add this line if you want to avoid checking in source code from Carthage dependencies.
448-
# Carthage/Checkouts
449-
450-
Carthage/Build
451-
452-
# fastlane
453-
#
454-
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
455-
# screenshots whenever they are needed.
456-
# For more information about the recommended setup visit:
457-
# https://docs.fastlane.tools/best-practices/source-control/#source-control
458-
459-
fastlane/report.xml
460-
fastlane/Preview.html
461-
fastlane/screenshots/**/*.png
462-
fastlane/test_output
463-
464-
# Code Injection
465-
#
466-
# After new code Injection tools there's a generated folder /iOSInjectionProject
467-
# https://github.com/johnno1962/injectionforxcode
468-
469-
iOSInjectionProject/
470-
471421

472422
# Eclipse rules
473423

test-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ coverage==4.4.1
1010
coverage-env-plugin~=0.1
1111
coverage-config-reload-plugin~=0.2
1212
codecov~=2.0.5
13-
moban~=0.3.3
13+
moban~=0.3.3 ; python_version > '3.0'
1414
packaging~=16.8
1515
pytest~=3.6.1
1616
pytest-cov~=2.4

0 commit comments

Comments
 (0)