Python3 compatibility #319
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| version: 2 | ||
|
|
||
| jobs: | ||
|
|
||
| build-python27: &job-template | ||
| docker: | ||
| - image: python:2.7.13 | ||
| working_directory: ~/ocropy-build | ||
| steps: | ||
| - checkout | ||
| - restore_cache: | ||
| keys: | ||
| - default-model-{{ .Environment.CIRCLE_JOB }} | ||
| - run: '(cd models && wget -nc http://www.tmbdev.net/en-default.pyrnn.gz)' | ||
| - save_cache: | ||
| key: default-model-{{ .Environment.CIRCLE_JOB }} | ||
| paths: | ||
| - models | ||
| - run: pip install --user . | ||
| - run: ./run-test-ci | ||
|
|
||
| build-python34: | ||
| <<: *job-template | ||
| docker: | ||
| - image: circleci/python:3.5 | ||
|
|
||
| build-python35: | ||
| <<: *job-template | ||
| docker: | ||
| - image: circleci/python:3.5 | ||
|
|
||
| build-python36: | ||
| <<: *job-template | ||
| docker: | ||
| - image: circleci/python:3.6 | ||
|
|
||
| build-python37: | ||
| <<: *job-template | ||
| docker: | ||
| - image: circleci/python:3.7 | ||
|
|
||
| workflows: | ||
| version: 2 | ||
| build: | ||
| jobs: | ||
| - build-python27 | ||
| - build-python35 | ||
| - build-python36 | ||
| - build-python37 | ||
|
Comment on lines
+46
to
+49
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,3 +15,6 @@ build/ | |
| .~*.vue | ||
| doc/.ipynb_checkpoints/ | ||
| htmlcov/ | ||
| dist | ||
| *.egg-info | ||
| linegen/ | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,49 +1,23 @@ | ||
| language: python | ||
| python: | ||
| - "2.7" | ||
| - "3.4" | ||
| - "3.5" | ||
| - "3.6" | ||
| - "3.7-dev" | ||
|
There was a problem hiding this comment. Why does this work now without this whole miniconda stuff? This makes it much easier... There was a problem hiding this comment. It always worked without miniconda (see circle config and install instructions) but since @QuLogic went through the effort of setting it up with conda, we retained it in travis. I don't know enough about how to change the conda setup to test the various versions, so this seemed the simplest solution. There was a problem hiding this comment. The conda environment is created with But originally, miniconda was only necessary because SciPy took forever to compile from source; I assume there are wheels now. Also, 3.7 is GA, you should use it and not 3.7-dev which is a very old snapshot. |
||
|
|
||
| sudo: false | ||
|
|
||
| cache: | ||
| directories: | ||
| - $HOME/.cache/matplotlib | ||
| - $HOME/.cache/pip | ||
| - models | ||
|
|
||
| install: | ||
| - (cd models && wget -nc http://www.tmbdev.net/en-default.pyrnn.gz) | ||
| - pip install . | ||
|
|
||
| script: | ||
| - ./tests/run-unit | ||
| - ./run-test-ci | ||
|
There was a problem hiding this comment. What happened with There was a problem hiding this comment. Will fix. Just an oversight. |
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| python-scipy python-matplotlib python-lxml python-six |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ ocropy | |
| ====== | ||
|
|
||
| [](https://travis-ci.org/tmbdev/ocropy) | ||
| [](https://circleci.com/gh/OCR-D/ocropy.png) | ||
| [](https://hub.docker.com/r/ubma/ocropy/) [](https://hub.docker.com/r/ubma/ocropy/) | ||
| [](https://github.com/tmbdev/ocropy/blob/master/LICENSE) | ||
| [](https://github.com/tmbdev/ocropy/wiki) | ||
|
There was a problem hiding this comment. It is mentioned in the README and done in the Dockerfile: But then some warnings show up: Should this be changed? As you already do it now with There was a problem hiding this comment. I tried to install the new version on Python 2.7 with There was a problem hiding this comment. The The best way to install IMHO is to create virtualenv with a specific python version, source it, update pip and do Otherwise it's always possible that either the python version, setuptools, pip or system-wide dependency requirements can mess up things. I would avoid system-wide There was a problem hiding this comment. Using |
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,12 @@ | ||
| __all__ = [ | ||
| "common", | ||
| "trace", | ||
| "default", | ||
|
There was a problem hiding this comment. Can these changes break possibly for someone who is relying on importing from There was a problem hiding this comment. If I understand this correctly, then the There was a problem hiding this comment. This might indeed break stuff, because |
||
| ] | ||
|
|
||
| ################################################################ | ||
| ### top level imports | ||
| ################################################################ | ||
|
|
||
| from .default import traceback as trace | ||
| from .common import * | ||
|
There was a problem hiding this comment. For what are these import statements needed at all? There was a problem hiding this comment. See above. They are imported to be exported, so users can write from ocrolib import allsplitextinstead of from ocrolib.common import allsplitext |
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This was previously
circleci.yml. What caused the renaming? Unfortunatelygitdid not recognize this as a renaming...There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Circle CI switched from 1.0 to 2.0 in August last year which is very different (
.circle/config.ymlinstead of.circleci.yml, job/workflow based semantics, containers based directly on docker etc.)