data.coop/membersystem
7
2
Fork 4
Code Issues 14 Pull requests 1 Releases Wiki Activity

Changes to payment models #32

Merged
valberg merged 35 commits from benjaoming/membersystem:payment-updates into main 2024-08-03 17:55:33 +00:00
Conversation 5 Commits 35 Files changed 22 +34 -26
3 changed files with 34 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 037c204411 - Show all commits

2
pyproject.toml
View file

@ -68,7 +68,7 @@ matrix.python.dependencies = [
cov = "pytest --cov-report=term-missing --cov-config=pyproject.toml --cov=src --cov=tests --cov=append {args}" cov = "pytest --cov-report=term-missing --cov-config=pyproject.toml --cov=src --cov=tests --cov=append {args}"
no-cov = "cov --no-cov {args}" no-cov = "cov --no-cov {args}"
typecheck = "mypy --config-file=pyproject.toml ." typecheck = "mypy --config-file=pyproject.toml ."
requirements = "pip-compile pyproject.toml" requirements = "hatch env run --env default -- python --version; hatch env run --env dev -- python --version"
benjaoming marked this conversation as resolved Outdated
benjaoming commented 2024-07-31 22:35:34 +00:00
Outdated
Review
Copy link

Isn't this the correct way @valberg ?

Isn't this the correct way @valberg ?
valberg commented 2024-07-31 22:43:09 +00:00
Outdated
Review
Copy link

Yeah the one being removed is the "correct" way which I found at https://github.com/juftin/hatch-pip-compile/blob/main/docs/upgrading.md

Yeah the one being removed is the "correct" way which I found at https://github.com/juftin/hatch-pip-compile/blob/main/docs/upgrading.md
benjaoming commented 2024-07-31 22:52:04 +00:00
Outdated
Review
Copy link

I get this error when running it: LockFileError: Could not find lock file python version

image
I get this error when running it: `LockFileError: Could not find lock file python version` <img width="687" alt="image" src="/attachments/26d96dfc-0f57-4606-b140-f8d10be6aea4">
image.png
132 KiB
benjaoming commented 2024-08-01 11:01:10 +00:00
Outdated
Review
Copy link

Maybe that error is because the old "requirements.txt" I had didn't specify the Python version using the same string pattern 🤪

Notably when this was changed, the command started working:

-# This file is autogenerated by pip-compile with Python 3.12
-# by the following command:
+# This file is autogenerated by hatch-pip-compile with Python 3.12

After that, it started working.

Maybe that error is because the old "requirements.txt" I had didn't specify the Python version using the same string pattern 🤪 Notably when this was changed, the command started working: ``` -# This file is autogenerated by pip-compile with Python 3.12 -# by the following command: +# This file is autogenerated by hatch-pip-compile with Python 3.12 ``` After that, it started working.
benjaoming commented 2024-08-01 11:06:12 +00:00
Outdated
Review
Copy link

I've restored it... hatch env run --env default -- python --version; hatch env run --env dev -- python --version is really incomprehensible compared to the old version, also funny that hatch run dev:requirements spawns another hatch command in another environment - but I guess that it's just part of some magic that Just Works.

I've restored it... `hatch env run --env default -- python --version; hatch env run --env dev -- python --version` is really incomprehensible compared to the old version, also funny that `hatch run dev:requirements` spawns another hatch command in another environment - but I guess that it's just part of some magic that Just Works.
server = "./src/manage.py runserver 0.0.0.0:8000" server = "./src/manage.py runserver 0.0.0.0:8000"
migrate = "./src/manage.py migrate" migrate = "./src/manage.py migrate"
makemigrations = "./src/manage.py makemigrations" makemigrations = "./src/manage.py makemigrations"

54
requirements.txt
View file

@ -1,9 +1,21 @@
# #
# This file is autogenerated by pip-compile with Python 3.12 # This file is autogenerated by hatch-pip-compile with Python 3.12
# by the following command:
# #
# pip-compile pyproject.toml # - django-allauth~=0.63
# - django-money~=3.5
# - django-oauth-toolkit~=2.4
# - django-registries==0.0.3
# - django-stubs-ext~=5.0
# - django-view-decorator==0.0.4
# - django-zen-queries~=2.1
# - django<5.2,>=5.1b1
# - environs[django]<12,>=11
# - psycopg[binary]~=3.2
# - stripe~=10.5
# - uvicorn~=0.30
# - whitenoise~=6.7
# #
asgiref==3.8.1 asgiref==3.8.1
# via django # via django
babel==2.15.0 babel==2.15.0
@ -22,8 +34,9 @@ dj-database-url==2.2.0
# via environs # via environs
dj-email-url==1.0.6 dj-email-url==1.0.6
# via environs # via environs
django==5.1b1 django==5.1rc1
# via # via
# hatch.envs.default
# dj-database-url # dj-database-url
# django-allauth # django-allauth
# django-money # django-money
@ -32,27 +45,24 @@ django==5.1b1
# django-stubs-ext # django-stubs-ext
# django-view-decorator # django-view-decorator
# django-zen-queries # django-zen-queries
# membersystem (pyproject.toml)
django-allauth==0.63.6 django-allauth==0.63.6
# via membersystem (pyproject.toml) # via hatch.envs.default
django-cache-url==3.4.5 django-cache-url==3.4.5
# via environs # via environs
django-money==3.5.2 django-money==3.5.2
# via membersystem (pyproject.toml) # via hatch.envs.default
django-oauth-toolkit==2.4.0 django-oauth-toolkit==2.4.0
# via membersystem (pyproject.toml) # via hatch.envs.default
django-registries==0.0.3 django-registries==0.0.3
# via membersystem (pyproject.toml) # via hatch.envs.default
django-stubs-ext==5.0.4 django-stubs-ext==5.0.4
# via membersystem (pyproject.toml) # via hatch.envs.default
django-view-decorator==0.0.4 django-view-decorator==0.0.4
# via membersystem (pyproject.toml) # via hatch.envs.default
django-zen-queries==2.1.0 django-zen-queries==2.1.0
# via membersystem (pyproject.toml) # via hatch.envs.default
environs[django]==11.0.0 environs==11.0.0
# via # via hatch.envs.default
# environs
# membersystem (pyproject.toml)
h11==0.14.0 h11==0.14.0
# via uvicorn # via uvicorn
idna==3.7 idna==3.7
@ -65,10 +75,8 @@ oauthlib==3.2.2
# via django-oauth-toolkit # via django-oauth-toolkit
packaging==24.1 packaging==24.1
# via marshmallow # via marshmallow
psycopg[binary]==3.2.1 psycopg==3.2.1
# via # via hatch.envs.default
# membersystem (pyproject.toml)
# psycopg
psycopg-binary==3.2.1 psycopg-binary==3.2.1
# via psycopg # via psycopg
py-moneyed==3.0 py-moneyed==3.0
@ -86,7 +94,7 @@ requests==2.32.3
sqlparse==0.5.1 sqlparse==0.5.1
# via django # via django
stripe==10.5.0 stripe==10.5.0
# via membersystem (pyproject.toml) # via hatch.envs.default
typing-extensions==4.12.2 typing-extensions==4.12.2
# via # via
# dj-database-url # dj-database-url
@ -98,9 +106,9 @@ typing-extensions==4.12.2
urllib3==2.2.2 urllib3==2.2.2
# via requests # via requests
uvicorn==0.30.4 uvicorn==0.30.4
# via membersystem (pyproject.toml) # via hatch.envs.default
whitenoise==6.7.0 whitenoise==6.7.0
# via membersystem (pyproject.toml) # via hatch.envs.default
# The following packages are considered to be unsafe in a requirements file: # The following packages are considered to be unsafe in a requirements file:
# setuptools # setuptools

4
requirements/requirements-dev.txt
View file

@ -55,7 +55,7 @@ dj-database-url==2.2.0
# via environs # via environs
dj-email-url==1.0.6 dj-email-url==1.0.6
# via environs # via environs
django==5.1b1 django==5.1rc1
# via # via
# hatch.envs.dev # hatch.envs.dev
# dj-database-url # dj-database-url
@ -180,7 +180,7 @@ typing-extensions==4.12.2
# stripe # stripe
urllib3==2.2.2 urllib3==2.2.2
# via requests # via requests
uvicorn==0.30.3 uvicorn==0.30.4
# via hatch.envs.dev # via hatch.envs.dev
wheel==0.43.0 wheel==0.43.0
# via pip-tools # via pip-tools