Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MyPy in CI [WIP] #378

Merged
merged 22 commits into from
Jun 13, 2020
Merged

MyPy in CI [WIP] #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
8e6a5d3
MyPy related cleanup
adam-urbanczyk Jun 9, 2020
b58e920
Simple mypy conf
adam-urbanczyk Jun 9, 2020
ac01291
Run mypy on travis
adam-urbanczyk Jun 9, 2020
275f3ee
Install mypy before using it
adam-urbanczyk Jun 9, 2020
3f20bc6
Remove unused functions
adam-urbanczyk Jun 10, 2020
9fb12fa
Added some type annotations to geom
adam-urbanczyk Jun 10, 2020
ca459ae
Started adding annotations + minor cleanups
adam-urbanczyk Jun 10, 2020
7f784b5
Apply black
adam-urbanczyk Jun 10, 2020
8be6367
find/replace typo fix
adam-urbanczyk Jun 10, 2020
6e956f1
mypy.ini cleanup
adam-urbanczyk Jun 11, 2020
c75d0d9
Install OCP-stubs before running mypy in travis
adam-urbanczyk Jun 11, 2020
84961a4
Try without ignoring missing imports
adam-urbanczyk Jun 11, 2020
bdfb7d8
Install ocp before running mypy
adam-urbanczyk Jun 11, 2020
8313842
More explicit ignoring import policy
adam-urbanczyk Jun 11, 2020
c48c989
install mypy via conda
adam-urbanczyk Jun 11, 2020
2c82238
Mypy debugging
adam-urbanczyk Jun 11, 2020
c00f737
Cleanup of travis.yml
adam-urbanczyk Jun 11, 2020
8195c27
Added annotations to BoundBox
adam-urbanczyk Jun 12, 2020
0b94212
Added coveragerc
adam-urbanczyk Jun 13, 2020
858833b
Add member types in Plane
adam-urbanczyk Jun 13, 2020
f77c439
Correct .coveragerc
adam-urbanczyk Jun 13, 2020
87ea98d
Blackify geom
adam-urbanczyk Jun 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .coverage
View file
Open in desktop

This file was deleted.

7 changes: 7 additions & 0 deletions .coveragerc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[run]
branch = True

[report]
exclude_lines =
# Ignore stub body
\.\.\.
4 changes: 3 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ matrix:
os: linux
script:
- black . --diff --check
- mypy cadquery

before_install:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
Expand All @@ -54,7 +55,8 @@ before_install:
- conda config --set always_yes yes --set changeps1 no;
- conda env create -f environment.yml
- source ~/miniconda/bin/activate cadquery
- conda install -c conda-forge -c defaults -c cadquery python=$PYTHON_VERSION
- conda install -c conda-forge -c defaults -c cadquery python=$PYTHON_VERSION mypy
- pip install git+https://github.com/CadQuery/OCP-stubs.git

install:
- python setup.py install
Expand Down
10 changes: 2 additions & 8 deletions cadquery/occ_impl/exporters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@
import os
import sys

if sys.version_info.major == 2:
import cStringIO as StringIO
else:
import io as StringIO
import io as StringIO

from .shapes import Shape, Compound, TOLERANCE
from .geom import BoundBox
Expand All @@ -20,10 +17,7 @@
from OCP.HLRAlgo import HLRAlgo_Projector
from OCP.GCPnts import GCPnts_QuasiUniformDeflection

try:
import xml.etree.cElementTree as ET
except ImportError:
import xml.etree.ElementTree as ET
import xml.etree.cElementTree as ET

DISCRETIZATION_TOLERANCE = 1e-3
DEFAULT_DIR = gp_Dir(-1.75, 1.1, 5)
Expand Down
Loading