Skip to content

Commit 0f49957

Browse files
committed
Merge branch 'main' into glam
2 parents af3ed14 + 7195928 commit 0f49957

Some content is hidden

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

48 files changed

+54171
-10581
lines changed

.github/workflows/python_static_analysis.yml

-37
This file was deleted.

.github/workflows/static_analysis.yml

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Static Analysis
2+
3+
on:
4+
pull_request:
5+
push:
6+
branches: [main]
7+
workflow_dispatch:
8+
9+
jobs:
10+
job:
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
15+
# https://github.com/actions/setup-python
16+
- name: Install Python 3.11
17+
uses: actions/setup-python@v5
18+
with:
19+
python-version: '3.11'
20+
21+
- name: Install Python dependencies
22+
run: |
23+
pip install --upgrade pip
24+
pip install black 'black[jupyter]' flake8 isort
25+
pip install pre-commit
26+
27+
# https://github.com/actions/checkout
28+
- name: Checkout quantifying
29+
uses: actions/checkout@v4
30+
with:
31+
path: quantifying
32+
33+
- name: pre-commit
34+
run: pre-commit run --show-diff-on-failure --color=always --all-files
35+
working-directory: ./quantifying

.pre-commit-config.yaml

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# See https://pre-commit.com for more information
2+
# See https://pre-commit.com/hooks.html for more hooks
3+
default_language_version:
4+
python: python3.11
5+
6+
ci:
7+
autofix_commit_msg: |
8+
[pre-commit.ci] auto fixes from pre-commit.com hooks
9+
10+
for more information, see https://pre-commit.ci
11+
autofix_prs: true
12+
autoupdate_branch: ''
13+
autoupdate_commit_msg: '[pre-commit.ci] pre-commit autoupdate'
14+
autoupdate_schedule: weekly
15+
skip: []
16+
submodules: false
17+
18+
repos:
19+
20+
- repo: https://github.com/pre-commit/pre-commit-hooks
21+
rev: v4.1.0
22+
hooks:
23+
- id: check-added-large-files
24+
- id: check-ast
25+
- id: check-case-conflict
26+
- id: check-docstring-first
27+
- id: check-executables-have-shebangs
28+
- id: check-json
29+
- id: check-merge-conflict
30+
- id: check-toml
31+
- id: check-yaml
32+
- id: destroyed-symlinks
33+
- id: end-of-file-fixer
34+
- id: mixed-line-ending
35+
args:
36+
- --fix=auto #replaces automatically the most frequent line ending.
37+
- id: trailing-whitespace
38+
39+
- repo: local
40+
hooks:
41+
- id: black
42+
name: "Black"
43+
entry: black
44+
language: system
45+
types: ["file", "python", "text"]
46+
47+
- id: flake8
48+
name: "Flake8"
49+
entry: flake8
50+
language: system
51+
types: ["file", "python", "text"]
52+
53+
- id: isort
54+
name: "isort"
55+
entry: isort --filter-files
56+
language: system
57+
types: ["file", "python", "text"]

CODE_OF_CONDUCT.md

-13
This file was deleted.

CONTRIBUTING.md

-34
This file was deleted.

Pipfile

+7-5
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,26 @@ verify_ssl = true
44
name = "pypi"
55

66
[packages]
7-
python-dotenv = "*"
87
flickrapi = "*"
98
internetarchive = "*"
10-
jupyterlab = "*"
9+
jupyterlab = ">=3.6.7"
1110
matplotlib = "*"
1211
numpy = "*"
1312
pandas = "*"
1413
plotly = "*"
15-
requests = "*"
14+
Pyarrow = "*"
15+
python-dotenv = "*"
16+
requests = ">=2.31.0"
1617
seaborn = "*"
17-
urllib3 = "*"
18+
urllib3 = ">=1.26.18"
1819
wordcloud = "*"
1920

2021
[dev-packages]
2122
black = "*"
2223
"black[jupyter]" = "*"
2324
flake8 = "*"
2425
isort = "*"
26+
pre-commit = "*"
2527

2628
[requires]
27-
python_version = "3.10"
29+
python_version = "3.11"

0 commit comments

Comments
 (0)