From adddf56710979774d9065eef3f37daee36023cd1 Mon Sep 17 00:00:00 2001 From: Gagan Deep Date: Sat, 23 Nov 2024 03:00:10 +0530 Subject: [PATCH 1/2] [deps] Upgraded users, utils, netdiff and django-flat-json-widget - Bumped openwisp-users~=1.1.0 - Bumped netdiff~=1.1.0 - Bumped django-flat-json-widget~=0.3.1 - Bumped openwisp-utils[celery]~=1.1.1 --- requirements-test.txt | 6 +++--- requirements.txt | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/requirements-test.txt b/requirements-test.txt index 16835bd0..a4634b38 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -3,8 +3,8 @@ pytest-asyncio~=0.24.0 pytest-django~=4.9.0 freezegun~=1.5.1 # Needed to test integrations -openwisp-monitoring @ https://github.com/openwisp/openwisp-monitoring/tarball/master -openwisp-controller @ https://github.com/openwisp/openwisp-controller/tarball/master -openwisp-utils[qa,selenium] @ https://github.com/openwisp/openwisp-utils/tarball/master +openwisp-monitoring~=1.1.0 +openwisp-controller~=1.1.0 +openwisp-utils[qa,selenium]~=1.1.1 redis~=5.2.0 django_redis~=5.4.0 diff --git a/requirements.txt b/requirements.txt index 1ea3fbff..70820d23 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -openwisp-users @ https://github.com/openwisp/openwisp-users/tarball/master -netdiff @ https://github.com/openwisp/netdiff/tarball/master +openwisp-users~=1.1.0 +netdiff~=1.1.0 jsonfield~=3.1.0 -django-flat-json-widget @ https://github.com/openwisp/django-flat-json-widget/tarball/master -openwisp-utils[celery] @ https://github.com/openwisp/openwisp-utils/tarball/master +django-flat-json-widget~=0.3.1 +openwisp-utils[celery]~=1.1.1 From 9177569382417ae5ab90b1148a48c1e0cfa5a158 Mon Sep 17 00:00:00 2001 From: Gagan Deep Date: Sat, 23 Nov 2024 03:27:33 +0530 Subject: [PATCH 2/2] [chores] Removed "publish" from setup.py --- setup.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/setup.py b/setup.py index 36641cc7..a7b873f1 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,4 @@ #!/usr/bin/env python -import os -import sys - from setuptools import find_packages, setup from openwisp_network_topology import get_version @@ -26,19 +23,6 @@ def get_install_requires(): return requirements -if sys.argv[-1] == 'publish': - # delete any *.pyc, *.pyo and __pycache__ - os.system('find . | grep -E "(__pycache__|\.pyc|\.pyo$)" | xargs rm -rf') - os.system("python setup.py sdist bdist_wheel") - os.system("twine upload -s dist/*") - os.system("rm -rf dist build") - args = {'version': get_version()} - print("You probably want to also tag the version now:") - print(" git tag -a %(version)s -m 'version %(version)s'" % args) - print(" git push --tags") - sys.exit() - - setup( name='openwisp-network-topology', version=get_version(),