Skip to content

Commit 09ae335

Browse files
authored
Merge pull request #1100 from creativecommons/dev2019
[ccEngine] creativecommons.org dev2019 branch
2 parents 607781a + cdcaea7 commit 09ae335

16 files changed

Lines changed: 880 additions & 290 deletions

.gitignore

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,17 @@
1-
# -*- mode: gitignore; -*-
21
# symantic web symlinks
32
docroot/rdf
43
docroot/license_rdf
5-
docroot/license.rdf
64
docroot/cc.licenserdf
75

86
# repositories
9-
python_env/src/
7+
python_src/rdfadict/
8+
python_src/cc.licenserdf/
9+
python_src/cc.license/
10+
python_src/cc.i18n/
11+
python_src/cc.engine/
1012

11-
# python environment
12-
python_env/paste_errors.log
13-
python_env/local
14-
python_env/lib
15-
python_env/include
16-
python_env/build
17-
python_env/bin
18-
python_env/.Python
19-
!python_env/bin/ccengine.fcgi.in
13+
# transstats.csv symlink
14+
transstats.csv
2015

2116
# vim
2217
*.swp

.venv/.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Ignore everything in this directory
2+
*
3+
# Except this file
4+
!.gitignore

Pipfile

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# pipenv alone does not setup the License Engine. See scripts/setup_engine.sh
2+
# and README.md
3+
[[source]]
4+
name = "pypi"
5+
url = "https://pypi.org/simple"
6+
verify_ssl = true
7+
8+
[dev-packages]
9+
10+
[packages]
11+
[packages."cc.engine"]
12+
editable = true
13+
path = "python_src/cc.engine"
14+
[packages."cc.i18n"]
15+
editable = true
16+
path = "python_src/cc.i18n"
17+
[packages."cc.license"]
18+
editable = true
19+
path = "python_src/cc.license"
20+
[packages."cc.licenserdf"]
21+
editable = true
22+
path = "python_src/cc.licenserdf"
23+
[packages.future]
24+
[packages.rdfadict]
25+
editable = true
26+
path = "python_src/rdfadict"
27+
28+
[requires]
29+
python_version = "2.7"

Pipfile.lock

Lines changed: 639 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 34 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ This repostory is currently for:
1313
1. Public help and support [Issues][issues]
1414
2. Legalcode and translations
1515
3. Installation of the website (including Styles and other Includes)
16+
4. ~~License Engine (ccEngine) Setup~~
1617

1718
[issues]: https://github.com/creativecommons/creativecommons.org/issues
1819

@@ -119,12 +120,6 @@ CC0 1.0 | [Source File][cc-zero-source] | [Legal Code][cc-zero-legalcode] | [Dee
119120

120121
## Installation
121122

122-
:warning: **WARNING:** Use of the bootstrap scripts in the master branch is NOT
123-
recommended. Instead, see the [dev2019][dev2019] branch for current/ongoing
124-
work.
125-
126-
[dev2019]: https://github.com/creativecommons/creativecommons.org/tree/dev2019
127-
128123

129124
### Child Repositories
130125

@@ -152,6 +147,39 @@ As of 2019 December, there are around 9,700 lines of python code split between
152147
the repositories.
153148

154149

150+
### License Engine Setup
151+
152+
> :warning: **We do not support local development at this time. Creative
153+
> Commons maintains a staging server (configured per
154+
> [creativecommons/sre-salt-prime][sre-salt-prime]) for development.**
155+
156+
1. **Install prerequisites**:
157+
- [Redland RDF Libraries][redland] Python bindings (`python-librdf` package
158+
on Debian. Due to this prerequisite, setup on macOS is *not* recommended.)
159+
- [pipenv][pipenvdocs] (`pipenv` package on Debian)
160+
2. **Execute Install Script**: `./scripts/setup_engine.sh`
161+
([`scripts/setup_engine.sh`](scripts/setup_engine.sh))
162+
1. Clones cc.engine and related respositories
163+
- Checks out specified branch (`ARG1`, defaults to `master`)
164+
2. Creates symlinks to support the semantic web
165+
3. Creates Python Environment via pipenv
166+
4. Generate ccengine.fcgi and copies config.ini into python_env
167+
5. Compiles mo files and transstats
168+
- Creates `transstats.csv` convenience symlink
169+
170+
[sre-salt-prime]: https://github.com/creativecommons/sre-salt-prime
171+
[pipenvdocs]:https://pipenv.readthedocs.io/en/latest/
172+
[redland]: http://librdf.org/
173+
174+
175+
### Not Included
176+
177+
This project does not currently include the [creativecommons/cc.api][ccapi]
178+
repository (which itself, depends on [creativecommons/cc.license][cclicense]).
179+
180+
[ccapi]: https://github.com/creativecommons/cc.api
181+
182+
155183
### Styles and other Includes
156184

157185
:warning: **WARNING:** Any change to style or other includes must be duplicated

python_env

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.venv

python_src/post-clone.d/.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Ignore everything in this directory
2+
*
3+
# Except this file
4+
!.gitignore

scripts/bootstrap.sh

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)