GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-20 06:52:21 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #600 from evandroforks/add_missing_wheels_anki_dependency

Browse source 
Add missing aqt and anki modules dependency requirements
This commit is contained in:
Damien Elmes 2020-05-02 09:02:21 +10:00 committed by GitHub
commit 0080db4c94
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pylib/Makefile
View file

@ -32,7 +32,7 @@ PHONY: all
all: check all: check
.build/run-deps: setup.py .build/run-deps: setup.py
python -m pip install -e . SKIP_ANKI_RSPY=true python -m pip install -e .
@touch $@ @touch $@
.build/dev-deps: requirements.dev .build/dev-deps: requirements.dev
@ -117,6 +117,7 @@ anki/buildinfo.py: ../meta/version ../meta/buildhash
VER := $(shell cat ../meta/version) VER := $(shell cat ../meta/version)
.build/vernum: ../meta/version .build/vernum: ../meta/version
sed -i.bak 's/.*automatically updated.*/ version="$(VER)", # automatically updated/' setup.py sed -i.bak 's/.*automatically updated 1.*/ install_requires.append("ankirspy==$(VER)") # automatically updated 1/' setup.py
sed -i.bak 's/.*automatically updated 2.*/ version="$(VER)", # automatically updated 2/' setup.py
rm setup.py.bak rm setup.py.bak
@touch $@ @touch $@

7
pylib/setup.py
View file

@ -1,5 +1,7 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import os
import setuptools import setuptools
install_requires = [ install_requires = [
@ -12,10 +14,13 @@ install_requires = [
'distro; sys_platform != "darwin" and sys_platform != "win32"', 'distro; sys_platform != "darwin" and sys_platform != "win32"',
] ]
# maturin develop hides the package from pip - https://github.com/ankitects/anki/pull/600
if not os.environ.get("SKIP_ANKI_RSPY", False):
install_requires.append("ankirspy==2.1.25") # automatically updated 1
setuptools.setup( setuptools.setup(
name="anki", name="anki",
version="2.1.25", # automatically updated version="2.1.25", # automatically updated 2
author="Ankitects Pty Ltd", author="Ankitects Pty Ltd",
description="Anki's library code", description="Anki's library code",
long_description="Anki's library code", long_description="Anki's library code",

3
qt/Makefile
View file

@ -144,6 +144,7 @@ aqt/buildinfo.py: ../meta/version ../meta/buildhash
VER := $(shell cat ../meta/version) VER := $(shell cat ../meta/version)
.build/vernum: ../meta/version .build/vernum: ../meta/version
sed -i.bak 's/.*automatically updated.*/ version="$(VER)", # automatically updated/' setup.py sed -i.bak 's/.*automatically updated 1.*/ "anki==$(VER)", # automatically updated 1/' setup.py
sed -i.bak 's/.*automatically updated 2.*/ version="$(VER)", # automatically updated 2/' setup.py
rm setup.py.bak rm setup.py.bak
@touch $@ @touch $@

3
qt/setup.py
View file

@ -30,12 +30,13 @@ install_requires = [
"pyqt5>=5.9", "pyqt5>=5.9",
'psutil; sys.platform == "win32"', 'psutil; sys.platform == "win32"',
'pywin32; sys.platform == "win32"', 'pywin32; sys.platform == "win32"',
"anki==2.1.25", # automatically updated 1
] ]
setuptools.setup( setuptools.setup(
name="aqt", name="aqt",
version="2.1.25", # automatically updated version="2.1.25", # automatically updated 2
author="Ankitects Pty Ltd", author="Ankitects Pty Ltd",
description="Anki's Qt GUI code", description="Anki's Qt GUI code",
long_description="Anki's QT GUI code", long_description="Anki's QT GUI code",

12
rspy/Makefile
View file

@ -41,6 +41,10 @@ RSPY_TARGET_DIR ?= target
QT_FTL_TEMPLATES := ../qt/ftl QT_FTL_TEMPLATES := ../qt/ftl
QT_FTL_LOCALES := ../qt/ftl/repo/desktop QT_FTL_LOCALES := ../qt/ftl/repo/desktop
BUILD_VARIABLES = FTL_TEMPLATE_DIRS="$(QT_FTL_TEMPLATES)" \
FTL_LOCALE_DIRS="$(QT_FTL_LOCALES)" \
CARGO_TARGET_DIR="$(RSPY_TARGET_DIR)"
.PHONY: all develop build check fix clean .PHONY: all develop build check fix clean
all: develop all: develop
@ -56,16 +60,16 @@ DEPS := .build/tools .build/vernum ../meta/buildhash \
.build/develop: $(DEPS) .build/develop: $(DEPS)
touch ../proto/backend.proto touch ../proto/backend.proto
FTL_TEMPLATE_DIRS="$(QT_FTL_TEMPLATES)" FTL_LOCALE_DIRS="$(QT_FTL_LOCALES)" \ ${BUILD_VARIABLES} \
CARGO_TARGET_DIR="$(RSPY_TARGET_DIR)" maturin develop $(DEVFLAGS) maturin develop $(DEVFLAGS)
touch $@ touch $@
build: .build/build build: .build/build
.build/build: $(DEPS) .build/build: $(DEPS)
touch ../proto/backend.proto touch ../proto/backend.proto
FTL_TEMPLATE_DIRS="$(QT_FTL_TEMPLATES)" FTL_LOCALE_DIRS="$(QT_FTL_LOCALES)" \ ${BUILD_VARIABLES} \
CARGO_TARGET_DIR="$(RSPY_TARGET_DIR)" maturin build -i "${PYTHON_FILE}" -o "$(OUTDIR)" $(BUILDFLAGS) maturin build -i "${PYTHON_FILE}" -o "$(OUTDIR)" $(BUILDFLAGS)
touch $@ touch $@
check: .build/check check: .build/check