refactor

.gitignore

@@ -9,6 +9,7 @@ test.js
 
 example/.vercel/
 
+__pycache__
 
 
 

build-utils/index.js

@@ -1,11 +1,11 @@
 const log = require('./log');
 const pip = require('./pip');
 const python = require('./python');
-const apt = require('./apt');
+const linux = require('./linux');
 
 module.exports = {
   log,
   pip,
   python,
-  apt,
+  linux,
 };

index.js

@@ -5,12 +5,7 @@ const download = require('@vercel/build-utils/fs/download'); // eslint-disable-l
 const glob = require('@vercel/build-utils/fs/glob'); // eslint-disable-line import/no-extraneous-dependencies
 const { createLambda } = require('@vercel/build-utils/lambda'); // eslint-disable-line import/no-extraneous-dependencies
 
-const {
-  log,
-  pip,
-  python,
-  apt,
-} = require('./build-utils');
+const { log, pip, python, linux } = require('./build-utils');
 
 
 exports.config = {
@@ -19,7 +14,7 @@ exports.config = {
 
 
 exports.build = async ({ files, entrypoint, config }) => {
-  log.info(`Files: ${files}`);
+  log.info(`Files: ${JSON.parse(files)}`);
   log.title('Starting build');
   const systemReleaseContents = await readFile(
     path.join('/etc', 'system-release'),
@@ -53,9 +48,9 @@ exports.build = async ({ files, entrypoint, config }) => {
   await pip.install(pipPath, srcDir, __dirname);
 
   log.heading('Running setup script');
-  let setupPath = apt.findRequirements(entrypoint, files);
+  let setupPath = linux.findRequirements(entrypoint, files);
   if (setupPath) {
-    await apt.install(setupPath);
+    await linux.install(setupPath);
   }
 
   log.heading('Running pip script');
@@ -65,16 +60,16 @@ exports.build = async ({ files, entrypoint, config }) => {
   }
 
   log.heading('Running post script');
-  setupPath = apt.findPostRequirements(entrypoint, files);
+  setupPath = linux.findPostRequirements(entrypoint, files);
   if (setupPath) {
-    await apt.install(setupPath);
+    await linux.install(setupPath);
   }
 
   log.heading('Preparing lambda bundle');
 
   const lambda = await createLambda({
     files: await glob('**', srcDir),
-    handler: 'pyvercel.vercel_handler',
+    handler: 'lambda.handler',
     runtime: `${config.runtime || 'python3.8'}`,
     environment: {
       WSGI_APPLICATION: `${wsgiApplication}`,

pyvercel/handler.py → lambda/handler.py

@@ -20,7 +20,7 @@
 from io import BytesIO
 from werkzeug._internal import _wsgi_encoding_dance, _to_bytes
 
-from urllib.parse import urlparse, unquote, urlencode
+from urllib.parse import urlparse, unquote
 
 # Set up logging
 root = logging.getLogger()

setup.py

@@ -1,24 +1,24 @@
-#! /usr/bin/env python
-import json
+# #! /usr/bin/env python
+# import json
 
-from setuptools import setup
+# from setuptools import setup
 
 
-with open('package.json') as f:
-    package_data = json.loads(f.read())
-    version = package_data['version']
+# with open('package.json') as f:
+#     package_data = json.loads(f.read())
+#     version = package_data['version']
 
-# py-vercel
-"""A barebones setup for tests
-"""
-setup(
-    name='py-vercel',
-    version=version,
-    packages=[
-        'pyvercel'
-    ],
-    install_requires=[
-        'Werkzeug',
-        'py-exceptions'
-    ]
-)
+# # py-vercel
+# """A barebones setup for tests
+# """
+# setup(
+#     name='py-vercel',
+#     version=version,
+#     packages=[
+#         'pyvercel'
+#     ],
+#     install_requires=[
+#         'Werkzeug',
+#         'py-exceptions'
+#     ]
+# )