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

Jump to bottom

Add pre commit configuration (original, reworking) #28

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Add pre commit configuration (original, reworking) #28

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b068b2f
Add pre-commit configuration
evelyn9191 Jan 24, 2020
a4ca9dc
Apply changes by Black
evelyn9191 Jan 24, 2020
1564b89
Remove duplicated code
evelyn9191 Jan 24, 2020
8a1018c
Remove trailing whitespace
evelyn9191 Jan 24, 2020
9597133
Resolve unused variables
evelyn9191 Jan 24, 2020
26bb11c
Optimize imports
evelyn9191 Jan 24, 2020
d5ee642
Fix comments format
evelyn9191 Jan 24, 2020
3116f84
Avoid shadowing Python builtins
evelyn9191 Jan 24, 2020
3c184d4
Apply Black after rebase
evelyn9191 Feb 1, 2020
504a59d
Have mypy ignore some errors
evelyn9191 Feb 1, 2020
f9b4464
Fix small syntax issues
evelyn9191 Feb 1, 2020
fbc2771
Add flake8 config file
evelyn9191 Feb 1, 2020
2b5803c
Fix Cython installation
evelyn9191 Feb 3, 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
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ language: python
python:
- "3.8"

install: "pip install . pre-commit"
install: "pip install Cython && pip install . pre-commit"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could this be because install_requires happens only at install time, but cython basically needs to be a dev requirement? Should we make a requirements-dev.txt file which has cython and nose in it? That's what I have done in other projects. Then the first half becomes pip install -r requirements-dev.txt

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Applied in the new PR.


jobs:
include:
Expand Down
6 changes: 2 additions & 4 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,11 @@
],
setup_requires=["setuptools>=18.0", "cython"],
install_requires=[
"setuptools>=18.0",
"pandas",
"networkx==1.11",
"pyshp",
"smopy",
"Cython",
"nose",
"six",
"geoindex",
"osmread==0.2",
Expand All @@ -46,8 +45,7 @@
"pyproj",
"matplotlib-scalebar==0.6.1",
],
tests_require=["nose"],
ext_modules=[Extension("gtfspy.routing.label", sources=["gtfspy/routing/label.pyx"],),],
ext_modules=[Extension("gtfspy.routing.label", sources=["gtfspy/routing/label.pyx"])],
keywords=[
"transit",
"routing" "gtfs",
Expand Down