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

[pull] master from pycontw:master #77

Merged
merged 24 commits into from
Apr 14, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
d483165
deps: upgrade python to 3.10.14
mattwang44 Apr 6, 2024
990dddc
refactor(docker): align the debian packages used in dev/online image
mattwang44 Apr 6, 2024
b212031
deps: upgrade packages to support python 3.10
mattwang44 Apr 8, 2024
8e7c8d3
deps: drop raven as we don't use sentry now
mattwang44 Apr 8, 2024
0e38475
deps: drop django-q as we don't use it now
mattwang44 Apr 8, 2024
f115d02
deps: drop tox as we don't use it now
mattwang44 Apr 8, 2024
8d04b0e
deps: drop redis & huey as they're not used
mattwang44 Apr 8, 2024
43e8f03
deps: replace certifi & urllib3 with requests
mattwang44 Apr 8, 2024
9452855
deps: drop django-braces as it's not used
mattwang44 Apr 8, 2024
e4af425
fix(ci): update codecov action version
mattwang44 Apr 9, 2024
c3a0968
feat(pkg-mgmt): add pyproject.toml & poetry.lock of current packages
mattwang44 Apr 8, 2024
7567e82
feat(docker): install python packages with poetry instead of pip
mattwang44 Apr 8, 2024
c8e6566
feat(ci): use poetry instead of pip
mattwang44 Apr 8, 2024
a551daa
doc: update readme about poetry
mattwang44 Apr 8, 2024
6fc8899
chore: rm unused requirement files
mattwang44 Apr 8, 2024
8cc5feb
fix(dev): use poetry shell in dev env
mattwang44 Apr 9, 2024
fc3631d
chore(dev): rm unused var
mattwang44 Apr 9, 2024
060cbaf
deps: replace psycopg2-binary with psycopg2
mattwang44 Apr 9, 2024
4d19c53
chore: prevent compose service from exiting directly
mattwang44 Apr 12, 2024
5bac15d
Merge pull request #1171 from pycontw/upgrade-python-310
SivanYeh Apr 13, 2024
d540aea
Merge branch 'master' into adopt-poetry
mattwang44 Apr 13, 2024
f825944
Merge pull request #1172 from pycontw/adopt-poetry
mattwang44 Apr 13, 2024
327538e
chore(deps): bump qs from 6.5.2 to 6.5.3
dependabot[bot] Apr 13, 2024
3ef70e8
Merge pull request #1106 from pycontw/dependabot/npm_and_yarn/qs-6.5.3
mattwang44 Apr 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
deps: upgrade packages to support python 3.10
  • Loading branch information
mattwang44 committed Apr 8, 2024
commit b21203123305fb2241acd2120203b24363fade49
4 changes: 2 additions & 2 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ django-crispy-forms==1.8.1
# Django-environ allows you to utilize 12factor inspired environment variables
# to configure your Django application.
# https://django-environ.readthedocs.io/en/latest/
django-environ==0.4.5
django-environ==0.11.2

# Django application and library for importing and exporting data with
# included admin integration.
Expand Down Expand Up @@ -92,7 +92,7 @@ sortedcontainers==2.1.0

# Tabulate, an utility for pretty-print tabular data
# https://bitbucket.org/astanin/python-tabulate
tabulate==0.8.6
tabulate==0.9.0

urllib3==1.26.5

Expand Down
4 changes: 2 additions & 2 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# A configurable set of panels that display various debug information about
# the current request/response.
# https://django-debug-toolbar.readthedocs.io/en/latest/
django-debug-toolbar==2.2.1
django-debug-toolbar==3.2.3

# The Python WSGI Utility Library
# https://palletsprojects.com/p/werkzeug/
Expand All @@ -15,7 +15,7 @@ flake8==3.7.9

# A mature full-featured Python testing tool.
# https://docs.pytest.org/en/latest/
pytest==5.3.5
pytest==6.2.5

# A plugin for py.test that provides a set of useful tools for testing Django
# applications and projects.
Expand Down
2 changes: 1 addition & 1 deletion requirements/production.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ psycopg2==2.8.4

# uWSGI aims at developing a full stack for building hosting services
# https://uwsgi-docs.readthedocs.io/
uWSGI==2.0.18
uWSGI==2.0.24

# django-redis is a BSD Licensed, full featured Redis cache/session backend for Django.
# http:https://niwinz.github.io/django-redis/latest/
Expand Down
4 changes: 1 addition & 3 deletions src/pycontw2016/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,7 @@
# https://docs.djangoproject.com/en/dev/ref/settings/#databases

DATABASES = {
# Raises ImproperlyConfigured exception if DATABASE_URL not in
# os.environ
'default': env.db(),
'default': env.db_url(var='DATABASE_URL', default='postgres:https://postgres:[email protected]:5432/pycontw2016'),
}

# Application definition
Expand Down