Skip to content

Commit

Permalink
Update stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
palewire committed Apr 12, 2024
1 parent 6e0cc4d commit 9989476
Show file tree
Hide file tree
Showing 8 changed files with 294 additions and 250 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
"ghcr.io/devcontainers-contrib/features/pipenv:2": {}
},
"postCreateCommand": "pipenv sync --dev"
}
}
4 changes: 2 additions & 2 deletions .github/workflows/continuous-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

- id: pipenv-install
name: Install Python dependencies
run: pipenv install --dev --python `which python`
run: pipenv sync --dev

- id: run
name: Run
Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:

- id: pipenv-install
name: Install Python dependencies
run: pipenv install --dev --python `which python`
run: pipenv sync --dev

- id: build
name: Build release
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,4 @@ jobs:
dir: ./docs/
should-cache: false
use-accelerate-endpoint: false
public: true
public: true
17 changes: 12 additions & 5 deletions .github/workflows/scrape.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,34 @@ jobs:
steps:
- id: checkout
name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.10'
python-version: '3.11'
cache: 'pipenv'

- id: install-pipenv
name: Install pipenv
run: curl https://raw.githubusercontent.com/pypa/pipenv/master/get-pipenv.py | python
shell: bash

- name: Setup
run: pipenv run python setup.py install
shell: bash

- id: make
name: Run scrape command
run: |
pipenv run python setup.py install
pipenv run nasawildfires modis --indent=2 > data/modis.json
pipenv run nasawildfires viirs-suomi --indent=2 > data/viirs-suomi.json
pipenv run nasawildfires viirs-noaa --indent=2 > data/viirs-noaa.json
shell: bash

- name: Datestamp
run: date > data/timestamp.txt
shell: bash

- id: commit
name: Commit results
run: |
Expand All @@ -41,6 +48,6 @@ jobs:
git config pull.rebase false
git status
git pull origin $GITHUB_REF
git add ./
git add ./data
git commit -m "Scrape" && git push || true
shell: bash
14 changes: 7 additions & 7 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# See https://pre-commit.com/hooks.html for more hooks
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.6.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
Expand All @@ -13,35 +13,35 @@ repos:
- id: mixed-line-ending

- repo: https://github.com/psf/black
rev: 23.7.0
rev: 24.3.0
hooks:
- id: black

- repo: https://github.com/asottile/blacken-docs
rev: 1.15.0
rev: 1.16.0
hooks:
- id: blacken-docs
additional_dependencies: [black]

- repo: https://github.com/timothycrosley/isort
rev: 5.12.0
rev: 5.13.2
hooks:
- id: isort
args: ["--profile", "black", "--filter-files"]

- repo: https://github.com/pycqa/flake8
rev: 6.0.0
rev: 7.0.0
hooks:
- id: flake8

- repo: https://github.com/asottile/pyupgrade
rev: v3.9.0
rev: v3.15.2
hooks:
- id: pyupgrade
args: [--py37-plus]

- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.3.0
rev: v1.9.0
hooks:
- id: mypy
additional_dependencies:
Expand Down
Loading

0 comments on commit 9989476

Please sign in to comment.