diff --git a/.gitignore b/.gitignore index da70062..5e0c73d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ testproj/db.sqlite3 testproj/staticfiles \.pytest_cache/ docs/\.doctrees/ +pip-wheel-metadata/ # Created by .ignore support plugin (hsz.mobi) ### Python template diff --git a/requirements/testproj.txt b/requirements/testproj.txt index 9f65814..ec40130 100644 --- a/requirements/testproj.txt +++ b/requirements/testproj.txt @@ -1,6 +1,5 @@ # test project requirements Pillow>=4.3.0 -pygments>=2.2.0 django-cors-headers>=2.1.0 django-filter>=1.1.0,<2.0; python_version == "2.7" django-filter>=1.1.0; python_version >= "3.4" diff --git a/testproj/snippets/migrations/0004_auto_20190613_0154.py b/testproj/snippets/migrations/0004_auto_20190613_0154.py new file mode 100644 index 0000000..c6eedf2 --- /dev/null +++ b/testproj/snippets/migrations/0004_auto_20190613_0154.py @@ -0,0 +1,23 @@ +# Generated by Django 2.2.2 on 2019-06-12 22:54 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('snippets', '0003_snippetviewer'), + ] + + operations = [ + migrations.AlterField( + model_name='snippet', + name='language', + field=models.CharField(choices=[('cpp', 'cpp'), ('js', 'js'), ('python', 'python')], default='python', max_length=100), + ), + migrations.AlterField( + model_name='snippet', + name='style', + field=models.CharField(choices=[('monokai', 'monokai'), ('solarized-dark', 'solarized-dark'), ('vim', 'vim')], default='solarized-dark', max_length=100), + ), + ] diff --git a/testproj/snippets/models.py b/testproj/snippets/models.py index 1ad36c5..5bcef18 100644 --- a/testproj/snippets/models.py +++ b/testproj/snippets/models.py @@ -1,10 +1,7 @@ from django.db import models -from pygments.lexers import get_all_lexers -from pygments.styles import get_all_styles -LEXERS = [item for item in get_all_lexers() if item[1]] -LANGUAGE_CHOICES = sorted([(item[1][0], item[0]) for item in LEXERS]) -STYLE_CHOICES = sorted((item, item) for item in get_all_styles()) +LANGUAGE_CHOICES = sorted((item, item) for item in ('cpp', 'python', 'js')) +STYLE_CHOICES = sorted((item, item) for item in ('solarized-dark', 'monokai', 'vim')) class Snippet(models.Model): @@ -14,7 +11,7 @@ class Snippet(models.Model): code = models.TextField(help_text="code model help text") linenos = models.BooleanField(default=False) language = models.CharField(choices=LANGUAGE_CHOICES, default='python', max_length=100) - style = models.CharField(choices=STYLE_CHOICES, default='friendly', max_length=100) + style = models.CharField(choices=STYLE_CHOICES, default='solarized-dark', max_length=100) class Meta: ordering = ('created',) diff --git a/testproj/snippets/serializers.py b/testproj/snippets/serializers.py index 949203b..623bacc 100644 --- a/testproj/snippets/serializers.py +++ b/testproj/snippets/serializers.py @@ -69,7 +69,7 @@ class SnippetSerializer(serializers.Serializer): tags = serializers.ListField(child=serializers.CharField(min_length=2), min_length=3, max_length=15) linenos = serializers.BooleanField(required=False) language = LanguageSerializer(help_text="Sample help text for language") - styles = serializers.MultipleChoiceField(choices=STYLE_CHOICES, default=['friendly']) + styles = serializers.MultipleChoiceField(choices=STYLE_CHOICES, default=['solarized-dark']) lines = serializers.ListField(child=serializers.IntegerField(), allow_empty=True, allow_null=True, required=False) example_projects = serializers.ListSerializer(child=ExampleProjectSerializer(), read_only=True, validators=[MaxLengthValidator(100)]) diff --git a/tests/reference.yaml b/tests/reference.yaml index b283309..85a8bd9 100644 --- a/tests/reference.yaml +++ b/tests/reference.yaml @@ -1176,461 +1176,9 @@ definitions: description: The name of the programming language type: string enum: - - abap - - abnf - - ada - - adl - - agda - - aheui - - ahk - - alloy - - ampl - - antlr - - antlr-as - - antlr-cpp - - antlr-csharp - - antlr-java - - antlr-objc - - antlr-perl - - antlr-python - - antlr-ruby - - apacheconf - - apl - - applescript - - arduino - - as - - as3 - - aspectj - - aspx-cs - - aspx-vb - - asy - - at - - augeas - - autoit - - awk - - basemake - - bash - - bat - - bbcbasic - - bbcode - - bc - - befunge - - bib - - blitzbasic - - blitzmax - - bnf - - boa - - boo - - boogie - - brainfuck - - bro - - bst - - bugs - - c - - c-objdump - - ca65 - - cadl - - camkes - - capdl - - capnp - - cbmbas - - ceylon - - cfc - - cfengine3 - - cfm - - cfs - - chai - - chapel - - charmci - - cheetah - - cirru - - clay - - clean - - clojure - - clojurescript - - cmake - - cobol - - cobolfree - - coffee-script - - common-lisp - - componentpascal - - console - - control - - coq - cpp - - cpp-objdump - - cpsa - - cr - - crmsh - - croc - - cryptol - - csharp - - csound - - csound-document - - csound-score - - css - - css+django - - css+erb - - css+genshitext - - css+lasso - - css+mako - - css+mozpreproc - - css+myghty - - css+php - - css+smarty - - cucumber - - cuda - - cypher - - cython - - d - - d-objdump - - dart - - dasm16 - - delphi - - dg - - diff - - django - - docker - - doscon - - dpatch - - dtd - - duel - - dylan - - dylan-console - - dylan-lid - - earl-grey - - easytrieve - - ebnf - - ec - - ecl - - eiffel - - elixir - - elm - - emacs - - erb - - erl - - erlang - - evoque - - extempore - - ezhil - - factor - - fan - - fancy - - felix - - fennel - - fish - - flatline - - floscript - - forth - - fortran - - fortranfixed - - foxpro - - freefem - - fsharp - - gap - - gas - - genshi - - genshitext - - glsl - - gnuplot - - go - - golo - - gooddata-cl - - gosu - - groff - - groovy - - gst - - haml - - handlebars - - haskell - - haxeml - - hexdump - - hlsl - - hsail - - hspec - - html - - html+cheetah - - html+django - - html+evoque - - html+genshi - - html+handlebars - - html+lasso - - html+mako - - html+myghty - - html+ng2 - - html+php - - html+smarty - - html+twig - - html+velocity - - http - - hx - - hybris - - hylang - - i6t - - icon - - idl - - idris - - iex - - igor - - inform6 - - inform7 - - ini - - io - - ioke - - irc - - isabelle - - j - - jags - - jasmin - - java - - javascript+mozpreproc - - jcl - - jlcon - js - - js+cheetah - - js+django - - js+erb - - js+genshitext - - js+lasso - - js+mako - - js+myghty - - js+php - - js+smarty - - jsgf - - json - - json-object - - jsonld - - jsp - - julia - - juttle - - kal - - kconfig - - koka - - kotlin - - lagda - - lasso - - lcry - - lean - - less - - lhs - - lidr - - lighty - - limbo - - liquid - - live-script - - llvm - - logos - - logtalk - - lsl - - lua - - make - - mako - - maql - - mask - - mason - - mathematica - - matlab - - matlabsession - - md - - minid - - modelica - - modula2 - - monkey - - monte - - moocode - - moon - - mozhashpreproc - - mozpercentpreproc - - mql - - mscgen - - mupad - - mxml - - myghty - - mysql - - nasm - - ncl - - nemerle - - nesc - - newlisp - - newspeak - - ng2 - - nginx - - nim - - nit - - nixos - - nsis - - numpy - - nusmv - - objdump - - objdump-nasm - - objective-c - - objective-c++ - - objective-j - - ocaml - - octave - - odin - - ooc - - opa - - openedge - - pacmanconf - - pan - - parasail - - pawn - - perl - - perl6 - - php - - pig - - pike - - pkgconfig - - plpgsql - - pony - - postgresql - - postscript - - pot - - pov - - powershell - - praat - - prolog - - properties - - protobuf - - ps1con - - psql - - pug - - puppet - - py3tb - - pycon - - pypylog - - pytb - python - - python3 - - qbasic - - qml - - qvto - - racket - - ragel - - ragel-c - - ragel-cpp - - ragel-d - - ragel-em - - ragel-java - - ragel-objc - - ragel-ruby - - raw - - rb - - rbcon - - rconsole - - rd - - rebol - - red - - redcode - - registry - - resource - - rexx - - rhtml - - rnc - - roboconf-graph - - roboconf-instances - - robotframework - - rql - - rsl - - rst - - rts - - rust - - sarl - - sas - - sass - - sc - - scala - - scaml - - scheme - - scilab - - scss - - sgf - - shen - - silver - - slash - - slim - - slurm - - smali - - smalltalk - - smarty - - sml - - snobol - - snowball - - sourceslist - - sp - - sparql - - spec - - splus - - sql - - sqlite3 - - squidconf - - ssp - - stan - - stata - - swift - - swig - - systemverilog - - tads3 - - tap - - tasm - - tcl - - tcsh - - tcshcon - - tea - - termcap - - terminfo - - terraform - - tex - - text - - thrift - - todotxt - - toml - - trac-wiki - - treetop - - ts - - tsql - - ttl - - turtle - - twig - - typoscript - - typoscriptcssdata - - typoscripthtmldata - - ucode - - unicon - - urbiscript - - vala - - vb.net - - vcl - - vclsnippets - - vctreestatus - - velocity - - verilog - - vgl - - vhdl - - vim - - wdiff - - whiley - - x10 - - xml - - xml+cheetah - - xml+django - - xml+erb - - xml+evoque - - xml+lasso - - xml+mako - - xml+myghty - - xml+php - - xml+smarty - - xml+velocity - - xorg.conf - - xquery - - xslt - - xtend - - xul+mozpreproc - - yaml - - yaml+jinja - - zephir default: python readOnlyNullable: title: Read only nullable @@ -1643,43 +1191,11 @@ definitions: items: type: string enum: - - abap - - algol - - algol_nu - - arduino - - autumn - - borland - - bw - - colorful - - default - - emacs - - friendly - - fruity - - igor - - lovelace - - manni - monokai - - murphy - - native - - paraiso-dark - - paraiso-light - - pastie - - perldoc - - rainbow_dash - - rrt - - sas - solarized-dark - - solarized-light - - stata - - stata-dark - - stata-light - - tango - - trac - vim - - vs - - xcode default: - - friendly + - solarized-dark lines: type: array items: diff --git a/tox.ini b/tox.ini index 58b0851..29800b2 100644 --- a/tox.ini +++ b/tox.ini @@ -77,6 +77,6 @@ known_standard_library = types,warnings known_third_party = coreapi,coreschema,datadiff,dj_database_url,django,django_filters,djangorestframework_camel_case, - rest_framework_recursive,flex,gunicorn,inflection,pygments,pytest,rest_framework,ruamel,setuptools_scm, + rest_framework_recursive,flex,gunicorn,inflection,pytest,rest_framework,ruamel,setuptools_scm, swagger_spec_validator,uritemplate,user_agents,whitenoise,oauth2_provider known_first_party = drf_yasg,testproj,articles,people,snippets,todo,users,urlconfs