Fix plain package structure one more time (#777)

droserasprout · web-flow · commit e3b871f4f2aa · 2023-08-04T21:04:23.000+04:00
diff --git a/docs/1.getting-started/4.package.md b/docs/1.getting-started/4.package.md
@@ -11,22 +11,22 @@ To generate all necessary directories and files according to config run the `ini
 
 The structure of the resulting package is the following:
 
-| Path                       | Description                                                                                                                          |
-| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------ |
-| :file_folder: `abi`        | Contract ABIs used to generate typeclasses                                                                                           |
-| :file_folder: `configs`    | Environment-specific configs to merge with the root one                                                                              |
-| :file_folder: `deploy`     | Dockerfiles, compose files, and default env variables for each environment                                                           |
-| :file_folder: `graphql`    | Custom GraphQL queries to expose with Hasura engine                                                                                  |
-| :file_folder: `handlers`   | User-defined callbacks to process contract data                                                                                      |
-| :file_folder: `hasura`     | Arbitrary Hasura metadata to apply during configuration                                                                              |
-| :file_folder: `hooks`      | User-defined callbacks to run manually or by schedule                                                                                |
-| :file_folder: `models`     | DipDup ORM models to store data in the database                                                                                      |
-| :file_folder: `sql`        | SQL scripts and queries to run manually or on specific events                                                                        |
-| :file_folder: `types`      | Automatically generated Pydantic dataclasses for contract types                                                                      |
-| `dipdup.yaml`              | Root DipDup config; can be expanded with env-specific files                                                                          |
-| `{{ project.package }}.py` | A little helper to let you import the package from the root directory.                                                               |
-| `pyproject.toml`           | Python package metadata (introduced in PEP 518; see [details](https://pip.pypa.io/en/stable/reference/build-system/pyproject-toml/)) |
-|                            |                                                                                                                                      |
+| Path                          | Description                                                                                                                          |
+| ----------------------------- | ------------------------------------------------------------------------------------------------------------------------------------ |
+| :file_folder: `abi`           | Contract ABIs used to generate typeclasses                                                                                           |
+| :file_folder: `configs`       | Environment-specific configs to merge with the root one                                                                              |
+| :file_folder: `deploy`        | Dockerfiles, compose files, and default env variables for each environment                                                           |
+| :file_folder: `graphql`       | Custom GraphQL queries to expose with Hasura engine                                                                                  |
+| :file_folder: `handlers`      | User-defined callbacks to process contract data                                                                                      |
+| :file_folder: `hasura`        | Arbitrary Hasura metadata to apply during configuration                                                                              |
+| :file_folder: `hooks`         | User-defined callbacks to run manually or by schedule                                                                                |
+| :file_folder: `models`        | DipDup ORM models to store data in the database                                                                                      |
+| :file_folder: `sql`           | SQL scripts and queries to run manually or on specific events                                                                        |
+| :file_folder: `types`         | Automatically generated Pydantic dataclasses for contract types                                                                      |
+| `dipdup.yaml`                 | Root DipDup config; can be expanded with env-specific files                                                                          |
+| `{{ project.package }}  -> .` | A little helper to let you import the package from the root directory.                                                               |
+| `pyproject.toml`              | Python package metadata (introduced in PEP 518; see [details](https://pip.pypa.io/en/stable/reference/build-system/pyproject-toml/)) |
+|                               |                                                                                                                                      |
 
 There are also a bunch files in the root directory: .ignore files, PEP 561 marker, etc. Usually, you won't need to modify them.
 
diff --git a/src/demo_auction/.dockerignore b/src/demo_auction/.dockerignore
@@ -2,6 +2,7 @@
 *
 
 # Add metadata and build files
+!demo_auction
 !pyproject.toml
 !pdm.lock
 !README.md
diff --git a/src/demo_auction/.gitignore b/src/demo_auction/.gitignore
@@ -3,6 +3,7 @@
 !*/
 
 # Add metadata and build files
+!demo_auction
 !.gitignore
 !.dockerignore
 !**/Dockerfile
diff --git a/src/demo_auction/demo_auction b/src/demo_auction/demo_auction
@@ -0,0 +1 @@
+.
diff --git a/src/demo_auction/demo_auction.py b/src/demo_auction/demo_auction.py
diff --git a/src/demo_big_maps/.dockerignore b/src/demo_big_maps/.dockerignore
@@ -2,6 +2,7 @@
 *
 
 # Add metadata and build files
+!demo_big_maps
 !pyproject.toml
 !pdm.lock
 !README.md
diff --git a/src/demo_big_maps/.gitignore b/src/demo_big_maps/.gitignore
@@ -3,6 +3,7 @@
 !*/
 
 # Add metadata and build files
+!demo_big_maps
 !.gitignore
 !.dockerignore
 !**/Dockerfile
diff --git a/src/demo_big_maps/demo_big_maps b/src/demo_big_maps/demo_big_maps
@@ -0,0 +1 @@
+.
diff --git a/src/demo_big_maps/demo_big_maps.py b/src/demo_big_maps/demo_big_maps.py
diff --git a/src/demo_blank/.dockerignore b/src/demo_blank/.dockerignore
@@ -2,6 +2,7 @@
 *
 
 # Add metadata and build files
+!demo_blank
 !pyproject.toml
 !pdm.lock
 !README.md
diff --git a/src/demo_blank/.gitignore b/src/demo_blank/.gitignore
@@ -3,6 +3,7 @@
 !*/
 
 # Add metadata and build files
+!demo_blank
 !.gitignore
 !.dockerignore
 !**/Dockerfile
diff --git a/src/demo_blank/demo_blank b/src/demo_blank/demo_blank
@@ -0,0 +1 @@
+.
diff --git a/src/demo_blank/demo_blank.py b/src/demo_blank/demo_blank.py
diff --git a/src/demo_dao/.dockerignore b/src/demo_dao/.dockerignore
@@ -2,6 +2,7 @@
 *
 
 # Add metadata and build files
+!demo_dao
 !pyproject.toml
 !pdm.lock
 !README.md
diff --git a/src/demo_dao/.gitignore b/src/demo_dao/.gitignore
@@ -3,6 +3,7 @@
 !*/
 
 # Add metadata and build files
+!demo_dao
 !.gitignore
 !.dockerignore
 !**/Dockerfile
diff --git a/src/demo_dao/demo_dao b/src/demo_dao/demo_dao
@@ -0,0 +1 @@
+.
diff --git a/src/demo_dao/demo_dao.py b/src/demo_dao/demo_dao.py
diff --git a/src/demo_dex/.dockerignore b/src/demo_dex/.dockerignore
@@ -2,6 +2,7 @@
 *
 
 # Add metadata and build files
+!demo_dex
 !pyproject.toml
 !pdm.lock
 !README.md
diff --git a/src/demo_dex/.gitignore b/src/demo_dex/.gitignore
@@ -3,6 +3,7 @@
 !*/
 
 # Add metadata and build files
+!demo_dex
 !.gitignore
 !.dockerignore
 !**/Dockerfile
diff --git a/src/demo_dex/demo_dex b/src/demo_dex/demo_dex
@@ -0,0 +1 @@
+.
diff --git a/src/demo_dex/demo_dex.py b/src/demo_dex/demo_dex.py
diff --git a/src/demo_domains/.dockerignore b/src/demo_domains/.dockerignore
@@ -2,6 +2,7 @@
 *
 
 # Add metadata and build files
+!demo_domains
 !pyproject.toml
 !pdm.lock
 !README.md
diff --git a/src/demo_domains/.gitignore b/src/demo_domains/.gitignore
@@ -3,6 +3,7 @@
 !*/
 
 # Add metadata and build files
+!demo_domains
 !.gitignore
 !.dockerignore
 !**/Dockerfile
diff --git a/src/demo_domains/demo_domains b/src/demo_domains/demo_domains
@@ -0,0 +1 @@
+.
diff --git a/src/demo_domains/demo_domains.py b/src/demo_domains/demo_domains.py
diff --git a/src/demo_events/.dockerignore b/src/demo_events/.dockerignore
@@ -2,6 +2,7 @@
 *
 
 # Add metadata and build files
+!demo_events
 !pyproject.toml
 !pdm.lock
 !README.md
diff --git a/src/demo_events/.gitignore b/src/demo_events/.gitignore
@@ -3,6 +3,7 @@
 !*/
 
 # Add metadata and build files
+!demo_events
 !.gitignore
 !.dockerignore
 !**/Dockerfile
diff --git a/src/demo_events/demo_events b/src/demo_events/demo_events
@@ -0,0 +1 @@
+.
diff --git a/src/demo_events/demo_events.py b/src/demo_events/demo_events.py
diff --git a/src/demo_evm_events/.dockerignore b/src/demo_evm_events/.dockerignore
@@ -2,6 +2,7 @@
 *
 
 # Add metadata and build files
+!demo_evm_events
 !pyproject.toml
 !pdm.lock
 !README.md
diff --git a/src/demo_evm_events/.gitignore b/src/demo_evm_events/.gitignore
@@ -3,6 +3,7 @@
 !*/
 
 # Add metadata and build files
+!demo_evm_events
 !.gitignore
 !.dockerignore
 !**/Dockerfile
diff --git a/src/demo_evm_events/demo_evm_events b/src/demo_evm_events/demo_evm_events
@@ -0,0 +1 @@
+.
diff --git a/src/demo_evm_events/demo_evm_events.py b/src/demo_evm_events/demo_evm_events.py
diff --git a/src/demo_factories/.dockerignore b/src/demo_factories/.dockerignore
@@ -2,6 +2,7 @@
 *
 
 # Add metadata and build files
+!demo_factories
 !pyproject.toml
 !pdm.lock
 !README.md
diff --git a/src/demo_factories/.gitignore b/src/demo_factories/.gitignore
@@ -3,6 +3,7 @@
 !*/
 
 # Add metadata and build files
+!demo_factories
 !.gitignore
 !.dockerignore
 !**/Dockerfile
diff --git a/src/demo_factories/demo_factories b/src/demo_factories/demo_factories
@@ -0,0 +1 @@
+.
diff --git a/src/demo_factories/demo_factories.py b/src/demo_factories/demo_factories.py
diff --git a/src/demo_head/.dockerignore b/src/demo_head/.dockerignore
@@ -2,6 +2,7 @@
 *
 
 # Add metadata and build files
+!demo_head
 !pyproject.toml
 !pdm.lock
 !README.md
diff --git a/src/demo_head/.gitignore b/src/demo_head/.gitignore
@@ -3,6 +3,7 @@
 !*/
 
 # Add metadata and build files
+!demo_head
 !.gitignore
 !.dockerignore
 !**/Dockerfile
diff --git a/src/demo_head/demo_head b/src/demo_head/demo_head
@@ -0,0 +1 @@
+.
diff --git a/src/demo_head/demo_head.py b/src/demo_head/demo_head.py
diff --git a/src/demo_nft_marketplace/.dockerignore b/src/demo_nft_marketplace/.dockerignore
@@ -2,6 +2,7 @@
 *
 
 # Add metadata and build files
+!demo_nft_marketplace
 !pyproject.toml
 !pdm.lock
 !README.md
diff --git a/src/demo_nft_marketplace/.gitignore b/src/demo_nft_marketplace/.gitignore
@@ -3,6 +3,7 @@
 !*/
 
 # Add metadata and build files
+!demo_nft_marketplace
 !.gitignore
 !.dockerignore
 !**/Dockerfile
diff --git a/src/demo_nft_marketplace/demo_nft_marketplace b/src/demo_nft_marketplace/demo_nft_marketplace
@@ -0,0 +1 @@
+.
diff --git a/src/demo_nft_marketplace/demo_nft_marketplace.py b/src/demo_nft_marketplace/demo_nft_marketplace.py
diff --git a/src/demo_raw/.dockerignore b/src/demo_raw/.dockerignore
@@ -2,6 +2,7 @@
 *
 
 # Add metadata and build files
+!demo_raw
 !pyproject.toml
 !pdm.lock
 !README.md
diff --git a/src/demo_raw/.gitignore b/src/demo_raw/.gitignore
@@ -3,6 +3,7 @@
 !*/
 
 # Add metadata and build files
+!demo_raw
 !.gitignore
 !.dockerignore
 !**/Dockerfile
diff --git a/src/demo_raw/demo_raw b/src/demo_raw/demo_raw
@@ -0,0 +1 @@
+.
diff --git a/src/demo_raw/demo_raw.py b/src/demo_raw/demo_raw.py
diff --git a/src/demo_token/.dockerignore b/src/demo_token/.dockerignore
@@ -2,6 +2,7 @@
 *
 
 # Add metadata and build files
+!demo_token
 !pyproject.toml
 !pdm.lock
 !README.md
diff --git a/src/demo_token/.gitignore b/src/demo_token/.gitignore
@@ -3,6 +3,7 @@
 !*/
 
 # Add metadata and build files
+!demo_token
 !.gitignore
 !.dockerignore
 !**/Dockerfile
diff --git a/src/demo_token/demo_token b/src/demo_token/demo_token
@@ -0,0 +1 @@
+.
diff --git a/src/demo_token/demo_token.py b/src/demo_token/demo_token.py
diff --git a/src/demo_token_transfers/.dockerignore b/src/demo_token_transfers/.dockerignore
@@ -2,6 +2,7 @@
 *
 
 # Add metadata and build files
+!demo_token_transfers
 !pyproject.toml
 !pdm.lock
 !README.md
diff --git a/src/demo_token_transfers/.gitignore b/src/demo_token_transfers/.gitignore
@@ -3,6 +3,7 @@
 !*/
 
 # Add metadata and build files
+!demo_token_transfers
 !.gitignore
 !.dockerignore
 !**/Dockerfile
diff --git a/src/demo_token_transfers/demo_token_transfers b/src/demo_token_transfers/demo_token_transfers
@@ -0,0 +1 @@
+.
diff --git a/src/demo_token_transfers/demo_token_transfers.py b/src/demo_token_transfers/demo_token_transfers.py
diff --git a/src/demo_uniswap/.dockerignore b/src/demo_uniswap/.dockerignore
@@ -2,6 +2,7 @@
 *
 
 # Add metadata and build files
+!demo_uniswap
 !pyproject.toml
 !pdm.lock
 !README.md
diff --git a/src/demo_uniswap/.gitignore b/src/demo_uniswap/.gitignore
@@ -3,6 +3,7 @@
 !*/
 
 # Add metadata and build files
+!demo_uniswap
 !.gitignore
 !.dockerignore
 !**/Dockerfile
diff --git a/src/demo_uniswap/demo_uniswap b/src/demo_uniswap/demo_uniswap
@@ -0,0 +1 @@
+.
diff --git a/src/demo_uniswap/demo_uniswap.py b/src/demo_uniswap/demo_uniswap.py
diff --git a/src/dipdup/__init__.py b/src/dipdup/__init__.py
diff --git a/src/dipdup/env.py b/src/dipdup/env.py
diff --git a/src/dipdup/package.py b/src/dipdup/package.py
diff --git a/src/dipdup/projects/base/.dockerignore.j2 b/src/dipdup/projects/base/.dockerignore.j2
diff --git a/src/dipdup/projects/base/.gitignore.j2 b/src/dipdup/projects/base/.gitignore.j2
diff --git a/src/dipdup/projects/base/{{project.package}}.py.j2 b/src/dipdup/projects/base/{{project.package}}.py.j2
diff --git a/src/dipdup/utils.py b/src/dipdup/utils.py

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`*`
`3`	`3`
`4`	`4`	`# Add metadata and build files`
	`5`	`+!demo_auction`
`5`	`6`	`!pyproject.toml`
`6`	`7`	`!pdm.lock`
`7`	`8`	`!README.md`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`*`
`3`	`3`
`4`	`4`	`# Add metadata and build files`
	`5`	`+!demo_big_maps`
`5`	`6`	`!pyproject.toml`
`6`	`7`	`!pdm.lock`
`7`	`8`	`!README.md`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`*`
`3`	`3`
`4`	`4`	`# Add metadata and build files`
	`5`	`+!demo_blank`
`5`	`6`	`!pyproject.toml`
`6`	`7`	`!pdm.lock`
`7`	`8`	`!README.md`