testing: Switch to Python 3
Both swidGenerator and strongTNC were migrated to Python 3. This allows to migrate all testing scripts to Python 3, too.
This commit is contained in:
committed by
Tobias Brunner
parent
a5662e8f6e
commit
3e2841572b
@@ -23,7 +23,7 @@ all: install
|
||||
@rm -f .$(PKG)-checkout-* && touch $@
|
||||
|
||||
.$(PKG)-built-$(REV): .$(PKG)-checkout-$(REV)
|
||||
cd $(PKG) && python ./configure.py $(CONFIG_OPTS) && make -j $(NUM_CPUS)
|
||||
cd $(PKG) && python3 ./configure.py $(CONFIG_OPTS) && make -j $(NUM_CPUS)
|
||||
@rm -f .$(PKG)-built-* && touch $@
|
||||
|
||||
install: .$(PKG)-built-$(REV)
|
||||
|
||||
@@ -129,6 +129,6 @@ build: configure
|
||||
|
||||
install: build
|
||||
cd $(BUILDDIR) && make -j install && \
|
||||
cd $(DIR)/src/libcharon/plugins/vici/python && python setup.py install
|
||||
cd $(DIR)/src/libcharon/plugins/vici/python && python3 setup.py install
|
||||
# for Python-based updown scripts
|
||||
pip install python-daemon
|
||||
pip3 install python-daemon
|
||||
|
||||
@@ -17,4 +17,4 @@ $(TAR):
|
||||
@touch $@
|
||||
|
||||
install: .$(PKG)-unpacked-$(REV)
|
||||
cd $(DIR) && python setup.py install
|
||||
cd $(DIR) && python3 setup.py install
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/usr/bin/make
|
||||
|
||||
PKG = strongTNC
|
||||
REV = 0.9.9
|
||||
REV = 1.0
|
||||
DIR = $(PKG)-$(REV)
|
||||
ZIP = $(PKG)-$(REV).zip
|
||||
SRC = https://github.com/strongswan/$(PKG)/archive/$(REV).zip
|
||||
@@ -18,10 +18,9 @@ $(ZIP):
|
||||
|
||||
.$(PKG)-deps-$(REV): .$(PKG)-unpacked-$(REV)
|
||||
mkdir -p $(DEPS)
|
||||
pip download -d $(DEPS) -r $(DIR)/requirements.txt six
|
||||
pip3 download -d $(DEPS) -r $(DIR)/requirements.txt
|
||||
@touch $@
|
||||
|
||||
install: .$(PKG)-deps-$(REV)
|
||||
# six is required for djangorestframework-camel-case
|
||||
pip install --no-index --find-links=file://`pwd`/$(DEPS) -r $(DIR)/requirements.txt six
|
||||
pip3 install --no-index --find-links=file://`pwd`/$(DEPS) -r $(DIR)/requirements.txt
|
||||
cp -r $(DIR) /var/www/tnc && chgrp -R www-data /var/www/tnc && chmod g+sw /var/www/tnc
|
||||
|
||||
Reference in New Issue
Block a user