Upgrade for pyramid 2.0. (#664)

- scaffolding is removed, changed to cookiecutter.
- dropped some python 2.7 code
- improved the dependencies in setup.py

Issue #648

.gitignore

@@ -77,25 +77,5 @@ atramhasis/static/node_modules
 atramhasis/static/admin/dist
 atramhasis/static/admin/node_modules
 
-atramhasis/scaffolds/atramhasis_demo/+package+/static/css
-atramhasis/scaffolds/atramhasis_demo/+package+/static/img
-atramhasis/scaffolds/atramhasis_demo/+package+/static/js
-atramhasis/scaffolds/atramhasis_demo/+package+/static/package.json
-atramhasis/scaffolds/atramhasis_demo/+package+/static/package-lock.json
-atramhasis/scaffolds/atramhasis_demo/+package+/static/scss/atramhasis
-atramhasis/scaffolds/atramhasis_demo/+package+/static/admin
-atramhasis/scaffolds/atramhasis_demo/atramhasis-requirements-dev.txt_tmpl
-atramhasis/scaffolds/atramhasis_demo/atramhasis-requirements.txt_tmpl
-
-atramhasis/scaffolds/atramhasis_scaffold/+package+/static/css
-atramhasis/scaffolds/atramhasis_scaffold/+package+/static/img
-atramhasis/scaffolds/atramhasis_scaffold/+package+/static/js
-atramhasis/scaffolds/atramhasis_scaffold/+package+/static/package.json
-atramhasis/scaffolds/atramhasis_scaffold/+package+/static/package-lock.json
-atramhasis/scaffolds/atramhasis_scaffold/+package+/static/scss/atramhasis
-atramhasis/scaffolds/atramhasis_scaffold/+package+/static/admin
-atramhasis/scaffolds/atramhasis_scaffold/atramhasis-requirements-dev.txt_tmpl
-atramhasis/scaffolds/atramhasis_scaffold/atramhasis-requirements.txt_tmpl
-
 # sqlite database created for tests.
 test.db

.travis.yml

@@ -1,15 +1,13 @@
 sudo: false
 language: python
 python:
- - "2.7"
  - "3.6"
  - "3.7"
  - "3.8"
 install:
  - pip install -U setuptools
- - pip install -r requirements-dev.txt #fix versions
+ - pip install -r requirements-dev.txt
  - python setup.py develop
- - pip install -U pytest pytest-cov coveralls webtest #install test deps
 script:
  - py.test --cov atramhasis --cov-report term-missing tests
 after_success:

atramhasis/renderers.py

@@ -1,43 +1,24 @@
 import csv
-import codecs
+from io import StringIO
 
-from six import StringIO, text_type, PY2
 from pyramid.renderers import JSON
-from skosprovider_sqlalchemy.models import Collection, Concept, Label, Note, Source, Language, ConceptScheme
-from pyramid_skosprovider.renderers import concept_adapter as skos_concept_adapter
 from pyramid_skosprovider.renderers import collection_adapter as skos_collection_adapter
+from pyramid_skosprovider.renderers import concept_adapter as skos_concept_adapter
 from pyramid_skosprovider.renderers import label_adapter as skos_label_adapter
 from pyramid_skosprovider.renderers import note_adapter as skos_note_adapter
 from pyramid_skosprovider.renderers import source_adapter as skos_source_adapter
-from skosprovider.skos import Concept as SkosConcept
 from skosprovider.skos import Collection as SkosCollection
+from skosprovider.skos import Concept as SkosConcept
 from skosprovider.skos import Label as SkosLabel
 from skosprovider.skos import Note as SkosNote
 from skosprovider.skos import Source as SkosSource
-
-
-class UnicodeWriter:
-    def __init__(self, f, dialect=csv.excel, encoding="utf-8", **kwds):
-        self.stream = f
-        self.writer = csv.writer(self.stream, dialect=dialect, **kwds)
-        self.encoder = codecs.getincrementalencoder(encoding)()
-
-    def writerow(self, row):  # pragma: no cover
-        # some ugly code to support python2
-        if PY2:
-            encoded_row = []
-            for s in row:
-                if isinstance(s, text_type):
-                    encoded_row.append(self.encoder.encode(s))
-                else:
-                    encoded_row.append(s)
-            self.writer.writerow(encoded_row)
-        else:
-            self.writer.writerow(row)
-
-    def writerows(self, rows):
-        for row in rows:
-            self.writerow(row)
+from skosprovider_sqlalchemy.models import Collection
+from skosprovider_sqlalchemy.models import Concept
+from skosprovider_sqlalchemy.models import ConceptScheme
+from skosprovider_sqlalchemy.models import Label
+from skosprovider_sqlalchemy.models import Language
+from skosprovider_sqlalchemy.models import Note
+from skosprovider_sqlalchemy.models import Source
 
 
 class CSVRenderer(object):
@@ -46,7 +27,7 @@ def __init__(self, info):
 
     def __call__(self, value, system):
         f_out = StringIO()
-        writer = UnicodeWriter(f_out, delimiter=',', quoting=csv.QUOTE_ALL)
+        writer = csv.writer(f_out, delimiter=',', quoting=csv.QUOTE_ALL)
 
         writer.writerow(value['header'])
         writer.writerows(value['rows'])