mirror of
				https://github.com/paperless-ngx/paperless-ngx.git
				synced 2025-11-04 03:27:12 -05:00 
			
		
		
		
	Consolidate CI tools into setup.cfg and drop tox
This commit is contained in:
		
							parent
							
								
									1f68223752
								
							
						
					
					
						commit
						a55a915439
					
				
							
								
								
									
										10
									
								
								.travis.yml
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								.travis.yml
									
									
									
									
									
								
							@ -9,16 +9,14 @@ sudo: false
 | 
				
			|||||||
matrix:
 | 
					matrix:
 | 
				
			||||||
    include:
 | 
					    include:
 | 
				
			||||||
        - python: 3.4
 | 
					        - python: 3.4
 | 
				
			||||||
          env: TOXENV=py34
 | 
					 | 
				
			||||||
        - python: 3.5
 | 
					        - python: 3.5
 | 
				
			||||||
          env: TOXENV=py35
 | 
					 | 
				
			||||||
        - python: 3.6
 | 
					        - python: 3.6
 | 
				
			||||||
          env: TOXENV=py36
 | 
					 | 
				
			||||||
        - python: 3.6
 | 
					        - python: 3.6
 | 
				
			||||||
          env: TOXENV=pycodestyle
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
install:
 | 
					install:
 | 
				
			||||||
    - pip install --requirement requirements.txt
 | 
					    - pip install --requirement requirements.txt
 | 
				
			||||||
    - pip install tox
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
script: tox -c src/tox.ini
 | 
					script:
 | 
				
			||||||
 | 
					    - pytest src/
 | 
				
			||||||
 | 
					    - pycodestyle src/
 | 
				
			||||||
 | 
					    - coveralls
 | 
				
			||||||
 | 
				
			|||||||
@ -1,8 +1,15 @@
 | 
				
			|||||||
[pytest]
 | 
					[pycodestyle]
 | 
				
			||||||
 | 
					exclude = migrations, paperless/settings.py
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					[tool:pytest]
 | 
				
			||||||
DJANGO_SETTINGS_MODULE=paperless.settings
 | 
					DJANGO_SETTINGS_MODULE=paperless.settings
 | 
				
			||||||
addopts = --pythonwarnings=all
 | 
					addopts = --pythonwarnings=all -n auto
 | 
				
			||||||
env =
 | 
					env =
 | 
				
			||||||
  PAPERLESS_CONSUME=/tmp
 | 
					  PAPERLESS_CONSUME=/tmp
 | 
				
			||||||
  PAPERLESS_PASSPHRASE=THISISNOTASECRET
 | 
					  PAPERLESS_PASSPHRASE=THISISNOTASECRET
 | 
				
			||||||
  PAPERLESS_SECRET=paperless
 | 
					  PAPERLESS_SECRET=paperless
 | 
				
			||||||
  PAPERLESS_EMAIL_SECRET=paperless
 | 
					  PAPERLESS_EMAIL_SECRET=paperless
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					[coverage:paths]
 | 
				
			||||||
 | 
					source = ./
 | 
				
			||||||
							
								
								
									
										22
									
								
								src/tox.ini
									
									
									
									
									
								
							
							
						
						
									
										22
									
								
								src/tox.ini
									
									
									
									
									
								
							@ -1,22 +0,0 @@
 | 
				
			|||||||
# Tox (http://tox.testrun.org/) is a tool for running tests
 | 
					 | 
				
			||||||
# in multiple virtualenvs. This configuration file will run the
 | 
					 | 
				
			||||||
# test suite on all supported python versions. To use it, "pip install tox"
 | 
					 | 
				
			||||||
# and then run "tox" from this directory.
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
[tox]
 | 
					 | 
				
			||||||
skipsdist = True
 | 
					 | 
				
			||||||
envlist = py34, py35, py36, pycodestyle
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
[testenv]
 | 
					 | 
				
			||||||
commands = pytest
 | 
					 | 
				
			||||||
deps = -r{toxinidir}/../requirements.txt
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
[testenv:pycodestyle]
 | 
					 | 
				
			||||||
commands=pycodestyle
 | 
					 | 
				
			||||||
deps=pycodestyle
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
[pycodestyle]
 | 
					 | 
				
			||||||
exclude=
 | 
					 | 
				
			||||||
  .tox,
 | 
					 | 
				
			||||||
  migrations,
 | 
					 | 
				
			||||||
  paperless/settings.py
 | 
					 | 
				
			||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user