python-dotenvx 0.2.2__tar.gz → 0.2.3__tar.gz

{python_dotenvx-0.2.2 → python_dotenvx-0.2.3}/CHANGELOG.md

@@ -2,7 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-## [Unreleased](https://github.com/dotenvx/python-dotenvx/compare/v0.2.2...main)
+## [Unreleased](https://github.com/dotenvx/python-dotenvx/compare/v0.2.3...main)
+
+## [0.2.3](https://github.com/dotenvx/dotenvx/compare/v0.2.2...v0.2.3)
+
+### Changed
+
+* Patch `dotenvx` binary install across multiple edge cases
 
 ## [0.2.2](https://github.com/dotenvx/dotenvx/compare/v0.2.1...v0.2.2)
 

python_dotenvx-0.2.3/MANIFEST.in

@@ -0,0 +1,2 @@
+include CHANGELOG.md
+include src/dotenvx/bin/dotenvx

{python_dotenvx-0.2.2/src/python_dotenvx.egg-info → python_dotenvx-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-dotenvx
-Version: 0.2.2
+Version: 0.2.3
 Summary: [dotenvx.com] a better dotenv–from the creator of `dotenv`
 Home-page: https://github.com/dotenvx/python-dotenvx
 Author: dotenv
@@ -46,23 +46,37 @@ Install and use it in code just like `python-dotenv`.
 ```sh
 pip install python-dotenvx
 ```
+
+Then run `dotenvx-postinstall` to install the `dotenvx` binary (python-dotenvx is a wrapper).
+
+```sh
+dotenvx-postinstall
+```
+
+Then use it in code.
+
 ```python
 # main.py
 import os
 from dotenvx import load_dotenvx
-load_dotenvx()  # take environment variables from .env.
+load_dotenvx() # take environment variables from .env.
 
 print(os.getenv("S3_BUCKET"))
 ```
 
  
 
-
 # Changelog
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-## [Unreleased](https://github.com/dotenvx/python-dotenvx/compare/v0.2.2...main)
+## [Unreleased](https://github.com/dotenvx/python-dotenvx/compare/v0.2.3...main)
+
+## [0.2.3](https://github.com/dotenvx/dotenvx/compare/v0.2.2...v0.2.3)
+
+### Changed
+
+* Patch `dotenvx` binary install across multiple edge cases
 
 ## [0.2.2](https://github.com/dotenvx/dotenvx/compare/v0.2.1...v0.2.2)
 

{python_dotenvx-0.2.2 → python_dotenvx-0.2.3}/README.md

@@ -25,14 +25,22 @@ Install and use it in code just like `python-dotenv`.
 ```sh
 pip install python-dotenvx
 ```
+
+Then run `dotenvx-postinstall` to install the `dotenvx` binary (python-dotenvx is a wrapper).
+
+```sh
+dotenvx-postinstall
+```
+
+Then use it in code.
+
 ```python
 # main.py
 import os
 from dotenvx import load_dotenvx
-load_dotenvx()  # take environment variables from .env.
+load_dotenvx() # take environment variables from .env.
 
 print(os.getenv("S3_BUCKET"))
 ```
 
  
-

{python_dotenvx-0.2.2 → python_dotenvx-0.2.3}/setup.py

@@ -1,7 +1,5 @@
 import os
-import subprocess
 from setuptools import setup, find_packages
-from setuptools.command.install import install
 
 src = {}
 dir = os.path.abspath(os.path.dirname(__file__))
@@ -17,25 +15,6 @@ def read_files(files):
 
 readme = read_files(['README.md', 'CHANGELOG.md'])
 
-class InstallBinary(install):
-    def run(self):
-        print("installing dotenvx........")
-
-        bin_dir = os.path.join(dir, 'src', 'dotenvx', 'bin')
-        os.makedirs(bin_dir, exist_ok=True)
-
-        # install dotenvx binary using your install script into bin/
-        subprocess.run(
-            ['sh', '-c', f'curl -sfS "https://dotenvx.sh?directory={bin_dir}" | sh'],
-            check=True,
-            stdout=None,
-            stderr=None
-        )
-
-        print("installed dotenvx........")
-
-        super().run()
-
 setup(
     name='python-dotenvx',
     description=src['__description__'],
@@ -45,6 +24,7 @@ setup(
     license=src['__license__'],
     author=src['__author__'],
     author_email=src['__author_email__'],
+    include_package_data=True,
     packages=find_packages('src'),
     package_dir={'': 'src'},
     url=src['__url__'],
@@ -61,5 +41,9 @@ setup(
     ],
     install_requires=[
     ],
-    cmdclass={'install': InstallBinary},
+    entry_points={
+        'console_scripts': [
+            'dotenvx-postinstall=dotenvx.main:postinstall',
+        ],
+    }
 )

{python_dotenvx-0.2.2 → python_dotenvx-0.2.3}/src/dotenvx/__version__.py

@@ -1,7 +1,7 @@
 __title__ = "python-dotenvx"
 __description__ = "[dotenvx.com] a better dotenv–from the creator of `dotenv`"
 __url__ = "https://github.com/dotenvx/python-dotenvx"
-__version__ = "0.2.2"
+__version__ = "0.2.3"
 __author__ = "dotenv"
 __author_email__ = "mot@dotenvx.com"
 __license__ = "BSD-3-Clause"

python_dotenvx-0.2.3/src/dotenvx/bin/dotenvx

@@ -0,0 +1,3 @@
+#!/bin/sh
+echo "[MISSING_BINARY] missing dotenvx binary. run: dotenvx-postinstall"
+exit 1

python_dotenvx-0.2.3/src/dotenvx/main.py

@@ -0,0 +1,61 @@
+import os
+import json
+import shutil
+import subprocess
+
+from dotenvx import __file__ as package_path
+
+ERROR_MISSING_BINARY = "[MISSING_BINARY] missing dotenvx binary\n[MISSING_BINARY] https://github.com/dotenvx/dotenvx/issues/576"
+
+def load_dotenvx():
+    output = get()
+
+    try:
+        parsed = json.loads(output)
+        for key, value in parsed.items():
+            os.environ[key] = value
+        return parsed
+    except Exception as e:
+        raise RuntimeError(f"Failed to parse dotenvx output: {e}")
+
+def get():
+    binpath = binary()
+    output = subprocess.run(
+        [binpath, "get", "-pp"],
+        capture_output=True,
+        text=True,
+        check=True
+    )
+    return output.stdout.strip()
+
+def binary():
+    local_bin = os.path.join(os.path.dirname(package_path), "bin", "dotenvx")
+    candidates = [local_bin, shutil.which("dotenvx")]
+
+    for candidate in candidates:
+        if candidate and os.path.isfile(candidate) and os.access(candidate, os.X_OK):
+            if is_stub_file(candidate):
+                continue
+            return candidate
+
+    print("[MISSING_BINARY] missing dotenvx binary")
+    print("[MISSING_BINARY] https://github.com/dotenvx/dotenvx/issues/576")
+    raise SystemExit(1)
+
+def is_stub_file(path, max_stub_size=1024):
+    try:
+        return os.path.getsize(path) < max_stub_size
+    except OSError:
+        return False
+
+def postinstall():
+    bin_dir = os.path.join(os.path.dirname(package_path), "bin")
+    os.makedirs(bin_dir, exist_ok=True)
+
+    try:
+        subprocess.run(
+            ["sh", "-c", f"curl -sfS https://dotenvx.sh?directory={bin_dir} | sh"],
+            check=True
+        )
+    except subprocess.CalledProcessError as e:
+        raise SystemExit(e.returncode)

{python_dotenvx-0.2.2 → python_dotenvx-0.2.3/src/python_dotenvx.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-dotenvx
-Version: 0.2.2
+Version: 0.2.3
 Summary: [dotenvx.com] a better dotenv–from the creator of `dotenv`
 Home-page: https://github.com/dotenvx/python-dotenvx
 Author: dotenv
@@ -46,23 +46,37 @@ Install and use it in code just like `python-dotenv`.
 ```sh
 pip install python-dotenvx
 ```
+
+Then run `dotenvx-postinstall` to install the `dotenvx` binary (python-dotenvx is a wrapper).
+
+```sh
+dotenvx-postinstall
+```
+
+Then use it in code.
+
 ```python
 # main.py
 import os
 from dotenvx import load_dotenvx
-load_dotenvx()  # take environment variables from .env.
+load_dotenvx() # take environment variables from .env.
 
 print(os.getenv("S3_BUCKET"))
 ```
 
  
 
-
 # Changelog
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-## [Unreleased](https://github.com/dotenvx/python-dotenvx/compare/v0.2.2...main)
+## [Unreleased](https://github.com/dotenvx/python-dotenvx/compare/v0.2.3...main)
+
+## [0.2.3](https://github.com/dotenvx/dotenvx/compare/v0.2.2...v0.2.3)
+
+### Changed
+
+* Patch `dotenvx` binary install across multiple edge cases
 
 ## [0.2.2](https://github.com/dotenvx/dotenvx/compare/v0.2.1...v0.2.2)
 

{python_dotenvx-0.2.2 → python_dotenvx-0.2.3}/src/python_dotenvx.egg-info/SOURCES.txt

@@ -7,7 +7,9 @@ setup.py
 src/dotenvx/__init__.py
 src/dotenvx/__version__.py
 src/dotenvx/main.py
+src/dotenvx/bin/dotenvx
 src/python_dotenvx.egg-info/PKG-INFO
 src/python_dotenvx.egg-info/SOURCES.txt
 src/python_dotenvx.egg-info/dependency_links.txt
+src/python_dotenvx.egg-info/entry_points.txt
 src/python_dotenvx.egg-info/top_level.txt

python_dotenvx-0.2.3/src/python_dotenvx.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+dotenvx-postinstall = dotenvx.main:postinstall

python_dotenvx-0.2.2/MANIFEST.in

@@ -1 +0,0 @@
-include CHANGELOG.md

python_dotenvx-0.2.2/src/dotenvx/main.py

@@ -1,2 +0,0 @@
-def load_dotenvx():
-  raise NotImplementedError("go to [github.com/dotenvx/dotenvx] and follow python directions there")