Fix init crash when package name is equal to one of typenames (#725)

droserasprout · web-flow · commit c0c2bb920f40 · 2023-06-28T17:04:13.000+04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog], and this project adheres to [Semantic Versioning].
 
+## [Unreleased]
+
+### Fixed
+
+- cli: Fixed `init` crash when package name is equal to one of the project typenames.
+
 ## [6.5.7] - 2022-05-30
 
 ### Added
diff --git a/Makefile b/Makefile
@@ -74,9 +74,6 @@ clean:          ## Remove all files from .gitignore except for `.venv`
 	git clean -xdf --exclude=".venv"
 
 update:         ## Update dependencies, export requirements.txt
-	git checkout HEAD requirements.* poetry.lock
-
-	make install
 	poetry update
 
 	cp pyproject.toml pyproject.toml.bak
diff --git a/demos/demo-auction/docker-compose.swarm.yml b/demos/demo-auction/docker-compose.swarm.yml
@@ -53,7 +53,7 @@ services:
     logging: *logging
 
   hasura:
-    image: hasura/graphql-engine:v2.25.1
+    image: hasura/graphql-engine:v2.28.0
     depends_on:
       - db
     environment:
diff --git a/demos/demo-auction/docker-compose.yml b/demos/demo-auction/docker-compose.yml
@@ -31,7 +31,7 @@ services:
       retries: 5
 
   hasura:
-    image: hasura/graphql-engine:v2.25.1
+    image: hasura/graphql-engine:v2.28.0
     ports:
       - 127.0.0.1:8080:8080
     depends_on:
diff --git a/demos/demo-auction/replay.json b/demos/demo-auction/replay.json
@@ -6,7 +6,7 @@
   "crash_reporting": false,
   "description": "My shiny new indexer based on DipDup",
   "dipdup_version": "6",
-  "hasura_image": "hasura/graphql-engine:v2.25.1",
+  "hasura_image": "hasura/graphql-engine:v2.28.0",
   "license": "MIT",
   "line_length": "120",
   "linters": "default",
diff --git a/demos/demo-big-maps/docker-compose.swarm.yml b/demos/demo-big-maps/docker-compose.swarm.yml
@@ -53,7 +53,7 @@ services:
     logging: *logging
 
   hasura:
-    image: hasura/graphql-engine:v2.25.1
+    image: hasura/graphql-engine:v2.28.0
     depends_on:
       - db
     environment:
diff --git a/demos/demo-big-maps/docker-compose.yml b/demos/demo-big-maps/docker-compose.yml
@@ -31,7 +31,7 @@ services:
       retries: 5
 
   hasura:
-    image: hasura/graphql-engine:v2.25.1
+    image: hasura/graphql-engine:v2.28.0
     ports:
       - 127.0.0.1:8080:8080
     depends_on:
diff --git a/demos/demo-big-maps/replay.json b/demos/demo-big-maps/replay.json
@@ -6,7 +6,7 @@
   "crash_reporting": false,
   "description": "My shiny new indexer based on DipDup",
   "dipdup_version": "6",
-  "hasura_image": "hasura/graphql-engine:v2.25.1",
+  "hasura_image": "hasura/graphql-engine:v2.28.0",
   "license": "MIT",
   "line_length": "120",
   "linters": "default",
diff --git a/demos/demo-dao/docker-compose.swarm.yml b/demos/demo-dao/docker-compose.swarm.yml
@@ -53,7 +53,7 @@ services:
     logging: *logging
 
   hasura:
-    image: hasura/graphql-engine:v2.25.1
+    image: hasura/graphql-engine:v2.28.0
     depends_on:
       - db
     environment:
diff --git a/demos/demo-dao/docker-compose.yml b/demos/demo-dao/docker-compose.yml
@@ -31,7 +31,7 @@ services:
       retries: 5
 
   hasura:
-    image: hasura/graphql-engine:v2.25.1
+    image: hasura/graphql-engine:v2.28.0
     ports:
       - 127.0.0.1:8080:8080
     depends_on:
diff --git a/demos/demo-dao/replay.json b/demos/demo-dao/replay.json
@@ -6,7 +6,7 @@
   "crash_reporting": false,
   "description": "My shiny new indexer based on DipDup",
   "dipdup_version": "6",
-  "hasura_image": "hasura/graphql-engine:v2.25.1",
+  "hasura_image": "hasura/graphql-engine:v2.28.0",
   "license": "MIT",
   "line_length": "120",
   "linters": "default",
diff --git a/demos/demo-dex/docker-compose.swarm.yml b/demos/demo-dex/docker-compose.swarm.yml
@@ -53,7 +53,7 @@ services:
     logging: *logging
 
   hasura:
-    image: hasura/graphql-engine:v2.25.1
+    image: hasura/graphql-engine:v2.28.0
     depends_on:
       - db
     environment:
diff --git a/demos/demo-dex/docker-compose.yml b/demos/demo-dex/docker-compose.yml
@@ -31,7 +31,7 @@ services:
       retries: 5
 
   hasura:
-    image: hasura/graphql-engine:v2.25.1
+    image: hasura/graphql-engine:v2.28.0
     ports:
       - 127.0.0.1:8080:8080
     depends_on:
diff --git a/demos/demo-dex/replay.json b/demos/demo-dex/replay.json
@@ -6,7 +6,7 @@
   "crash_reporting": false,
   "description": "My shiny new indexer based on DipDup",
   "dipdup_version": "6",
-  "hasura_image": "hasura/graphql-engine:v2.25.1",
+  "hasura_image": "hasura/graphql-engine:v2.28.0",
   "license": "MIT",
   "line_length": "120",
   "linters": "default",
diff --git a/demos/demo-domains/docker-compose.swarm.yml b/demos/demo-domains/docker-compose.swarm.yml
@@ -53,7 +53,7 @@ services:
     logging: *logging
 
   hasura:
-    image: hasura/graphql-engine:v2.25.1
+    image: hasura/graphql-engine:v2.28.0
     depends_on:
       - db
     environment:
diff --git a/demos/demo-domains/docker-compose.yml b/demos/demo-domains/docker-compose.yml
@@ -31,7 +31,7 @@ services:
       retries: 5
 
   hasura:
-    image: hasura/graphql-engine:v2.25.1
+    image: hasura/graphql-engine:v2.28.0
     ports:
       - 127.0.0.1:8080:8080
     depends_on:
diff --git a/demos/demo-domains/replay.json b/demos/demo-domains/replay.json
@@ -6,7 +6,7 @@
   "crash_reporting": false,
   "description": "My shiny new indexer based on DipDup",
   "dipdup_version": "6",
-  "hasura_image": "hasura/graphql-engine:v2.25.1",
+  "hasura_image": "hasura/graphql-engine:v2.28.0",
   "license": "MIT",
   "line_length": "120",
   "linters": "default",
diff --git a/demos/demo-events/docker-compose.swarm.yml b/demos/demo-events/docker-compose.swarm.yml
@@ -53,7 +53,7 @@ services:
     logging: *logging
 
   hasura:
-    image: hasura/graphql-engine:v2.25.1
+    image: hasura/graphql-engine:v2.28.0
     depends_on:
       - db
     environment:
diff --git a/demos/demo-events/docker-compose.yml b/demos/demo-events/docker-compose.yml
@@ -31,7 +31,7 @@ services:
       retries: 5
 
   hasura:
-    image: hasura/graphql-engine:v2.25.1
+    image: hasura/graphql-engine:v2.28.0
     ports:
       - 127.0.0.1:8080:8080
     depends_on:
diff --git a/demos/demo-events/replay.json b/demos/demo-events/replay.json
@@ -6,7 +6,7 @@
   "crash_reporting": false,
   "description": "My shiny new indexer based on DipDup",
   "dipdup_version": "6",
-  "hasura_image": "hasura/graphql-engine:v2.25.1",
+  "hasura_image": "hasura/graphql-engine:v2.28.0",
   "license": "MIT",
   "line_length": "120",
   "linters": "default",
diff --git a/demos/demo-factories/docker-compose.swarm.yml b/demos/demo-factories/docker-compose.swarm.yml
@@ -53,7 +53,7 @@ services:
     logging: *logging
 
   hasura:
-    image: hasura/graphql-engine:v2.25.1
+    image: hasura/graphql-engine:v2.28.0
     depends_on:
       - db
     environment:
diff --git a/demos/demo-factories/docker-compose.yml b/demos/demo-factories/docker-compose.yml
@@ -31,7 +31,7 @@ services:
       retries: 5
 
   hasura:
-    image: hasura/graphql-engine:v2.25.1
+    image: hasura/graphql-engine:v2.28.0
     ports:
       - 127.0.0.1:8080:8080
     depends_on:
diff --git a/demos/demo-factories/replay.json b/demos/demo-factories/replay.json
@@ -6,7 +6,7 @@
   "crash_reporting": false,
   "description": "My shiny new indexer based on DipDup",
   "dipdup_version": "6",
-  "hasura_image": "hasura/graphql-engine:v2.25.1",
+  "hasura_image": "hasura/graphql-engine:v2.28.0",
   "license": "MIT",
   "line_length": "120",
   "linters": "default",
diff --git a/demos/demo-head/docker-compose.swarm.yml b/demos/demo-head/docker-compose.swarm.yml
@@ -53,7 +53,7 @@ services:
     logging: *logging
 
   hasura:
-    image: hasura/graphql-engine:v2.25.1
+    image: hasura/graphql-engine:v2.28.0
     depends_on:
       - db
     environment:
diff --git a/demos/demo-head/docker-compose.yml b/demos/demo-head/docker-compose.yml
@@ -31,7 +31,7 @@ services:
       retries: 5
 
   hasura:
-    image: hasura/graphql-engine:v2.25.1
+    image: hasura/graphql-engine:v2.28.0
     ports:
       - 127.0.0.1:8080:8080
     depends_on:
diff --git a/demos/demo-head/replay.json b/demos/demo-head/replay.json
@@ -6,7 +6,7 @@
   "crash_reporting": false,
   "description": "My shiny new indexer based on DipDup",
   "dipdup_version": "6",
-  "hasura_image": "hasura/graphql-engine:v2.25.1",
+  "hasura_image": "hasura/graphql-engine:v2.28.0",
   "license": "MIT",
   "line_length": "120",
   "linters": "default",
diff --git a/demos/demo-nft-marketplace/docker-compose.swarm.yml b/demos/demo-nft-marketplace/docker-compose.swarm.yml
@@ -53,7 +53,7 @@ services:
     logging: *logging
 
   hasura:
-    image: hasura/graphql-engine:v2.25.1
+    image: hasura/graphql-engine:v2.28.0
     depends_on:
       - db
     environment:
diff --git a/demos/demo-nft-marketplace/docker-compose.yml b/demos/demo-nft-marketplace/docker-compose.yml
@@ -31,7 +31,7 @@ services:
       retries: 5
 
   hasura:
-    image: hasura/graphql-engine:v2.25.1
+    image: hasura/graphql-engine:v2.28.0
     ports:
       - 127.0.0.1:8080:8080
     depends_on:
diff --git a/demos/demo-nft-marketplace/replay.json b/demos/demo-nft-marketplace/replay.json
@@ -6,7 +6,7 @@
   "crash_reporting": false,
   "description": "My shiny new indexer based on DipDup",
   "dipdup_version": "6",
-  "hasura_image": "hasura/graphql-engine:v2.25.1",
+  "hasura_image": "hasura/graphql-engine:v2.28.0",
   "license": "MIT",
   "line_length": "120",
   "linters": "default",
diff --git a/demos/demo-raw/docker-compose.swarm.yml b/demos/demo-raw/docker-compose.swarm.yml
@@ -53,7 +53,7 @@ services:
     logging: *logging
 
   hasura:
-    image: hasura/graphql-engine:v2.25.1
+    image: hasura/graphql-engine:v2.28.0
     depends_on:
       - db
     environment:
diff --git a/demos/demo-raw/docker-compose.yml b/demos/demo-raw/docker-compose.yml
@@ -31,7 +31,7 @@ services:
       retries: 5
 
   hasura:
-    image: hasura/graphql-engine:v2.25.1
+    image: hasura/graphql-engine:v2.28.0
     ports:
       - 127.0.0.1:8080:8080
     depends_on:
diff --git a/demos/demo-raw/replay.json b/demos/demo-raw/replay.json
@@ -6,7 +6,7 @@
   "crash_reporting": false,
   "description": "My shiny new indexer based on DipDup",
   "dipdup_version": "6",
-  "hasura_image": "hasura/graphql-engine:v2.25.1",
+  "hasura_image": "hasura/graphql-engine:v2.28.0",
   "license": "MIT",
   "line_length": "120",
   "linters": "default",
diff --git a/demos/demo-token-transfers/docker-compose.swarm.yml b/demos/demo-token-transfers/docker-compose.swarm.yml
@@ -53,7 +53,7 @@ services:
     logging: *logging
 
   hasura:
-    image: hasura/graphql-engine:v2.25.1
+    image: hasura/graphql-engine:v2.28.0
     depends_on:
       - db
     environment:
diff --git a/demos/demo-token-transfers/docker-compose.yml b/demos/demo-token-transfers/docker-compose.yml
@@ -31,7 +31,7 @@ services:
       retries: 5
 
   hasura:
-    image: hasura/graphql-engine:v2.25.1
+    image: hasura/graphql-engine:v2.28.0
     ports:
       - 127.0.0.1:8080:8080
     depends_on:
diff --git a/demos/demo-token-transfers/replay.json b/demos/demo-token-transfers/replay.json
@@ -6,7 +6,7 @@
   "crash_reporting": false,
   "description": "My shiny new indexer based on DipDup",
   "dipdup_version": "6",
-  "hasura_image": "hasura/graphql-engine:v2.25.1",
+  "hasura_image": "hasura/graphql-engine:v2.28.0",
   "license": "MIT",
   "line_length": "120",
   "linters": "default",
diff --git a/demos/demo-token/docker-compose.swarm.yml b/demos/demo-token/docker-compose.swarm.yml
@@ -53,7 +53,7 @@ services:
     logging: *logging
 
   hasura:
-    image: hasura/graphql-engine:v2.25.1
+    image: hasura/graphql-engine:v2.28.0
     depends_on:
       - db
     environment:
diff --git a/demos/demo-token/docker-compose.yml b/demos/demo-token/docker-compose.yml
@@ -31,7 +31,7 @@ services:
       retries: 5
 
   hasura:
-    image: hasura/graphql-engine:v2.25.1
+    image: hasura/graphql-engine:v2.28.0
     ports:
       - 127.0.0.1:8080:8080
     depends_on:
diff --git a/demos/demo-token/replay.json b/demos/demo-token/replay.json
@@ -6,7 +6,7 @@
   "crash_reporting": false,
   "description": "My shiny new indexer based on DipDup",
   "dipdup_version": "6",
-  "hasura_image": "hasura/graphql-engine:v2.25.1",
+  "hasura_image": "hasura/graphql-engine:v2.28.0",
   "license": "MIT",
   "line_length": "120",
   "linters": "default",
diff --git a/docs/cookiecutter.json b/docs/cookiecutter.json
@@ -8,7 +8,7 @@
   "license": "MIT",
   "author": "John Smith <john_smith@localhost.lan>",
   "postgresql_image": "postgres:14",
-  "hasura_image": "hasura/graphql-engine:v2.25.1",
+  "hasura_image": "hasura/graphql-engine:v2.28.0",
   "crash_reporting": false,
   "linters": "default",
   "line_length": "120"
diff --git a/docs/theme/index.hbs b/docs/theme/index.hbs
@@ -144,21 +144,6 @@
 
                             theme_toggle.addEventListener('click', toggleTheme);
                         </script>
-                        {{!-- NOTE: Docs version switcher --}}
-                        <a class="icon-button" id="stable">stable</a>
-                        <a class="icon-button" id="latest">latest</a>
-                        <script type="text/javascript">
-                            stable_a = document.getElementById("stable");
-                            latest_a = document.getElementById("latest");
-                            if (window.location.href.includes("docs.")) {
-                                stable_a.style.color = "dimgray";
-                                latest_a.setAttribute('href', window.location.href.replace('docs.', 'docs-next.'));
-                            }
-                            else if (window.location.href.includes('docs-next.')) {
-                                latest_a.style.color = "dimgray";
-                                stable_a.setAttribute('href', window.location.href.replace('docs-next.', 'docs.'));
-                            }
-                        </script>
 
                     </div>
 
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
diff --git a/requirements.dev.txt b/requirements.dev.txt
diff --git a/requirements.pytezos.txt b/requirements.pytezos.txt
diff --git a/requirements.slim.txt b/requirements.slim.txt
diff --git a/requirements.txt b/requirements.txt
diff --git a/src/dipdup/codegen.py b/src/dipdup/codegen.py
diff --git a/src/dipdup/project.py b/src/dipdup/project.py
diff --git a/src/dipdup/utils/__init__.py b/src/dipdup/utils/__init__.py
