diff --git a/.gitattributes b/.gitattributes index 88cd092..8b52166 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,30 +1,40 @@ +# Standard gitattributes config + # Set the default behavior, in case people don't have core.autocrlf set. * text eol=lf - # Explicitly declare text files you want to always be normalized and converted # to native line endings on checkout. *.txt text # Source code +*.bash text eol=lf *.c text *.cpp text +*.csh text eol=lf +*.fish text eol=lf *.inc text *.ipynb text *.h text -*.py text -*.py3 text -*.pxd text -*.pyw text -*.pyx text +*.ksh text eol=lf +*.ps1 text +*.pxd text diff=python +*.py text diff=python +*.py3 text diff=python +*.pyi text diff=python +*.pyw text diff=python +*.pyx text diff=python *.qss text *.r text *.R text *.rb text +*.rmd text *.Rmd text +*.rnw text *.Rnw text -*.sh text +*.sh text eol=lf +*.zsh text eol=lf # Documentation *.adoc text @@ -34,6 +44,8 @@ *.md text *.po text *.pot text +*.rd text +*.Rd text *.rst text *.tex text *.TeX text @@ -77,23 +89,26 @@ *.geojson text *.gml text *.kml text -*.Rdata text -*.RData text *.sql text *.tab text *.tsv text *.wkt text +# Other text files +*.diff -text +*.patch -text + # Special files .*rc text .checkignore text .ciocheck text .ciocopyright text .editorconfig text -.gitattributes text -.gitconfig text -.gitignore text -.gitmodules text +.gitattributes export-ignore +.gitconfig export-ignore +.gitignore export-ignore +.gitmodules export-ignore +.gitkeep export-ignore *.lektorproject text .nojekyll text .project text @@ -120,9 +135,10 @@ MANIFEST.in text # Declare files that will always have CRLF line endings on checkout. -*.bat text eol=crlf -*.vbs text eol=crlf -*.ps1 text eol=crlf +*.bat text eol=crlf +*.cmd text eol=crlf +*.vbs text eol=crlf +*.vb text eol=crlf # Denote all files that are truly binary and should not be modified. @@ -144,6 +160,7 @@ MANIFEST.in text *.pyd binary *.pyo binary *.rdb binary +*.Rdb binary *.rdx binary *.Rdx binary *.rpm binary @@ -176,6 +193,11 @@ MANIFEST.in text *.parquet binary *.pickle binary *.pkl binary +*.rdata binary +*.Rdata binary +*.RData binary +*.rda binary +*.Rda binary *.rds binary *.Rds binary *.sav binary @@ -260,6 +282,7 @@ MANIFEST.in text *.gz binary *.lz binary *.lzma binary +*.pyz binary *.rar binary *.sz binary *.tar binary diff --git a/.github/actions/build-project/action.yml b/.github/actions/build-project/action.yml deleted file mode 100644 index 074ebfa..0000000 --- a/.github/actions/build-project/action.yml +++ /dev/null @@ -1,8 +0,0 @@ -name: 'Build Site' -description: 'Build the site with Lektor' -runs: - using: 'composite' - steps: - - name: Build with Lektor - shell: bash - run: ./ci/build.sh diff --git a/.github/actions/setup-and-install/action.yml b/.github/actions/setup-and-install/action.yml deleted file mode 100644 index 9a8b2bf..0000000 --- a/.github/actions/setup-and-install/action.yml +++ /dev/null @@ -1,8 +0,0 @@ -name: 'Setup and Install' -description: 'Set up the environment and install dependencies' -runs: - using: 'composite' - steps: - - name: Install dependencies - shell: bash - run: ./ci/install.sh diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml new file mode 100644 index 0000000..379c803 --- /dev/null +++ b/.github/workflows/build.yaml @@ -0,0 +1,47 @@ +# Build the site and deploy it to GitHub pages +name: Build + +on: # yamllint disable-line rule:truthy + push: + branches: + - master + - main + - '*.*' + - 'staging*' + pull_request: + branches: + - master + - main + - '*.*' + - 'staging*' + +jobs: + build: + name: Build and Deploy + + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + submodules: true + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: '3.x' + - name: Install dependencies + shell: bash + run: ./ci/install.sh + - name: List dependencies + shell: bash + run: pip list + - name: Build site + shell: bash + run: ./ci/build.sh + - name: Deploy to GitHub Pages + if: (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master') && github.event_name != 'pull_request' + uses: JamesIves/github-pages-deploy-action@v4 + with: + FOLDER: ./website-lektor-icon-build + CLEAN: true # Remove deleted files from the deploy branch diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml deleted file mode 100644 index 2d51bb9..0000000 --- a/.github/workflows/deploy.yml +++ /dev/null @@ -1,36 +0,0 @@ -# Build the project and deploy it to GitHub pages -# Based on https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions - -name: Deploy Site - -on: # yamllint disable-line rule:truthy - push: - branches: - - master - -jobs: - deploy: - name: Deploy Site - - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v2 - with: - submodules: true - persist-credentials: false # For GH pages deployment - - name: Set up Python - uses: actions/setup-python@v2 - with: - python-version: '3.x' - - name: Setup and Install - uses: ./.github/actions/setup-and-install - - name: Build Site - uses: ./.github/actions/build-project - - name: Deploy to GitHub Pages - uses: JamesIves/github-pages-deploy-action@4.1.1 - with: - branch: gh-pages # The branch the action should deploy to - folder: ./website-lektor-icon-build # The folder the action should deploy - clean: true # Automatically remove deleted files from the deploy branch diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml deleted file mode 100644 index dc03fc0..0000000 --- a/.github/workflows/test.yml +++ /dev/null @@ -1,26 +0,0 @@ -# Build the project and test that it works correctly -# Based on https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions - -name: Test Site - -on: [pull_request] # yamllint disable-line rule:truthy - -jobs: - deploy: - name: Build Site - - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v2 - with: - submodules: true - - name: Set up Python - uses: actions/setup-python@v2 - with: - python-version: '3.x' - - name: Install Dependencies - uses: ./.github/actions/setup-and-install - - name: Build Site - uses: ./.github/actions/build-project diff --git a/.gitignore b/.gitignore index cfba33a..26e37b2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,148 @@ -# Compiled python files -*.py[ocd] +# Standard gitignore list + +# Archive files +*.7z +*.bz2 +*.gz +*.lzma +*.lzma2 +*.tar +*.xz +*.zip + +# Temporary / backup files +*.bak +*.swp +*.tmp +*.temp + +# OS-specific files +.DS_Store +Thumbs.db + +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +*.egg +*.egg-info/ +.eggs/ +.installed.cfg +.Python +bin/ +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +lib/ +lib64/ +MANIFEST +parts/ +pip-wheel-metadata/ +sdist/ +share/python-wheels/ +var/ +wheels/ + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +.cache +*.cover +.coverage +.coverage.* +.hypothesis/ +.nox/ +.pytest_cache/ +.tox/ +coverage.xml +htmlcov/ +nosetests.xml + +# Translations +*.mo + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +doc/_build/ +docs/_build/ + +# PyBuilder +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +.python-version + +# Celery beat schedule file +celerybeat-schedule + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +ENV/ +venv/ +VENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject +spyder_crash.log + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# Pylint +.pylint.d/ # gedit files *~ @@ -7,28 +150,22 @@ # Notepad++ files nppBackup/ -# Pytest dirs/files -.pytest_cache/ - # git .orig files *.orig -# Sphinx doc build dir -_build/ - -# Special dirs and files -build/ -dist/ -bin/ -*.egg-info/ -Thumbs.db -.DS_Store/ -spyder_crash.log -.DS_Store -.spyproject +# IDEA project settings .idea/ -.cache -.coverage* -*.tmp -*.temp -*.bak + +# VSCode files +.vscode/ + +# Kate +.directory +.swp.* +*.swp + +# PyPi configuration +.pypirc + +# Other files +toread.md diff --git a/ci/deploy.sh b/ci/deploy.sh deleted file mode 100755 index da0197d..0000000 --- a/ci/deploy.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -ex - -lektor deploy $1 --output-path website-lektor-icon-build diff --git a/ci/install.sh b/ci/install.sh index e8a757a..67c1dbc 100755 --- a/ci/install.sh +++ b/ci/install.sh @@ -1,4 +1,4 @@ #!/bin/bash -ex -pip3 install -U pip -pip3 install -r ci/requirements-ci.txt +python3 -m pip install --upgrade pip setuptools wheel +python3 -m pip install --upgrade -r requirements.txt diff --git a/ci/requirements-ci.txt b/ci/requirements-ci.txt deleted file mode 100644 index 6f7c384..0000000 --- a/ci/requirements-ci.txt +++ /dev/null @@ -1 +0,0 @@ -Lektor>=3.1.3 # Primary dependency diff --git a/netlify.toml b/netlify.toml index 349c0b7..aa8d6a5 100644 --- a/netlify.toml +++ b/netlify.toml @@ -5,11 +5,11 @@ # This is where we will look for package.json/.nvmrc/etc. # base = "project/" - # Default build command. - command = "ci/install.sh && ci/build.sh" - # Directory that contains the deploy-ready HTML files and assets generated by # the build. This is relative to the base directory if one has been set, or the # root directory if a base has not been set. This sample publishes the # directory located at the absolute path "root/project/build-output" publish = "website-lektor-icon-build/" + + # Default build command. + command = "ci/install.sh && ci/build.sh" diff --git a/requirements-dev.txt b/requirements-dev.txt deleted file mode 100644 index 6f7c384..0000000 --- a/requirements-dev.txt +++ /dev/null @@ -1 +0,0 @@ -Lektor>=3.1.3 # Primary dependency diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..88ad663 --- /dev/null +++ b/requirements.txt @@ -0,0 +1 @@ +Lektor>=3.3,<3.4 # Primary dependency diff --git a/runtime.txt b/runtime.txt deleted file mode 100644 index 98fccd6..0000000 --- a/runtime.txt +++ /dev/null @@ -1 +0,0 @@ -3.8 \ No newline at end of file diff --git a/star_fleet_tours.lektorproject b/star_fleet_tours.lektorproject index e3107f0..0912cd3 100644 --- a/star_fleet_tours.lektorproject +++ b/star_fleet_tours.lektorproject @@ -38,6 +38,6 @@ nav_extralinks = SCLA: https://scla.space/ footer_links = Instagram: https://instagram.com/starfleettours/, Twitter: https://twitter.com/StarFleetTours, Facebook: https://www.facebook.com/starfleettours, GitHub: https://github.com/star-fleet-tours, Slack: https://spacexmeetups.slack.com/, Gitter: https://gitter.im/star-fleet-tours/public, Email: mailto:fleetcommand@star-fleet.tours footer_license_name = CC-BY-SA 4.0 (Content); MIT (Code) footer_license_link = https://github.com/star-fleet-tours/star-fleet-tours-website/blob/master/LICENSE.txt -gitter_room = star-fleet-tours/public +gitter_room = disqus_name = atom_enable = diff --git a/themes/lektor-icon b/themes/lektor-icon index cff854a..d4f9a35 160000 --- a/themes/lektor-icon +++ b/themes/lektor-icon @@ -1 +1 @@ -Subproject commit cff854a4c4afc6b6faab9e63d8c66f06f65b813e +Subproject commit d4f9a3551d891ffe6f61d16066e7cd3e075931cd