Skip to content

Commit 99355b8

Browse files
BIN-SAAD (#8)
2 parents 8ce80b6 + 12daae0 commit 99355b8

File tree

176 files changed

+6770
-1790
lines changed

Some content is hidden

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

176 files changed

+6770
-1790
lines changed

.github/workflows/lektor-build-deploy.yml

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,28 @@ jobs:
44
build-and-deploy:
55
runs-on: ubuntu-latest
66
steps:
7-
- uses: actions/checkout@v2
8-
- name: setup python version
9-
uses: actions/setup-python@v3
10-
with:
11-
python-version: 3.9
12-
- name: Install dependencies
13-
run: |
14-
pip install pipenv
15-
pipenv sync
16-
pipenv run lektor build -f webpack
17-
- name: Deploy to production
18-
if: github.ref == 'refs/heads/main'
19-
run: |
20-
pipenv run lektor deploy ghpages --username ${{ secrets.LEKTOR_DEPLOY_USERNAME }} --password ${{ secrets.LEKTOR_DEPLOY_PASSWORD }}
7+
8+
# https://github.com/actions/setup-python
9+
- name: setup python version
10+
uses: actions/setup-python@v5
11+
with:
12+
python-version: 3.11
13+
14+
- name: Install pipenv
15+
run: |
16+
pip install --upgrade pip
17+
pip install pipenv
18+
19+
# https://github.com/actions/checkout
20+
- uses: actions/checkout@v4
21+
22+
- name: Install dependencies
23+
run: pipenv sync
24+
25+
- name: Build static site and use webpack
26+
run: pipenv run lektor build -f webpack
27+
28+
- name: Deploy to production
29+
if: github.ref == 'refs/heads/main'
30+
run: |
31+
pipenv run lektor deploy ghpages --username ${{ secrets.LEKTOR_DEPLOY_USERNAME }} --password ${{ secrets.LEKTOR_DEPLOY_PASSWORD }}

CODE_OF_CONDUCT.md

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

CONTRIBUTING.md

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

Pipfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ url = "https://pypi.org/simple"
44
verify_ssl = true
55

66
[packages]
7-
black = "*"
7+
black = ">=24.3.0"
88
flake8 = "*"
99
isort = "*"
10-
lektor = "*"
10+
lektor = ">=3.3.11"
1111

1212
[requires]
13-
python_version = "3.9"
13+
python_version = "3.11"

Pipfile.lock

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

README.md

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,26 @@ via lektor (see [Deployment](#deployment), below).
2020
[ccopensource]: https://opensource.creativecommons.org/
2121

2222

23-
## Code of Conduct
23+
## Code of conduct
2424

25-
[`CODE_OF_CONDUCT.md`](CODE_OF_CONDUCT.md):
25+
[`CODE_OF_CONDUCT.md`][org-coc]:
2626
> The Creative Commons team is committed to fostering a welcoming community.
2727
> This project and all other Creative Commons open source projects are governed
2828
> by our [Code of Conduct][code_of_conduct]. Please report unacceptable
2929
> behavior to [conduct@creativecommons.org](mailto:conduct@creativecommons.org)
3030
> per our [reporting guidelines][reporting_guide].
3131
32-
[code_of_conduct]: https://opensource.creativecommons.org/community/code-of-conduct/ "CC Open Source Code of Conduct — Creative Commons on GitHub"
33-
[reporting_guide]: https://opensource.creativecommons.org/community/code-of-conduct/enforcement/ "Codes of Conduct Enforcement — Creative Commons on GitHub"
32+
[org-coc]: https://github.com/creativecommons/.github/blob/main/CODE_OF_CONDUCT.md
33+
[code_of_conduct]: https://opensource.creativecommons.org/community/code-of-conduct/
34+
[reporting_guide]: https://opensource.creativecommons.org/community/code-of-conduct/enforcement/
3435

3536

3637
## Contributing
3738

38-
- See [`CONTRIBUTING.md`](CONTRIBUTING.md) for information on how to contribute
39+
See [`CONTRIBUTING.md`][org-contrib].
40+
41+
[org-contrib]: https://github.com/creativecommons/.github/blob/main/CONTRIBUTING.md
42+
3943
- See [Contributors to
4044
creativecommons/creativecommons.github.io-source][contributors] for a
4145
list of authors and their contributions to this project :blush:
@@ -47,6 +51,10 @@ via lektor (see [Deployment](#deployment), below).
4751

4852
### Prerequisites
4953

54+
For information on learning and installing the prerequisite technologies for this project, please see [Foundational technologies — Creative Commons Open Source][found-tech].
55+
56+
[found-tech]: https://opensource.creativecommons.org/contributing-code/foundational-tech/
57+
5058
Make sure you have:
5159
- [pipenv][pipenvdocs]
5260
- [Node.js][nodejswebsite] **v12+** and [npm][npmdocs] installed.
@@ -62,7 +70,7 @@ To install these, execute the following commands:
6270
1. [Installing Pipenv][pipenvinstall]
6371
2. [Install Node.js][nodeinstall] (or see the
6472
[detailed instructions][nodedetailed])
65-
3. Upate packges:
73+
3. Update packges:
6674
```
6775
sudo apt update
6876
```
@@ -75,7 +83,7 @@ To install these, execute the following commands:
7583
[nodejswebsite]: https://nodejs.org/en/
7684
[npmdocs]: https://docs.npmjs.com/
7785
[homebrew]: https://brew.sh/
78-
[pipenvinstall]: https://pipenv.pypa.io/en/latest/install/#installing-pipenv
86+
[pipenvinstall]: https://pipenv.pypa.io/en/latest/installation.html
7987
[nodeinstall]: https://github.com/nodesource/distributions/blob/master/README.md#table-of-contents
8088
[nodedetailed]: https://github.com/nodesource/distributions/blob/master/README.md#installation-instructions
8189
@@ -105,6 +113,11 @@ else fails, try removing the virtual environment and reinstalling:
105113
```
106114
pipenv install --dev
107115
```
116+
- If there's no Python 3.11 on your system (or if pipenv can't find it),
117+
you may need to specify the Python location. For example:
118+
```
119+
pipenv install --dev --python /opt/homebrew/bin/python3.11
120+
```
108121
109122
[pipenverror]: https://github.com/pypa/pipenv/issues/1918
110123
@@ -204,8 +217,6 @@ Here's how the code is structured in the top level of the repository:
204217
- [nixjdm/lektor-atom][atom]: Lektor Atom plugin
205218
- [lektor/lektor-disqus-comments][disqus]: Adds disqus comments to a Lektor
206219
website
207-
- [kmonsoor/lektor-google-analytics][lektorga]: Integration of Google
208-
analytics with Lektor CMS
209220
- [bancek/lektor-markdown-excerpt][mdexcerpt]: Adds filter for Markdown body
210221
excerpt
211222
- [lektor/lektor-markdown-header-anchors][md-header]: Adds support for
@@ -220,7 +231,6 @@ Here's how the code is structured in the top level of the repository:
220231
[plugins]: https://www.getlektor.com/docs/plugins/
221232
[atom]: https://github.com/nixjdm/lektor-atom
222233
[disqus]: https://github.com/lektor/lektor-disqus-comments
223-
[lektorga]: https://github.com/kmonsoor/lektor-google-analytics
224234
[mdexcerpt]: https://github.com/bancek/lektor-markdown-excerpt
225235
[md-header]: https://github.com/lektor/lektor-markdown-header-anchors
226236
[md-highlighter]: https://github.com/lektor/lektor-markdown-highlighter

0 commit comments

Comments
 (0)