Skip to content

Commit 1e1815f

Browse files
authored
Merge pull request #29 from pgRouting/foss4gBoston
Foss4g boston (v2.4.11)
2 parents cc8313a + bafbade commit 1e1815f

File tree

158 files changed

+4717
-2058
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

158 files changed

+4717
-2058
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ sphinx/*
55
*.mo
66
.doctrees
77
.directory
8+
.swp

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ group: edge
88
dist: trusty
99

1010
language: python
11-
python: 2.7.12
11+
python: 2.7.6
1212

1313
notifications:
1414
email:
@@ -18,8 +18,8 @@ notifications:
1818
addons:
1919
apt:
2020
packages:
21-
- cmake
22-
- python-sphinx
21+
#- cmake
22+
#- python-sphinx
2323

2424
install:
2525
- pip install -r REQUIREMENTS.txt

CODE_OF_CONDUCT.md

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
Contributors to pgRouting are expected to act respectfully toward others in accordance with the http://www.osgeo.org/code_of_conduct.
2+
3+
Full transcription:
4+
5+
6+
# OSGeo Code of Conduct
7+
8+
Version: 1.0
9+
10+
Date: May 2015
11+
12+
## Introduction
13+
14+
This code of conduct governs how we behave in any OSGeo forum or event and whenever we will be judged by our actions. We expect it to be honored by everyone who participates in the OSGeo community formally or informally, or claims any affiliation with the OSGeo Foundation.
15+
16+
It applies to in-person events (such as conferences and related social events), IRC, public and private mailing lists, the issue tracker, the wiki, blogs, Twitter, and any other forums which the community uses for communication and interactions.
17+
18+
This code is not exhaustive or complete. It serves to distill our common understanding of a collaborative, shared environment and goals. We expect it to be followed in spirit as much as in the letter, so that it can enrich all of us and the technical communities in which we participate.
19+
20+
## Diversity Statement
21+
22+
OSGeo welcomes and encourages participation by everyone. We are committed to being a community that everyone feels good about joining, and we will always work to treat everyone well. No matter how you identify yourself or how others perceive you: we welcome you.
23+
Specific Guidelines
24+
25+
We strive to:
26+
27+
- Be open.
28+
We invite anyone to participate in our community. We preferably use public methods of communication for project-related messages, unless discussing something sensitive. This applies to messages for help or project-related support, too; not only is a public support request much more likely to result in an answer to a question, it also makes sure that any inadvertent mistakes made by people answering will be more easily detected and corrected.
29+
30+
- Be empathetic, welcoming, friendly, and patient.
31+
We work together to resolve conflict, assume good intentions, and do our best to act in an empathetic fashion. We may all experience some frustration from time to time, but we do not allow frustration to turn into a personal attack. A community where people feel uncomfortable or threatened is not a productive one. Note that we have a multi-cultural, multi-lingual community and some of us are non-native speakers. We should be respectful when dealing with other community members as well as with people outside our community.
32+
33+
- Be collaborative.
34+
Our work will be used by other people, and in turn we will depend on the work of others. When we make something for the benefit of OSGeo, we are willing to explain to others how it works, so that they can build on the work to make it even better. Any decision we make will affect users and colleagues, and we take those consequences seriously when making decisions.
35+
36+
- Be inquisitive.
37+
Nobody knows everything! Asking questions early avoids many problems later, so questions are encouraged, though they may be directed to the appropriate forum. Those who are asked should be responsive and helpful, within the context of our shared goal of improving OSGeo.
38+
39+
- Be careful in the words that we choose.
40+
Whether we are participating as professionals or volunteers, we value professionalism in all interactions, and take responsibility for our own speech. Be kind to others. Do not insult or put down other participants.
41+
42+
- Be concise
43+
Keep in mind that what you write once will be read by hundreds of persons. Writing a short email means people can understand the conversation as efficiently as possible. Short emails should always strive to be empathetic, welcoming, friendly and patient. When a long explanation is necessary, consider adding a summary.
44+
45+
Try to bring new ideas to a conversation so that each mail adds something unique to the thread, keeping in mind that the rest of the thread still contains the other messages with arguments that have already been made.
46+
47+
Try to stay on topic, especially in discussions that are already fairly large.
48+
49+
- Step down considerately.
50+
Members of every project come and go. When somebody leaves or disengages from the project they should tell people they are leaving and take the proper steps to ensure that others can pick up where they left off. In doing so, they should remain respectful of those who continue to participate in the project and should not misrepresent the project's goals or achievements. Likewise, community members should respect any individual's choice to leave the project.
51+
52+
## Anti-Harassment
53+
54+
Harassment and other exclusionary behaviour are not acceptable. This includes, but is not limited to:
55+
56+
- Personal insults or discriminatory jokes and language, especially those using racist or sexist terms.
57+
- Offensive comments, excessive or unnecessary profanity.
58+
- Intimidation, violent threats or demands.
59+
- Sustained disruption of sessions or events.
60+
- Stalking, harassing photography or recording.
61+
- Unwelcome physical contact or sexual attention.
62+
- Repeated harassment of others. In general, if someone asks you to stop, then stop.
63+
- Posting (or threatening to post) other people's personally identifying information ("doxing").
64+
- Sharing private content, such as emails sent privately or non-publicly, or unlogged forums such as IRC channel history.
65+
- Advocating for, or encouraging, any of the above behaviour.
66+
67+
## Reporting Guidelines
68+
69+
If you believe someone is breaking this code of conduct, you may reply to them, and point to this code of conduct. Such messages may be in public or in private, whatever is most appropriate. Assume good faith; it is more likely that participants are unaware of their bad behaviour than that they intentionally try to degrade the quality of the discussion. Should there be difficulties in dealing with the situation, you may report your concerns to event staff, a forum leader or the OSGeo Board. Serious or persistent offenders may be expelled from the event or forum by event organizers or forum leaders.
70+
71+
72+

CONTRIBUTING.md

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# How to contribute
2+
3+
We are really glad you are reading this, because we need volunteer developers to help this project.
4+
5+
If you have not already, come find us in [![Join the chat at https://gitter.im/pgRouting/pgrouting](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/pgRouting/pgrouting?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) or contact us via [mailing list](http://lists.osgeo.org/mailman/listinfo/pgrouting-dev). We want you working on things you're excited about. Drop a message and if some one can assist you, will contact you back ASAP.
6+
7+
Here are some important resources:
8+
9+
* Participate writing [Workshop Chapters](https://github.com/pgRouting/workshop).
10+
* Find a bug? [Let us know](https://github.com/pgRouting/workshop/issues).
11+
12+
## Contribution agreement
13+
14+
Any kind of contribution will automatically fall to the following Licences:
15+
16+
- Documentation contribution:
17+
- Creative Commons Attribution-Share Alike 3.0
18+
- Code contribution: GNU GENERAL PUBLIC LICENSE Version 2,
19+
- Directly by making a pul explicit pull request.
20+
- Indirectly by posting code on issues/wiki/gitter/mailing lists
21+
22+
## Submitting changes
23+
24+
Write a clear log message for your commits. One-line messages are fine for small changes, but bigger changes should have more information.
25+
Fill the commit message template.
26+
27+
## Coding conventions
28+
29+
Start reading our code and you'll get the hang of it. We optimize for readability:
30+
This is open source software. Consider the people who will read your code, and make it look nice for them.
31+
32+
* We indent using four spaces (soft tabs)
33+
34+
Thanks,
35+
pgRouting team
36+
37+

LICENSE

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
title: Creative Commons Attribution Share Alike 3.0
2+
spdx-id: CC-BY-SA-3.0
3+
source: https://creativecommons.org/licenses/by-sa/3.0/legalcode.txt

REQUIREMENTS.txt

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,6 @@
1-
Jinja2==2.7.2
2-
MarkupSafe==0.18
3-
Pygments==1.6
4-
Sphinx==1.2
5-
argparse==1.2.1
6-
distribute==0.7.3
7-
docutils==0.11
8-
polib==1.0.3
9-
six==1.5.2
10-
sphinx-intl==0.9.4
11-
transifex-client==0.9
12-
twitter==1.10.2
13-
wsgiref==0.1.2
1+
Sphinx==1.4.3
2+
sphinx-intl==0.9.9
3+
#transifex-client==0.9
4+
#twitter==1.10.2
145
sphinxcontrib-images==0.7.0
156
sphinx_bootstrap_theme==0.4

Readme.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,6 @@ cd _build/latex/
4040
pdflatex -interaction=nonstopmode pgRoutingWorkshop.tex
4141
```
4242

43-
## Database dump
44-
45-
```
46-
pg_dump -U user -d pgrouting-workshop --no-owner -F p --create --clean -f sampledata_routing.sql
47-
```
4843

4944
## License
5045

docs/source/_static/custom.css

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,42 @@ footer {
2121
margin-bottom: 20px;
2222
}
2323

24+
p.admonition-title {
25+
font-weight: bold;
26+
background-color: #D1D0CE;
27+
border: #000000;
28+
}
29+
30+
2431
.alert-info {
2532
background-image: -webkit-linear-gradient(top, #e6ffe60 0%, #ccffcc 100%);
2633
background-image: -o-linear-gradient(top, #e6ffe6 0%, #ccffcc 100%);
2734
background-image: -webkit-gradient(linear, left top, left bottom, from(#e6ffe6), to(#ccffcc));
2835
background-image: linear-gradient(to bottom, #e6ffe6 0%, #ccffcc 100%);
2936
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e6ffe6de', endColorstr='#ccffccc3', GradientType=0);
3037
background-repeat: repeat-x;
31-
border-color: #dca7a7;
38+
border-color: #348017;
3239
}
3340

3441
div.topic {
35-
background-color: #6699ff;
42+
border: none;
3643
}
3744

3845
footer {
3946
background-color: #cce6ff;
4047
}
48+
49+
.h3, h3 {
50+
font-size: 18px;
51+
}
52+
53+
.h3, .h4, .h5, .h6, h3, h4, h5, h6 {
54+
background-color: #cce6ff;
55+
}
56+
57+
.h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 {
58+
margin-top: 30px;
59+
margin-bottom: 10px;
60+
}
61+
62+

docs/source/_templates/layout.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{% extends "!layout.html" %}
22

33
{# Custom CSS overrides #}
4-
{% set bootswatch_css_custom = ['_static/custom.css'] %}
4+
{% set css_files = ['_static/custom.css'] %}

0 commit comments

Comments
 (0)