Commit graph

5199 commits

Author SHA1 Message Date
PCoder
50e47d5961 Changes to get the server up and running 2023-07-31 08:30:24 +00:00
PCoder
61d41a2879 Add docker-compose.yml 2023-07-31 05:11:05 +00:00
PCoder
2679c2ddd5 Add missing importlib_metadata dependency 2023-05-30 03:57:13 +00:00
PCoder
c52dff2c10 Rename celery.py to pr_celery => causing conflict in names 2023-05-30 03:56:46 +00:00
PCoder
10c3c2381c Update Dockerfile 2023-05-30 03:55:09 +00:00
PCoder
934c1f98de Updates : stalled with celery
alpine:~/dynamicweb# docker run -ti dynamicweb:latest
Unhandled exception in thread started by <function check_errors.<locals>.wrapper at 0x7f9ede435cb0>
Traceback (most recent call last):
  File "/venv/lib/python3.7/site-packages/django/utils/autoreload.py", line 228, in wrapper
    fn(*args, **kwargs)
  File "/venv/lib/python3.7/site-packages/django/core/management/commands/runserver.py", line 116, in inner_run
    autoreload.raise_last_exception()
  File "/venv/lib/python3.7/site-packages/django/utils/autoreload.py", line 251, in raise_last_exception
    six.reraise(*_exception)
  File "/venv/lib/python3.7/site-packages/django/utils/six.py", line 685, in reraise
    raise value.with_traceback(tb)
  File "/venv/lib/python3.7/site-packages/django/utils/autoreload.py", line 228, in wrapper
    fn(*args, **kwargs)
  File "/venv/lib/python3.7/site-packages/django/__init__.py", line 27, in setup
    apps.populate(settings.INSTALLED_APPS)
  File "/venv/lib/python3.7/site-packages/django/apps/registry.py", line 108, in populate
    app_config.import_models()
  File "/venv/lib/python3.7/site-packages/django/apps/config.py", line 202, in import_models
    self.models_module = import_module(models_module_name)
  File "/usr/local/lib/python3.7/importlib/__init__.py", line 127, in import_module
    return _bootstrap._gcd_import(name[level:], package, level)
  File "<frozen importlib._bootstrap>", line 1006, in _gcd_import
  File "<frozen importlib._bootstrap>", line 983, in _find_and_load
  File "<frozen importlib._bootstrap>", line 967, in _find_and_load_unlocked
  File "<frozen importlib._bootstrap>", line 677, in _load_unlocked
  File "<frozen importlib._bootstrap_external>", line 728, in exec_module
  File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
  File "/app/opennebula_api/models.py", line 11, in <module>
    from utils.tasks import save_ssh_key, save_ssh_key_error_handler
  File "/app/utils/tasks.py", line 5, in <module>
    from celery.result import AsyncResult
  File "/venv/lib/python3.7/site-packages/celery/result.py", line 14, in <module>
    from . import current_app, states
ImportError: cannot import name 'current_app' from 'celery' (/venv/lib/python3.7/site-packages/celery/__init__.py)
2023-05-29 11:53:55 +00:00
PCoder
56cae7b8ab Update more dependencies; fails at no module django_celery_results 2023-05-27 08:43:22 +00:00
PCoder
e1764736fc Update django to fix the error SyntaxError: Generator expression must be parenthesized
alpine:~/dynamicweb# docker run -ti dynamicweb:latest
Unhandled exception in thread started by <function check_errors.<locals>.wrapper at 0x7fdc22767710>
Traceback (most recent call last):
  File "/venv/lib/python3.7/site-packages/django/utils/autoreload.py", line 227, in wrapper
    fn(*args, **kwargs)
  File "/venv/lib/python3.7/site-packages/django/core/management/commands/runserver.py", line 117, in inner_run
    autoreload.raise_last_exception()
  File "/venv/lib/python3.7/site-packages/django/utils/autoreload.py", line 250, in raise_last_exception
    six.reraise(*_exception)
  File "/venv/lib/python3.7/site-packages/django/utils/six.py", line 685, in reraise
    raise value.with_traceback(tb)
  File "/venv/lib/python3.7/site-packages/django/utils/autoreload.py", line 227, in wrapper
    fn(*args, **kwargs)
  File "/venv/lib/python3.7/site-packages/django/__init__.py", line 27, in setup
    apps.populate(settings.INSTALLED_APPS)
  File "/venv/lib/python3.7/site-packages/django/apps/registry.py", line 85, in populate
    app_config = AppConfig.create(entry)
  File "/venv/lib/python3.7/site-packages/django/apps/config.py", line 94, in create
    module = import_module(entry)
  File "/usr/local/lib/python3.7/importlib/__init__.py", line 127, in import_module
    return _bootstrap._gcd_import(name[level:], package, level)
  File "<frozen importlib._bootstrap>", line 1006, in _gcd_import
  File "<frozen importlib._bootstrap>", line 983, in _find_and_load
  File "<frozen importlib._bootstrap>", line 967, in _find_and_load_unlocked
  File "<frozen importlib._bootstrap>", line 677, in _load_unlocked
  File "<frozen importlib._bootstrap_external>", line 728, in exec_module
  File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
  File "/venv/lib/python3.7/site-packages/django/contrib/admin/__init__.py", line 4, in <module>
    from django.contrib.admin.filters import (
  File "/venv/lib/python3.7/site-packages/django/contrib/admin/filters.py", line 10, in <module>
    from django.contrib.admin.options import IncorrectLookupParameters
  File "/venv/lib/python3.7/site-packages/django/contrib/admin/options.py", line 12, in <module>
    from django.contrib.admin import helpers, widgets
  File "/venv/lib/python3.7/site-packages/django/contrib/admin/widgets.py", line 151
    '%s=%s' % (k, v) for k, v in params.items(),
    ^
SyntaxError: Generator expression must be parenthesized
2023-05-27 07:03:23 +00:00
PCoder
fc6c4c2241 Comment out celery for the moment 2023-05-27 07:02:19 +00:00
PCoder
21816e4884 Prepare a venv 2023-05-27 07:01:39 +00:00
PCoder
cfffc67f55 Update django-cms, django-filer, django-formtools, django-treebeard, djangocms-admin-style, celery, kombu, amqp, vine to suitable versions 2023-05-24 01:44:38 +00:00
PCoder
792868dd64 Remove aldryn dependencies
We don't seem to be using it
2023-05-24 01:43:03 +00:00
PCoder
fbeb18070b Try with python 3.7 because Django 1.11 is supported by it 2023-05-24 01:42:14 +00:00
PCoder
449b78c3eb Remove django-celery-results and update amqp to >=5.0.9
New error:
Traceback (most recent call last):
  File "/app/manage.py", line 10, in <module>
    execute_from_command_line(sys.argv)
  File "/usr/local/lib/python3.10/site-packages/django/core/management/__init__.py", line 353, in execute_from_command_line
    utility.execute()
  File "/usr/local/lib/python3.10/site-packages/django/core/management/__init__.py", line 302, in execute
    settings.INSTALLED_APPS
  File "/usr/local/lib/python3.10/site-packages/django/conf/__init__.py", line 55, in __getattr__
    self._setup(name)
  File "/usr/local/lib/python3.10/site-packages/django/conf/__init__.py", line 43, in _setup
    self._wrapped = Settings(settings_module)
  File "/usr/local/lib/python3.10/site-packages/django/conf/__init__.py", line 99, in __init__
    mod = importlib.import_module(self.SETTINGS_MODULE)
  File "/usr/local/lib/python3.10/importlib/__init__.py", line 126, in import_module
    return _bootstrap._gcd_import(name[level:], package, level)
  File "<frozen importlib._bootstrap>", line 1050, in _gcd_import
  File "<frozen importlib._bootstrap>", line 1027, in _find_and_load
  File "<frozen importlib._bootstrap>", line 992, in _find_and_load_unlocked
  File "<frozen importlib._bootstrap>", line 241, in _call_with_frames_removed
  File "<frozen importlib._bootstrap>", line 1050, in _gcd_import
  File "<frozen importlib._bootstrap>", line 1027, in _find_and_load
  File "<frozen importlib._bootstrap>", line 1006, in _find_and_load_unlocked
  File "<frozen importlib._bootstrap>", line 688, in _load_unlocked
  File "<frozen importlib._bootstrap_external>", line 883, in exec_module
  File "<frozen importlib._bootstrap>", line 241, in _call_with_frames_removed
  File "/app/dynamicweb/__init__.py", line 3, in <module>
    from .celery import app as celery_app
  File "/app/dynamicweb/celery.py", line 7, in <module>
    app = Celery('dynamicweb')
  File "/usr/local/lib/python3.10/site-packages/celery/app/base.py", line 291, in __init__
    self._fixups = [symbol_by_name(fixup)(self) for fixup in self.fixups]
  File "/usr/local/lib/python3.10/site-packages/celery/app/base.py", line 291, in <listcomp>
    self._fixups = [symbol_by_name(fixup)(self) for fixup in self.fixups]
  File "/usr/local/lib/python3.10/site-packages/celery/fixups/django.py", line 44, in fixup
    _verify_django_version(django)
  File "/usr/local/lib/python3.10/site-packages/celery/fixups/django.py", line 32, in _verify_django_version
    raise ImproperlyConfigured('Celery 5.x requires Django 1.11 or later.')
celery.exceptions.ImproperlyConfigured: Celery 5.x requires Django 1.11 or later.
2023-05-23 17:40:12 +00:00
Nico Schottelius
23cd61ad54 requirements: upgrade celery (5.2.7) and friends
Failing with:

The conflict is caused by:
    The user requested Django==1.9.4
    aldryn-boilerplates 0.7.4 depends on Django<1.9.999 and >=1.5
    aldryn-categories 1.0.3 depends on django<1.10 and >=1.6
    aldryn-newsblog 1.2.1 depends on Django<1.10 and >=1.6
    aldryn-people 1.2.0 depends on Django<1.10 and >=1.6
    aldryn-reversion 1.0.8 depends on Django<1.10 and >=1.6
    aldryn-search 0.2.11 depends on Django>=1.4
    cmsplugin-filer 1.0.1 depends on Django>=1.5
    django-appdata 0.1.5 depends on Django>=1.4.10
    django-classy-tags 0.7.2 depends on Django>1.3
    django-cms 3.2.5 depends on Django<1.10 and >=1.6.9
    django-debug-toolbar 1.4 depends on Django>=1.7
    django-filer 1.2.0 depends on Django<1.9.999 and >=1.5
    django-formtools 1.0 depends on Django>=1.7
    django-guardian 1.4.4 depends on Django>=1.7
    django-haystack 2.4.1 depends on Django
    django-model-utils 2.5 depends on Django>=1.4.2
    django-mptt 0.8.4 depends on Django>=1.8
    django-reversion 1.10.2 depends on django>=1.8
    django-standard-form 1.1.1 depends on Django>=1.3
    django-stored-messages 1.4.0 depends on Django>=1.8
    django-taggit-templatetags 0.2.5 depends on django>=1.1
    django-treebeard 4.0.1 depends on Django>=1.7
    djangocms-picture 1.0.0 depends on django>=1.6
    easy-thumbnails 2.3 depends on django>=1.4.2
    model-mommy 1.2.6 depends on Django
    django-celery-results 2.5.1 depends on Django>=3.2.18
2023-05-23 19:20:44 +02:00
Nico Schottelius
d60032c59a requirements: update some packages to newer versions
Fixing a lot of pip install issues
2023-05-23 19:05:57 +02:00
Nico Schottelius
179a2e6349 [gitignore] ignore venv/ 2023-05-23 19:05:15 +02:00
PCoder
8ba6ecadf2 Library updates -- still fails on installing pillow 2023-05-23 08:10:26 +00:00
PCoder
b173d7d8a2 Fix requirements 2023-05-19 13:42:32 +00:00
app@dynamicweb-production
26d9a77ebf Update changelog 2023-04-14 05:07:37 +02:00
app@dynamicweb-production
5f1534c152 Replace jQuery dependent code with vanilla js 2023-04-14 05:05:35 +02:00
app
590f7391c4 Merge remote-tracking branch 'origin/master' 2022-05-16 11:57:16 +02:00
app@dynamicweb-production
95c07fbed1 Change to dcl-orders for new vm and removing ipv6onlyhosting.{net,ch} references 2022-05-16 11:56:05 +02:00
app@dynamicweb-production
a21b4d6e3f Change to dcl-orders for new vm 2022-03-23 10:46:12 +01:00
d739a4a50e Merge pull request 'Change admin email to dcl-orders for vm purchase' (#12) from change-email-address into master
Reviewed-on: #12
2022-02-05 03:19:01 +00:00
PCoder
138fd519b7 Change admin email to dcl-orders for vm purchase 2022-02-05 08:30:58 +05:30
Nico Schottelius
8179ca4d22 Add support for docker build + docker release 2021-12-17 22:21:59 +01:00
Nico Schottelius
c0333212aa Begin updating for dockerisation 2021-12-17 22:02:20 +01:00
4861bee9d3 Merge branch 'master' into 'master'
Fix poland country code in eu_countries

See merge request ungleich-public/dynamicweb!749
2021-09-30 10:32:26 +02:00
5ce283318a Fix poland country code in eu_countries 2021-09-27 09:21:24 +02:00
79e96715b2 Merge branch 'issue/1/user-password-update' into 'master'
Issue/1/user password update

See merge request ungleich-public/dynamicweb!748
2021-08-30 15:20:27 +02:00
PCoder
47d5c63e3b Fix bad import 2021-08-30 18:38:58 +05:30
PCoder
d26f2b0f69 Normalize/convert ascii/ignore unicode characters for homeDirectory 2021-08-30 18:29:42 +05:30
7c2c3de1f6 Merge branch '9053/show-paid-invoices-only' into 'master'
Filter invoices by paid status

See merge request ungleich-public/dynamicweb!747
2021-03-29 03:59:48 +02:00
PCoder
1d48dfb93b Filter invoices by paid status 2021-03-29 07:23:58 +05:30
PCoder
63821813d4 Fix translations 2021-02-07 18:05:48 +05:30
PCoder
173c0fe9bf Update texts 2021-02-07 17:28:44 +05:30
PCoder
6279fa4e7b Fix missing escapes 2021-02-07 16:21:02 +05:30
PCoder
1fec2add72 Update Changelog for 3.2 2021-02-07 16:07:23 +05:30
PCoder
d46deaa23a Do not use UserCardDetail to save card 2021-02-07 15:58:03 +05:30
PCoder
a5c83dd589 Update order confirmation text to better prepared for payment dispute 2021-02-07 15:55:47 +05:30
PCoder
af09b343c0 Update Changelog for 3.1 2021-01-12 13:56:58 +05:30
PCoder
3b874901bc Update using correct card details 2021-01-12 13:40:03 +05:30
PCoder
640807eb62 Don't get card from local db 2021-01-12 13:39:11 +05:30
PCoder
21f762d6b8 Update Changelog for 3.0 2021-01-07 16:39:00 +05:30
9e640d0802 Merge branch '8691/check_vm_templates' into 'master'
8691/check vm templates

See merge request ungleich-public/dynamicweb!744
2021-01-07 12:06:02 +01:00
PCoder
c58302d90e Log error messages 2021-01-07 16:30:48 +05:30
PCoder
1e67bef4f5 Remove unwanted code/comments 2021-01-07 16:30:33 +05:30
PCoder
ec13a71866 Reformat code 2021-01-07 16:29:34 +05:30
PCoder
6c968fdbb8 Redirect to dcl payment
We no longer seem to use hosting payment
2021-01-02 09:03:02 +05:30