Skip to content

Commit

Permalink
Remove pygments test dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
axnsan12 committed Jun 12, 2019
1 parent e9d5344 commit 64d9d42
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 494 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion requirements/testproj.txt
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
23 changes: 23 additions & 0 deletions testproj/snippets/migrations/0004_auto_20190613_0154.py
Original file line number Diff line number Diff line change
@@ -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),
),
]
9 changes: 3 additions & 6 deletions testproj/snippets/models.py
Original file line number Diff line number Diff line change
@@ -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):
Expand All @@ -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',)
Expand Down
2 changes: 1 addition & 1 deletion testproj/snippets/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)])
Expand Down

0 comments on commit 64d9d42

Please sign in to comment.