Mercurial Repositories > Django Project / changeset

--- a/.hgignore	Thu Dec 30 11:59:01 2021 +0100
+++ b/.hgignore	Fri Dec 31 13:16:39 2021 +0100
@@ -1,6 +1,7 @@
 glob:.eric7project
 glob:.eric6project
 glob:.ropeproject
+glob:.jedi
 glob:.directory
 glob:**.pyc
 glob:**.pyo

--- a/ChangeLog	Thu Dec 30 11:59:01 2021 +0100
+++ b/ChangeLog	Fri Dec 31 13:16:39 2021 +0100
@@ -1,5 +1,8 @@
 ChangeLog
 ---------
+Version 10.0.1:
+- fixed issue 413
+
 Version 10.0.0:
 - first release of the eric7 variant
 

--- a/PluginProjectDjango.py	Thu Dec 30 11:59:01 2021 +0100
+++ b/PluginProjectDjango.py	Fri Dec 31 13:16:39 2021 +0100
@@ -26,7 +26,7 @@
 author = "Detlev Offenbach <detlev@die-offenbachs.de>"
 autoactivate = True
 deactivateable = True
-version = "10.0.0"
+version = "10.0.1"
 className = "ProjectDjangoPlugin"
 packageName = "ProjectDjango"
 shortDescription = "Project support for Django projects."

Binary file PluginProjectDjango.zip has changed

--- a/ProjectDjango/Project.py	Thu Dec 30 11:59:01 2021 +0100
+++ b/ProjectDjango/Project.py	Fri Dec 31 13:16:39 2021 +0100
@@ -1305,7 +1305,7 @@
             if isWindowsPlatform():
                 for cmd in [
                     # standard Python
-                    os.path.join(virtualEnv, "Scripts", "django-admin.py"),
+                    os.path.join(virtualEnv, "Scripts", "django-admin.exe"),
                     # PyPy
                     os.path.join(virtualEnv, "bin", "django-admin.py"),
                 ]:
@@ -1315,11 +1315,11 @@
                     cmd = ""
             else:
                 cmds = [
+                    os.path.join(virtualEnv, "bin", "django-admin"),
                     os.path.join(virtualEnv, "bin", "django-admin.py"),
-                    os.path.join(virtualEnv, "bin", "django-admin"),
+                    os.path.join(virtualEnv, "local", "bin", "django-admin"),
                     os.path.join(virtualEnv, "local", "bin",
                                  "django-admin.py"),
-                    os.path.join(virtualEnv, "local", "bin", "django-admin"),
                 ]
                 for cmd in cmds:
                     if os.path.exists(cmd):
@@ -1331,7 +1331,7 @@
                 debugEnv = self.__getDebugEnvironment(language)
                 for cmd in [
                     # standard Python
-                    os.path.join(debugEnv, "Scripts", "django-admin.py"),
+                    os.path.join(debugEnv, "Scripts", "django-admin.exe"),
                     # PyPy
                     os.path.join(debugEnv, "bin", "django-admin.py"),
                 ]:
@@ -1341,14 +1341,17 @@
                     cmd = ""
             else:
                 if language == "Python3":
-                    cmds = ["django-admin3.py", "django-admin3",
+                    cmds = ["django-admin3",
+                            "django-admin3.py",
                             "django-admin.py-3.10",
-                            "django-admin.py-3.9", "django-admin.py-3.8",
-                            "django-admin.py-3.7", "django-admin.py-3.6",
+                            "django-admin.py-3.9",
+                            "django-admin.py-3.8",
+                            "django-admin.py-3.7",
+                            "django-admin.py-3.6",
                             ]
                 else:
                     cmds = []
-                cmds.extend(["django-admin.py", "django-admin"])
+                cmds.extend(["django-admin", "django-admin.py"])
                 for cmd in cmds:
                     if Utilities.isinpath(cmd):
                         break