Skip to content

Commit dff26cf

Browse files
committed
Update stuff
1 parent 01a2857 commit dff26cf

12 files changed

Lines changed: 685 additions & 803 deletions

File tree

.github/workflows/continuous-deployment.yml

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,21 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@v2
13+
uses: actions/checkout@v4
1414

15-
- name: Install pipenv
16-
run: pipx install pipenv
15+
- id: install-pipenv
16+
name: Install pipenv
17+
run: curl https://raw.githubusercontent.com/pypa/pipenv/master/get-pipenv.py | python
18+
shell: bash
1719

18-
- uses: actions/setup-python@v2
20+
- uses: actions/setup-python@v4
1921
with:
20-
python-version: '3.9'
22+
python-version: '3.11'
2123
cache: 'pipenv'
2224

2325
- id: pipenv-install
2426
name: Install Python dependencies
25-
run: pipenv install --dev --python `which python`
27+
run: pipenv sync --dev
2628

2729
- id: lint
2830
name: Lint
@@ -33,19 +35,21 @@ jobs:
3335
runs-on: ubuntu-latest
3436
steps:
3537
- name: Checkout
36-
uses: actions/checkout@v2
38+
uses: actions/checkout@v4
3739

38-
- name: Install pipenv
39-
run: pipx install pipenv
40+
- id: install-pipenv
41+
name: Install pipenv
42+
run: curl https://raw.githubusercontent.com/pypa/pipenv/master/get-pipenv.py | python
43+
shell: bash
4044

41-
- uses: actions/setup-python@v2
45+
- uses: actions/setup-python@v4
4246
with:
43-
python-version: '3.9'
47+
python-version: '3.11'
4448
cache: 'pipenv'
4549

4650
- id: pipenv-install
4751
name: Install Python dependencies
48-
run: pipenv install --dev --python `which python`
52+
run: pipenv sync
4953

5054
- id: run
5155
name: Run tests
@@ -58,19 +62,21 @@ jobs:
5862
needs: [test-python]
5963
steps:
6064
- name: Checkout
61-
uses: actions/checkout@v2
65+
uses: actions/checkout@v4
6266

63-
- name: Install pipenv
64-
run: pipx install pipenv
67+
- id: install-pipenv
68+
name: Install pipenv
69+
run: curl https://raw.githubusercontent.com/pypa/pipenv/master/get-pipenv.py | python
70+
shell: bash
6571

66-
- uses: actions/setup-python@v2
72+
- uses: actions/setup-python@v4
6773
with:
68-
python-version: '3.9'
74+
python-version: '3.11'
6975
cache: 'pipenv'
7076

7177
- id: pipenv-install
7278
name: Install Python dependencies
73-
run: pipenv install --dev --python `which python`
79+
run: pipenv sync --dev
7480

7581
- id: build
7682
name: Build release
@@ -96,9 +102,9 @@ jobs:
96102
needs: [test-build]
97103
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
98104
steps:
99-
- uses: actions/setup-python@v2
105+
- uses: actions/setup-python@v4
100106
with:
101-
python-version: '3.9'
107+
python-version: '3.11'
102108

103109
- id: fetch
104110
name: Fetch artifact

.github/workflows/docs.yml

Lines changed: 42 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,48 @@ jobs:
99
name: "Build and deploy"
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v2
12+
- id: checkout
13+
name: Checkout
14+
uses: actions/checkout@v4
1315

14-
- uses: ammaraskar/sphinx-action@master
15-
with:
16-
docs-folder: "docs/"
16+
- id: setup-python
17+
name: Setup Python
18+
uses: actions/setup-python@v4
19+
with:
20+
python-version: '3.11'
21+
cache: 'pipenv'
1722

18-
- uses: actions/upload-artifact@v1
19-
with:
20-
name: documentation-html
21-
path: docs/_build/html/
23+
- id: install-pipenv
24+
name: Install pipenv
25+
run: curl https://raw.githubusercontent.com/pypa/pipenv/master/get-pipenv.py | python
26+
shell: bash
2227

23-
- uses: shallwefootball/s3-upload-action@master
24-
with:
25-
aws_key_id: ${{ secrets.PALEWIRE_DOCS_AWS_ACCESS_KEY_ID }}
26-
aws_secret_access_key: ${{ secrets.PALEWIRE_DOCS_AWS_SECRET_ACCESS_KEY }}
27-
aws_bucket: ${{ secrets.PALEWIRE_DOCS_AWS_BUCKET }}
28-
source_dir: docs/_build/html/
29-
destination_dir: censusbatchgeocoder
28+
- id: install-python-dependencies
29+
name: Install Python dependencies
30+
run: pipenv sync --dev
31+
shell: bash
32+
33+
- id: build-sphinx-documentation
34+
name: Build Sphinx documentation
35+
run: pipenv run make html
36+
shell: bash
37+
working-directory: docs
38+
39+
- id: configure-aws
40+
name: Configure AWS Credentials
41+
uses: aws-actions/configure-aws-credentials@v4
42+
with:
43+
aws-access-key-id: ${{ secrets.PALEWIRE_DOCS_AWS_ACCESS_KEY_ID }}
44+
aws-secret-access-key: ${{ secrets.PALEWIRE_DOCS_AWS_SECRET_ACCESS_KEY }}
45+
aws-region: us-east-1
46+
47+
- id: upload-to-s3
48+
name: Upload documentation to Amazon S3
49+
uses: datadesk/delivery-deploy-action@v1
50+
with:
51+
bucket: ${{ secrets.PALEWIRE_DOCS_AWS_BUCKET }}
52+
base-path: censusbatchgeocoder/
53+
dir: docs/_build/html/
54+
should-cache: false
55+
use-accelerate-endpoint: false
56+
public: true

Pipfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,16 @@ name = "pypi"
66
[packages]
77
agate = "*"
88
requests = "*"
9-
six = "*"
109

1110
[dev-packages]
1211
twine = "*"
1312
setuptools-scm = "*"
1413
flake8 = "*"
1514
sphinx = "*"
1615
pre-commit = "*"
16+
sphinx-palewire-theme = "*"
17+
sphinx-autobuild = "*"
18+
myst-parser = "*"
1719

1820
[requires]
19-
python_version = "3.9"
21+
python_version = "3.11"

0 commit comments

Comments
 (0)