ci: merge main to release

ietf-tools · Jun 22, 2023 · df3366b · df3366b
2 parents 99ba77a + 9ae860f
commit df3366b
Show file tree

Hide file tree

Showing 20 changed files with 346 additions and 157 deletions.
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/...arts-npm-11.0.1-05a14e3887-773a7b8765.zip → ...arts-npm-11.1.0-0d42a04430-f9b8cdc38b.zip b/...arts-npm-11.0.1-05a14e3887-773a7b8765.zip → ...arts-npm-11.1.0-0d42a04430-f9b8cdc38b.zip
diff --git a/.yarn/cache/sass-npm-1.62.1-c16d65fd28-1b1b3584b3.zip b/.yarn/cache/sass-npm-1.62.1-c16d65fd28-1b1b3584b3.zip
diff --git a/.yarn/cache/sass-npm-1.63.4-bf5f3496c2-12bde5beff.zip b/.yarn/cache/sass-npm-1.63.4-bf5f3496c2-12bde5beff.zip
diff --git a/dev/coverage-action/package-lock.json b/dev/coverage-action/package-lock.json
diff --git a/dev/coverage-action/package.json b/dev/coverage-action/package.json
@@ -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",

diff --git a/dev/del-old-packages/package-lock.json b/dev/del-old-packages/package-lock.json
diff --git a/dev/del-old-packages/package.json b/dev/del-old-packages/package.json
@@ -10,7 +10,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@octokit/core": "^4.2.1",
+    "@octokit/core": "^4.2.4",
     "luxon": "^3.3.0"
   }
 }
diff --git a/docker/configs/nginx-proxy.conf b/docker/configs/nginx-proxy.conf
@@ -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;

diff --git a/docker/scripts/app-init.sh b/docker/scripts/app-init.sh
@@ -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

diff --git a/ietf/api/__init__.py b/ietf/api/__init__.py
@@ -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 = []
@@ -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"