Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes to Project structure #4269

Merged
merged 6 commits into from
Oct 1, 2024
Merged

Changes to Project structure #4269

merged 6 commits into from
Oct 1, 2024

Conversation

johniak
Copy link
Contributor

@johniak johniak commented Sep 30, 2024

This pull request focuses on extracting pdm.lock and pyproject.toml to the root directory and installing the project as a Python package rather than as copied directories.

It includes several changes to the Docker setup, configuration files, and project structure to streamline the build process and improve maintainability. Key changes include updates to the Dockerfile for better environment management, changes to configuration paths, and renaming and restructuring of key project files.

Docker and Environment Management:

  • docker/Dockerfile: Updated the Dockerfile to create separate stages for pdm and dist-builder, removed unnecessary environment variables, and adjusted the COPY commands for better file organization. [1] [2] [3] [4]
  • docker/entrypoint.sh: Changed the path for the Gunicorn configuration file to /conf/gunicorn_config.py.

Configuration Paths:

Project Structure:

  • manage.py: Renamed from src/manage.py to the project root for better accessibility.
  • pyproject.toml: Renamed from src/pyproject.toml and updated to include build-system requirements and reorganized dependencies. [1] [2] [3]
  • README.md: Removed outdated development instructions specific to the previous project structure.

Volume Mounts:

domdinicola and others added 5 commits September 25, 2024 14:51
- Project installs as packaget on dist image
- Rebuild dockerfile structure
- removed unused file
- addjusted entrypoint and manage.py
@domdinicola domdinicola self-requested a review September 30, 2024 14:10
@johniak johniak merged commit a3a8739 into develop Oct 1, 2024
11 checks passed
@johniak johniak deleted the structure2 branch October 1, 2024 07:46
domdinicola added a commit that referenced this pull request Oct 8, 2024
* 2201639_Individuals_Add_a_new_section_to_Display_Delivery_mechanism_details_for_an_individual

* mypy

* mypy

* move all the changes into new structure

* linter

* adjust options

* try with assert

* adjust factory

* fix e2e

* PaymentPlan details show Exchange Rate + Summary PDF (#4240)

* update pdf template

* black

* add exchange rate in pp details

* upd fe schema

---------

Co-authored-by: Maciej Szewczyk <maciej.szewczyk@tivix.com>

* 208491: RDI - Rename label to 'Total number of registered Individuals' (#4261)

* upd label

* upd fe test snap

* fix e2e

* snaps

---------

Co-authored-by: Maciej Szewczyk <maciej.szewczyk@tivix.com>

* Deduplication engine integration demo fixes (#4253)

* e2e edjustment + increase retry

* resolve migration conflict

* add compose file for running selenium locally, adjust readme

* try

* trial

* try

* ?

* ok

* hotfix_add_financial_payment_provider_inline_validation (#4193)

* remove lazy query

* fixed health check

* fix e2e

* added db host

* validate unique ind for role in hh

* linter

* noqa

* Changes to Project structure (#4269)

* structure

* fix docker compose

* Changes to project structure and Docker image building
- Project installs as packaget on dist image
- Rebuild dockerfile structure
- removed unused file
- addjusted entrypoint and manage.py

* fix code style

* selenium test fixes

* changed settings

---------

Co-authored-by: Domenico DiNicola <dom.dinicola@gmail.com>

* mypy

* fixes after structure change

* fail fast selenium

* fix e2e yesy

* remove comented headless

* e2e fixes

* fixed file path

* fixed report path

* run all tests

* fixes to reports and coverage

* 2212815_Needs_adjudication_Delays_in_creating_duplicate_tickets_after… (#4276)

* Program cycle requred for TP, adjust create TP from list in admin

* linter

* fix tests creating TPs without cycles

* skip forms

* fixed  test

* bring back nighlt runs for tests marked before

* 2216761_Adapt_Dedup_integration (#4280)

* 2216761_Adapt_Dedup_integration

* add migration

---------

Co-authored-by: marekbiczysko <marek.biczysko@tivix.com>

* remove usd from label (#4281)

Co-authored-by: Maciej Szewczyk <maciej.szewczyk@tivix.com>

* text

* skip trivy failure

* Project structure 3 (#4287)

* chenged tests dir

* fixed all linter problems

* fix  precomit

* fix compose

* fixed  tests root dir

* Update compose.yml

uncoment  volume

* adjust test to testcase

* remove edopomoga

* include src in path

* linter

* PM: Supporting documents (#4260)

* add new model

* add new urls

* add test & migrations

* imports

* tests & fixes

* add modal for supporting documents

* add delete, fix doc layout

* add supporting docs to follow up pages

* add title validation

* textfield size small

* regenerate schema

* add error for > 10 files, accept other filetypes

* add message when deleting doc

* display both title and file name

* upd e2e test_smoke_details_payment_plan

* review

* fix urls in tests

* migrations

* fix download resp

* fix

* add get_id

* supporting docs fixes

* mypy

* fixes

---------

Co-authored-by: Maciej Szewczyk <maciej.szewczyk@tivix.com>

* fix test admin

* fix coveragerc

* add ignore to codecov files

* move ignored paths to codecov.yml

* fixed retrieving version

* add vision app (#4274)

* contrib refactoring

* contrib refactoring

---------

Co-authored-by: Pavlo Mokiichuk <pv.pasha.pv@gmail.com>

* change text of xlsx individual update for invalid phone no

* include file

* linter

* Provide superusers and testers via env/arg to `initdemo` (#4295)

* add index on document number

* 216761 adapt dedup integration (#4298)

* [Back merge] prod>STG (#4294) (#4296)

* [hotfix] 216567 deduplication key error when deduplicating records (#4271)

* 2216567_Deduplication_Key_Error_when_deduplicating_records

* black

* remove distinct

* fix dedup logic, add ut

* lint

---------



* skip trivy failure

* fix document status when copy population (#4291)

---------

Co-authored-by: Pavlo Mokiichuk <pv.pasha.pv@gmail.com>
Co-authored-by: Marek Biczysko <34810846+MarekBiczysko@users.noreply.github.com>
Co-authored-by: marekbiczysko <marek.biczysko@tivix.com>
Co-authored-by: Bartosz Woźniak <17177420+wozniakpl@users.noreply.github.com>

---------

Co-authored-by: marekbiczysko <marek.biczysko@tivix.com>
Co-authored-by: Marek Biczysko <34810846+MarekBiczysko@users.noreply.github.com>
Co-authored-by: Paulina Kujawa <p.kujawa2f@gmail.com>
Co-authored-by: Pavlo Mokiichuk <pv.pasha.pv@gmail.com>
Co-authored-by: Maciej Szewczyk <maciej.szewczyk@tivix.com>
Co-authored-by: Maciej Szewczyk <34482854+mmaciekk@users.noreply.github.com>
Co-authored-by: Paulina Kujawa <42150286+pkujawa@users.noreply.github.com>
Co-authored-by: Jan Romaniak <jan.romaniak@kellton.com>
Co-authored-by: Jan Romaniak <jan.romaniak@tivix.com>
Co-authored-by: Bartosz Woźniak <17177420+wozniakpl@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants