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

Update for mapnik v3.1.x (master) #254

Closed
wants to merge 4 commits into from
Closed

Update for mapnik v3.1.x (master) #254

wants to merge 4 commits into from

Conversation

springmeyer
Copy link
Contributor

@springmeyer springmeyer commented Sep 10, 2017 •
edited
Loading

Gets mapnik-vector-tile compiling against mapnik master (future 3.1)

@springmeyer springmeyer mentioned this pull request Sep 10, 2017
Closed
@springmeyer
Copy link
Contributor Author

springmeyer commented Sep 10, 2017 •
edited
Loading

@artemp as you work on this next week, make sure to rebase against master after #253 lands - that will help build/test this locally without needing to test via node-mapnik (important since there is critical test coverage here).

artemp and others added 3 commits September 10, 2017 07:40
@artemp
Update for mapnik v3.1.x (master)
446f983 
(TODO: update tests)
remove obsolete files
b33e211
# This is a combination of 3 commits.
1cdf0d6 
# This is the 1st commit message:

upgrade tests to geometry.hpp

# This is the commit message #2:

Update for mapnik v3.1.x (master)
(TODO: update tests)

# This is the commit message #3:

remove obsolete files
@springmeyer
Copy link
Contributor Author

make sure to rebase against master after #253 lands

I went ahead and did this. So now this branch is up to date against master.

springmeyer pushed a commit to mapnik/node-mapnik that referenced this pull request Sep 10, 2017
use mapnik-vt from mapbox/mapnik-vector-tile#254
272d132
@springmeyer
Copy link
Contributor Author

This branch is looking good so far. Tests are passing locally. The remaining work to do is to update the mason package ref such that travis will pass.

refs mapnik/node-mapnik#805

@springmeyer
Copy link
Contributor Author

@artemp I think you just pushed Mapnik 3.1.x changes to master? How do they relate to this branch?

@artemp
Copy link
Contributor

artemp commented Oct 13, 2017

@springmeyer - make-strict-an-option-master is a master now. v3.0.x is based on old master. Sorry, I'm not following your question?

@springmeyer
Copy link
Contributor Author

@artemp This PR is for merging make-strict-an-option-master into master. Sounds like you did that already. So my question is: can this be closed? It seems like you merged somehow differently than merging this PR - if so did you capture everything in this PR?

@springmeyer
Copy link
Contributor Author

I think everything in this PR is already in master, closing.

@springmeyer springmeyer closed this Nov 7, 2017
@springmeyer springmeyer deleted the make-strict-an-option-master branch November 7, 2017 16:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@springmeyer @artemp