Skip to content

Commit 2fdfc1f

Browse files
authored
update dockerfile base (#421)
* update dockerfile base * also using default models JsonField and setting default autofield * pin django 4.2 Signed-off-by: vsoch <vsoch@users.noreply.github.com>
1 parent a4b0bf0 commit 2fdfc1f

File tree

276 files changed

+1946
-1969
lines changed

Some content is hidden

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

276 files changed

+1946
-1969
lines changed

.all-contributorsrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,4 +228,4 @@
228228
}
229229
],
230230
"contributorsPerLine": 7
231-
}
231+
}

.circleci/config.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# defined here or within the CircleCI settings. The following environment
55
# variables are acceptable here or in these settings (for sensitive information)
66
#
7-
# CONTAINER_NAME if not set, will use Github repo and organization name
7+
# CONTAINER_NAME if not set, will use Github repo and organization name
88
# DOCKER_USER
99
# DOCKER_EMAIL
1010
# Dockerfile optional, if the path is different than the Dockerfile in $PWD
@@ -30,7 +30,7 @@ install: &install
3030

3131
sourceenv: &sourceenv
3232
name: Source environment variables from the BASH_ENV
33-
command: source $BASH_ENV
33+
command: source $BASH_ENV
3434

3535

3636
# Docker
@@ -67,7 +67,7 @@ dockerenv: &dockerenv
6767
dockerload: &dockerload
6868
name: Load Docker container Image
6969
no_output_timeout: 30m
70-
command: |
70+
command: |
7171
echo "Working directory is ${PWD}"
7272
docker info
7373
set +o pipefail
@@ -128,7 +128,7 @@ dockernginx: &dockernginx
128128
name: Build nginx custom container
129129
command: |
130130
source ${BASH_ENV}
131-
echo "Building ${CONTAINER_NAME}_nginx:${DOCKER_TAG}"
131+
echo "Building ${CONTAINER_NAME}_nginx:${DOCKER_TAG}"
132132
cd ${REPO_NAME}/nginx && \
133133
ls && \
134134
docker build -f ${DOCKERFILE} -t ${CONTAINER_NAME}_nginx:${DOCKER_TAG} .
@@ -196,7 +196,7 @@ workflows:
196196
- build:
197197
filters:
198198
branches:
199-
ignore:
199+
ignore:
200200
- gh-pages
201201
- /docs?/.*/
202202
- contributors/*
@@ -208,7 +208,7 @@ workflows:
208208
- build
209209
filters:
210210
branches:
211-
ignore:
211+
ignore:
212212
- gh-pages
213213
- /docs?/.*/
214214
- contributors/*

.github/CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ all your interactions with the project members and users.
2525
4. The project's default copyright and header have been included in any new
2626
source files.
2727
5. All (major) changes to Singularity Registry must be documented in
28-
[docs](docs). If your PR changes a core functionality, please
29-
include clear description of the changes in your PR so that the docs
28+
[docs](docs). If your PR changes a core functionality, please
29+
include clear description of the changes in your PR so that the docs
3030
can be updated, or better, submit another PR to update the docs directly.
3131
6. If necessary, update the README.md.
3232
7. The pull request will be reviewed by others, and the final merge must be
@@ -98,7 +98,7 @@ an incident. Further details of specific enforcement policies may be posted
9898
separately.
9999

100100
Project maintainers, contributors and users who do not follow or enforce the
101-
Code of Conduct in good faith may face temporary or permanent repercussions
101+
Code of Conduct in good faith may face temporary or permanent repercussions
102102
with their involvement in the project as determined by the project's leader(s).
103103

104104
## Attribution

.github/ISSUE_TEMPLATE/question.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,3 @@ name: Question
33
about: What's on your mind?
44

55
---
6-
7-

.github/ISSUE_TEMPLATE/request-for-documentation-or-tutorial.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,3 @@ name: Request for Documentation or Tutorial
33
about: request improvements or changes to docs or a tutorial
44

55
---
6-
7-

.github/dev-requirements.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
pre-commit
2+
black
3+
isort
4+
flake8

.github/workflows/main.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,16 @@ jobs:
1414
- uses: actions/checkout@v1
1515

1616
- name: Check for typos in docs
17-
uses: crate-ci/typos@592b36d23c62cb378f6097a292bc902ee73f93ef # version 1.0.4
18-
with:
19-
files: ./docs ./README.md
17+
uses: crate-ci/typos@7ad296c72fa8265059cc03d1eda562fbdfcd6df2 # v1.9.0
18+
with:
19+
files: ./docs/_docs ./docs/_posts ./README.md
2020

2121
- name: Setup black linter
2222
run: conda create --quiet --name black black
2323

24-
- name: Lint python code
24+
- name: Lint and format Python code
2525
run: |
2626
export PATH="/usr/share/miniconda/bin:$PATH"
2727
source activate black
28-
black --check shub
28+
pip install -r .github/dev-requirements.txt
29+
pre-commit run --all-files

.github/workflows/update-contributors.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ jobs:
1313
- name: Checkout Repository
1414
uses: actions/checkout@v2
1515
- name: Tributors Update
16-
16+
1717
# Important! Update to release https://github.com/con/tributors
1818
uses: con/tributors@0.0.19
1919
env:
2020
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
21-
with:
21+
with:
2222

2323
# Single text list (space separated) of parsers, leave unset to auto-detect
2424
parsers: unset

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Gemfile.lock
1111
sregistry
1212
_site
1313
minio-images
14+
env
1415

1516
# Other #
1617
#########

.pre-commit-config.yaml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
exclude: "(.all-contributorsrc|static)"
2+
repos:
3+
- repo: https://github.com/pre-commit/pre-commit-hooks
4+
rev: v4.3.0
5+
hooks:
6+
- id: check-added-large-files
7+
- id: check-case-conflict
8+
- id: check-docstring-first
9+
- id: end-of-file-fixer
10+
- id: trailing-whitespace
11+
- id: mixed-line-ending
12+
13+
- repo: local
14+
hooks:
15+
- id: black
16+
name: black
17+
language: python
18+
types: [python]
19+
entry: black
20+
21+
- id: isort
22+
name: isort
23+
args: [--filter-files]
24+
language: python
25+
types: [python]
26+
entry: isort
27+
28+
- id: flake8
29+
name: flake8
30+
language: python
31+
types: [python]
32+
entry: flake8

0 commit comments

Comments
 (0)