Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: merge main to release #5869

Merged
merged 14 commits into from
Jun 22, 2023
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ jobs:
exit 1
fi
echo "Running tests..."
if [[ "x${{ github.event.inputs.ignoreLowerCoverage }}" == "xtrue" ]]; then
if [[ "x${{ github.event.inputs.ignoreLowerCoverage }}" == "true" ]]; then
NGPixel marked this conversation as resolved.
Show resolved Hide resolved
echo "Lower coverage failures will be ignored."
./ietf/manage.py test --settings=settings_postgrestest --ignore-lower-coverage
else
Expand Down
22 changes: 11 additions & 11 deletions .pnp.cjs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.
Binary file not shown.
65 changes: 34 additions & 31 deletions dev/coverage-action/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions dev/coverage-action/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"luxon": "3.3.0"
},
"devDependencies": {
"eslint": "8.41.0",
"eslint-config-standard": "17.0.0",
"eslint": "8.42.0",
"eslint-config-standard": "17.1.0",
"eslint-plugin-import": "2.27.5",
"eslint-plugin-node": "11.1.0",
"eslint-plugin-promise": "6.1.1",
Expand Down
14 changes: 7 additions & 7 deletions dev/del-old-packages/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dev/del-old-packages/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"author": "",
"license": "ISC",
"dependencies": {
"@octokit/core": "^4.2.1",
"@octokit/core": "^4.2.4",
"luxon": "^3.3.0"
}
}
3 changes: 3 additions & 0 deletions docker/configs/nginx-proxy.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
server {
listen 8000 default_server;
listen [::]:8000 default_server;

proxy_read_timeout 1d;
proxy_send_timeout 1d;

root /var/www/html;
index index.html index.htm index.nginx-debian.html;
Expand Down
4 changes: 3 additions & 1 deletion docker/scripts/app-init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,16 @@ echo "Fix chromedriver /dev/shm permissions..."
sudo chmod 1777 /dev/shm

# Run nginx

echo "Starting nginx..."
sudo nginx

# Build node packages that requrie native compilation
echo "Compiling native node packages..."
yarn rebuild

# Silence Browserlist warnings
export BROWSERSLIST_IGNORE_OLD_DATA=1

# Generate static assets
echo "Building static assets... (this could take a minute or two)"
yarn build
Expand Down
8 changes: 6 additions & 2 deletions ietf/api/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,11 @@

import debug # pyflakes:ignore

import tastypie
import tastypie.resources
import tastypie.serializers
from tastypie.api import Api
from tastypie.bundle import Bundle
from tastypie.exceptions import ApiFieldError
from tastypie.serializers import Serializer # pyflakes:ignore (we're re-exporting this)
from tastypie.fields import ApiField

_api_list = []
Expand Down Expand Up @@ -152,3 +151,8 @@ def dehydrate(self, bundle, for_list=True):
dehydrated = self.dehydrate_related(fk_bundle, fk_resource, for_list=for_list)
fk_resource._meta.cache.set(cache_key, dehydrated)
return dehydrated


class Serializer(tastypie.serializers.Serializer):
def format_datetime(self, data):
return data.astimezone(datetime.timezone.utc).replace(tzinfo=None).isoformat(timespec="seconds") + "Z"
Loading