fix: output a sane pypi package that goes into "blip" folder

- I think the main problem stemmed from the files not being in a subfolder with the module name.
gantrol · Dec 24, 2022 · 236d8bd · 236d8bd
1 parent 21a50f1
commit 236d8bd
Show file tree

Hide file tree

Showing 36 changed files with 72 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.env/
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,19 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Python: build",
+            "type": "python",
+            "request": "launch",
+            "program": "setup.py",
+            "justMyCode": true,
+            "args": [
+                "sdist",
+                "bdist_wheel"
+            ]
+        }
+    ]
+}
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,2 +1,4 @@
-include configs/*.json
-include requirements.txt
+include blip/configs/*.*
+requirements.txt
+requirements-dev.txt
+README.md
diff --git a/models/__init__.py → blip/__init__.py b/models/__init__.py → blip/__init__.py
diff --git a/configs/bert_config.json → blip/configs/bert_config.json b/configs/bert_config.json → blip/configs/bert_config.json
diff --git a/configs/caption_coco.yaml → blip/configs/caption_coco.yaml b/configs/caption_coco.yaml → blip/configs/caption_coco.yaml
diff --git a/configs/med_config.json → blip/configs/med_config.json b/configs/med_config.json → blip/configs/med_config.json
diff --git a/configs/nlvr.yaml → blip/configs/nlvr.yaml b/configs/nlvr.yaml → blip/configs/nlvr.yaml
diff --git a/configs/nocaps.yaml → blip/configs/nocaps.yaml b/configs/nocaps.yaml → blip/configs/nocaps.yaml
diff --git a/configs/pretrain.yaml → blip/configs/pretrain.yaml b/configs/pretrain.yaml → blip/configs/pretrain.yaml
diff --git a/configs/retrieval_coco.yaml → blip/configs/retrieval_coco.yaml b/configs/retrieval_coco.yaml → blip/configs/retrieval_coco.yaml
diff --git a/configs/retrieval_flickr.yaml → blip/configs/retrieval_flickr.yaml b/configs/retrieval_flickr.yaml → blip/configs/retrieval_flickr.yaml
diff --git a/configs/retrieval_msrvtt.yaml → blip/configs/retrieval_msrvtt.yaml b/configs/retrieval_msrvtt.yaml → blip/configs/retrieval_msrvtt.yaml
diff --git a/configs/vqa.yaml → blip/configs/vqa.yaml b/configs/vqa.yaml → blip/configs/vqa.yaml
diff --git a/data/__init__.py → blip/data/__init__.py b/data/__init__.py → blip/data/__init__.py
diff --git a/data/coco_karpathy_dataset.py → blip/data/coco_karpathy_dataset.py b/data/coco_karpathy_dataset.py → blip/data/coco_karpathy_dataset.py
diff --git a/data/flickr30k_dataset.py → blip/data/flickr30k_dataset.py b/data/flickr30k_dataset.py → blip/data/flickr30k_dataset.py
diff --git a/data/nlvr_dataset.py → blip/data/nlvr_dataset.py b/data/nlvr_dataset.py → blip/data/nlvr_dataset.py
diff --git a/data/nocaps_dataset.py → blip/data/nocaps_dataset.py b/data/nocaps_dataset.py → blip/data/nocaps_dataset.py
diff --git a/data/pretrain_dataset.py → blip/data/pretrain_dataset.py b/data/pretrain_dataset.py → blip/data/pretrain_dataset.py
diff --git a/data/utils.py → blip/data/utils.py b/data/utils.py → blip/data/utils.py
diff --git a/data/video_dataset.py → blip/data/video_dataset.py b/data/video_dataset.py → blip/data/video_dataset.py
diff --git a/data/vqa_dataset.py → blip/data/vqa_dataset.py b/data/vqa_dataset.py → blip/data/vqa_dataset.py
diff --git a/blip/models/__init__.py b/blip/models/__init__.py
diff --git a/models/blip.py → blip/models/blip.py b/models/blip.py → blip/models/blip.py
diff --git a/models/blip_itm.py → blip/models/blip_itm.py b/models/blip_itm.py → blip/models/blip_itm.py
diff --git a/models/blip_nlvr.py → blip/models/blip_nlvr.py b/models/blip_nlvr.py → blip/models/blip_nlvr.py
diff --git a/models/blip_pretrain.py → blip/models/blip_pretrain.py b/models/blip_pretrain.py → blip/models/blip_pretrain.py
diff --git a/models/blip_retrieval.py → blip/models/blip_retrieval.py b/models/blip_retrieval.py → blip/models/blip_retrieval.py
diff --git a/models/blip_vqa.py → blip/models/blip_vqa.py b/models/blip_vqa.py → blip/models/blip_vqa.py
diff --git a/models/med.py → blip/models/med.py b/models/med.py → blip/models/med.py
diff --git a/models/nlvr_encoder.py → blip/models/nlvr_encoder.py b/models/nlvr_encoder.py → blip/models/nlvr_encoder.py
diff --git a/models/vit.py → blip/models/vit.py b/models/vit.py → blip/models/vit.py
diff --git a/transform/randaugment.py → blip/transform/randaugment.py b/transform/randaugment.py → blip/transform/randaugment.py
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -0,0 +1 @@
+pytest
diff --git a/setup.py b/setup.py
@@ -1,22 +1,49 @@
-import os
-
-import pkg_resources
+from pathlib import Path
 from setuptools import setup, find_packages
 
-setup(
-    name="blip",
-    py_modules=["blip"],
-    version="1.0",
-    description="",
-    author="salesforce",
-    packages=find_packages(exclude=["tests*"]),
-    install_requires=[
-        str(r)
-        for r in pkg_resources.parse_requirements(
-            open(os.path.join(os.path.dirname(__file__), "requirements.txt"))
-        )
-    ],
-    include_package_data=True,
-    package_data={"blip": ["configs/*.json", "*.json"]},
-    extras_require={'dev': ['pytest']},
-)
+
+def setup_package():
+
+    package_name = "blip"
+    root = Path(__file__).parent.resolve()
+    print("roo", root)
+
+    with open(root / "README.md", "r") as fh:
+        long_description = fh.read()
+
+    with open(root / "requirements.txt") as file:
+        REQUIRED_MODULES = [line.strip() for line in file]
+
+    with open(root / "requirements-dev.txt") as file:
+        DEVELOPMENT_MODULES = [line.strip()
+                               for line in file if "-e" not in line]
+
+    extras = {"dev": DEVELOPMENT_MODULES}
+    extras["all"] = [item for group in extras.values() for item in group]
+
+    setup(
+        name=package_name,
+        description="",
+        author="salesforce",
+        author_email="",
+        url="",
+        version="",
+        license="",
+        long_description=long_description,
+        long_description_content_type="text/markdown",
+        install_requires=REQUIRED_MODULES,
+        packages=find_packages(),
+        extras_require=extras,
+        classifiers=[
+            "Programming Language :: Python :: 3",
+            "License :: OSI Approved :: MIT License",
+            "Operating System :: OS Independent",
+            "Development Status :: 2 - Pre-Alpha",
+        ],
+        python_requires=">=3.6",
+        include_package_data=True,
+    )
+
+
+if __name__ == "__main__":
+    setup_package()