Skip to content

Commit 817b871

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents d0944da + e833c7a commit 817b871

166 files changed

Lines changed: 11532 additions & 11748 deletions

File tree

Some content is hidden

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

.devcontainer/devcontainer.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"name": "ACADEMIC PAGES",
3+
"dockerComposeFile": "../docker-compose.yaml",
4+
"service": "jekyll-site",
5+
"remoteEnv": {
6+
"VSCODE_SERVER_DIR": "/home/vscode/.vscode-server"
7+
},
8+
"runArgs": [
9+
"--user",
10+
"1000:1000"
11+
],
12+
"workspaceFolder": "/usr/src/app",
13+
"remoteUser": "vscode",
14+
"forwardPorts": [4000] // Add port forwarding
15+
}
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: ''
6+
7+
---
8+
9+
**Describe the bug**
10+
A clear and concise description of what the bug is, be sure to note if the issue is presenet in the *template* or appeared on *your site*. If the bug appears on your site, please be sure to provide a link to your repository.
11+
12+
**To Reproduce**
13+
Steps to reproduce the behavior:
14+
1. Go to '...'
15+
2. Click on '....'
16+
3. Scroll down to '....'
17+
4. See error
18+
19+
**Expected behavior**
20+
A clear and concise description of what you expected to happen.
21+
22+
**Screenshots**
23+
If applicable, add screenshots to help explain your problem.
24+
25+
**Browser (please complete the following information):**
26+
- Device: [e.g. iPhone6] (if applicable)
27+
- OS: [e.g. iOS]
28+
- Browser [e.g. chrome, safari]
29+
- Version [e.g. 22]
30+
31+
**Additional context**
32+
Add any other context about the problem here.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
**Describe the solution you'd like**
14+
A clear and concise description of what you want to happen.
15+
16+
**Describe alternatives you've considered**
17+
A clear and concise description of any alternative solutions or features you've considered.
18+
19+
**Additional context**
20+
Add any other context or screenshots about the feature request here.

.github/workflows/scrape_talks.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Scrape Talk Locations
2+
3+
on:
4+
push:
5+
paths:
6+
- 'talks/**'
7+
- 'talkmap.ipynb'
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- uses: actions/checkout@v2
15+
16+
- name: Set up Python
17+
uses: actions/setup-python@v2
18+
with:
19+
python-version: '3.9' # Specify the Python version you need
20+
21+
- name: Install dependencies
22+
run: |
23+
pip install jupyter pandas requests beautifulsoup4 geopy # Add other dependencies as needed
24+
pip install getorg --upgrade
25+
26+
- name: Run Jupyter Notebook
27+
run: |
28+
jupyter nbconvert --to notebook --execute talkmap.ipynb --output talkmap_out.ipynb
29+
30+
- name: Commit changes
31+
run: |
32+
git config user.name "github-actions[bot]"
33+
git config user.email "github-actions[bot]@users.noreply.github.com"
34+
git add .
35+
git commit -m "Automated update of talk locations" || echo "No changes to commit"
36+
git push

.gitignore

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,17 @@
1+
# Ignore the contents of the _site directory and other cache directories
12
_site/
3+
.sass-cache/
24

5+
# Ignore the directory for local files during development
6+
local/
7+
8+
# Ignore the Gemfile that is generated
9+
Gemfile.lock
10+
11+
# Ignore files created by npm
12+
node_modules
13+
package-lock.json
14+
15+
# Ignore the vendor file and bundle for alternative installation
16+
vendor/
17+
.bundle/

0 commit comments

Comments
 (0)