ampltools: Prepare bugfix release v0.6.4

ampl · Nov 17, 2023 · 5fe7f48 · 5fe7f48
1 parent f575307
commit 5fe7f48
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/amplpy/vendor/CHANGELOG.md b/amplpy/vendor/CHANGELOG.md
@@ -2,6 +2,9 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 0.6.4 - 2023-11-17
+- Fix error after installing modules.
+
 ## 0.6.3 - 2023-11-15
 - Ignore default license outside Google Colab.
 

diff --git a/amplpy/vendor/ampltools/__init__.py b/amplpy/vendor/ampltools/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = "0.6.3"
+__version__ = "0.6.4"
 from .notebooks import (
     ampl_notebook,
 )

diff --git a/amplpy/vendor/ampltools/modules/__init__.py b/amplpy/vendor/ampltools/modules/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = "0.6.3"
+__version__ = "0.6.4"
 
 from .amplpypi import (
     path,

diff --git a/amplpy/vendor/ampltools/modules/amplpypi.py b/amplpy/vendor/ampltools/modules/amplpypi.py
@@ -203,8 +203,9 @@ def _load_ampl_module(module_name):
 
 def _locate_modules(modules, verbose=False):
     path_modules = []
-    for name in modules:
-        module_name = "ampl_module_" + name
+    for module_name in modules:
+        if not module_name.startswith("ampl_module_"):
+            module_name = "ampl_module_" + module_name
         bin_dir = None
         try:
             bin_dir, _ = _load_ampl_module(module_name)

diff --git a/amplpy/vendor/setup.py b/amplpy/vendor/setup.py
@@ -24,7 +24,7 @@ def ls_dir(base_dir):
 
 setup(
     name="ampltools",
-    version="0.6.3",
+    version="0.6.4",
     description="AMPL Python Tools",
     long_description=__doc__,
     long_description_content_type="text/markdown",