Skip to content

Commit

Permalink
added Pillow bump, and some docs on
Browse files Browse the repository at this point in the history
how to update requirements.txt
  • Loading branch information
yifanwu committed Apr 14, 2022
1 parent 7a90e56 commit 0362374
Show file tree
Hide file tree
Showing 9 changed files with 54 additions and 41 deletions.
22 changes: 18 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@ git submodule update --init --recursive .
#### Conda

```bash
conda create --name lineapy python=3.9 \
conda create --name lineapy python=3.7 \ # a lower version of Python to make sure that it's compatible
postgresql \
graphviz \
cmake # needed for building deps of numpy tutorial on mac
cmake # needed for building deps of numpy tutorial on mac (can remove if you are not running)
conda activate lineapy
pip install -r requirements.txt
pip install -r requirements.txt # for dev
pip install -e .

# verify everything works as expected
Expand Down Expand Up @@ -158,7 +158,19 @@ the latest, run `pre-commit autoupdate`.

E. finally run tests `pytest tests`

F. Repeat steps B-E until there are no more errors
F. Repeat steps B-E until there are no more errors. If you have added any new
libraries as part of your change, then you need to run the following commands to
reset `requirements.txt`. For this, you need to
be running on Python 3.7 (note that the earlier installation commands were
for Python 3.9).

```bash
pip uninstall -y `pip freeze` # don't run on base
pip install -e ".[dev]"
pip freeze --exclude-editable >> requirements.txt # so that lineapy is not in the list
```

Note that longer term, we want to make this more automated.

G. Commit your code

Expand Down Expand Up @@ -346,6 +358,8 @@ Another heuristic is that when installing with pip fails, you can try installing
using conda, sometimes they have better M1 support---M1 installation is still a
bit of trials and error.

If you have weird issues with pytest, try `conda install pytest`.

### 4.3. Using venv instead of Conda

If you prefer using venv, then you need to install the following prerequisites first
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ WORKDIR /usr/src/base
COPY ./setup.py ./
COPY ./README.md ./
COPY ./lineapy/__init__.py ./lineapy/
COPY ./requirements.txt ./
COPY ./dev-requirements.txt ./
COPY ./airflow-requirements.txt ./
COPY ./Makefile ./

Expand Down
59 changes: 29 additions & 30 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
alabaster==0.7.12
altair==4.2.0
anyio==3.5.0
appnope==0.1.3
argon2-cffi==21.3.0
argon2-cffi-bindings==21.2.0
astor==0.8.1
astpretty==2.1.0
asttokens==2.0.5
attrs==21.4.0
attrs @ file:///opt/conda/conda-bld/attrs_1642510447205/work
Babel==2.9.1
backcall==0.2.0
beautifulsoup4==4.10.0
beautifulsoup4==4.11.1
black==22.3.0
bleach==4.1.0
bleach==5.0.0
certifi==2021.10.8
cffi==1.15.0
cfgv==3.3.1
Expand All @@ -36,20 +35,20 @@ entrypoints==0.4
execnet==1.9.0
fancycompleter==0.9.1
fastjsonschema==2.15.3
fastparquet==0.8.0
fastparquet==0.8.1
filelock==3.6.0
flake8==4.0.1
fonttools==4.31.2
fonttools==4.32.0
fsspec==2022.3.0
graphviz==0.19.1
graphviz==0.19.2
greenlet==1.1.2
identify==2.4.12
idna==3.3
imagesize==1.3.0
importlib-metadata==4.2.0
importlib-resources==5.6.0
iniconfig==1.1.1
ipykernel==6.12.1
importlib-metadata @ file:///tmp/build/80754af9/importlib-metadata_1648562407465/work
importlib-resources==5.7.0
iniconfig @ file:///home/linux1/recipes/ci/iniconfig_1610983019677/work
ipykernel==6.13.0
ipython==7.32.0
ipython-genutils==0.2.0
isort==5.10.1
Expand All @@ -58,11 +57,11 @@ Jinja2==3.1.1
joblib==1.1.0
json5==0.9.6
jsonschema==4.4.0
jupyter-client==7.2.1
jupyter-client==7.2.2
jupyter-core==4.9.2
jupyter-server==1.16.0
jupyterlab==3.3.2
jupyterlab-pygments==0.1.2
jupyterlab==3.3.3
jupyterlab-pygments==0.2.1
jupyterlab-server==2.12.0
kiwisolver==1.4.2
livereload==2.6.3
Expand All @@ -75,18 +74,17 @@ mock==4.0.3
mypy==0.942
mypy-extensions==0.4.3
nbclassic==0.3.7
nbclient==0.5.13
nbconvert==6.4.5
nbclient==0.6.0
nbconvert==6.5.0
nbformat==5.3.0
nbsphinx==0.8.8
nbval==0.9.6
nest-asyncio==1.5.5
networkx==2.6.3
nodeenv==1.6.0
notebook==6.4.10
notebook-shim==0.1.0
numpy==1.21.5
packaging==21.3
numpy==1.21.6
packaging @ file:///tmp/build/80754af9/packaging_1637314298585/work
pandas==1.3.5
pandocfilters==1.5.0
parso==0.8.3
Expand All @@ -97,26 +95,26 @@ pdbpp==0.10.3
pexpect==4.8.0
pg==0.1
pickleshare==0.7.5
Pillow==9.0.0
Pillow==9.1.0
platformdirs==2.5.1
pluggy==1.0.0
pluggy @ file:///tmp/build/80754af9/pluggy_1648042572264/work
pre-commit==2.18.1
prometheus-client==0.14.0
prometheus-client==0.14.1
prompt-toolkit==3.0.29
psutil==5.9.0
psycopg2==2.9.3
ptyprocess==0.7.0
py==1.11.0
py @ file:///opt/conda/conda-bld/py_1644396412707/work
pycodestyle==2.8.0
pycparser==2.21
pydantic==1.9.0
pyflakes==2.4.0
Pygments==2.11.2
PyOpenGL==3.1.6
pyparsing==3.0.7
pyparsing==3.0.8
pyrepl==0.9.0
pyrsistent==0.18.1
pytest==6.2.5
pytest==7.1.1
pytest-cov==3.0.0
pytest-fixture-config==1.7.0
pytest-forked==1.4.0
Expand All @@ -138,7 +136,7 @@ six==1.16.0
sklearn==0.0
sniffio==1.2.0
snowballstemmer==2.2.0
soupsieve==2.3.1
soupsieve==2.3.2
Sphinx==4.3.2
sphinx-autobuild==2021.3.14
sphinx-rtd-theme==1.0.0
Expand All @@ -148,13 +146,13 @@ sphinxcontrib-htmlhelp==2.0.0
sphinxcontrib-jsmath==1.0.1
sphinxcontrib-qthelp==1.0.3
sphinxcontrib-serializinghtml==1.1.5
SQLAlchemy==1.4.34
SQLAlchemy==1.4.35
sqlalchemy2-stubs==0.0.2a21
syrupy==1.4.5
termcolor==1.1.0
terminado==0.13.3
testpath==0.6.0
threadpoolctl==3.1.0
tinycss2==1.1.1
toml==0.10.2
tomli==2.0.1
toolz==0.11.2
Expand All @@ -163,9 +161,10 @@ traitlets==5.1.1
typed-ast==1.5.2
types-PyYAML==6.0.5
types-requests==2.27.16
typing_extensions==4.1.1
types-urllib3==1.26.11
typing_extensions @ file:///opt/conda/conda-bld/typing_extensions_1647553014482/work
urllib3==1.26.9
virtualenv==20.14.0
virtualenv==20.14.1
wcwidth==0.2.5
webencodings==0.5.1
websocket-client==1.3.2
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def version(path):
# https://python-packaging.readthedocs.io/en/latest/command-line-scripts.html#the-console-scripts-entry-point
entry_points={"console_scripts": ["lineapy=lineapy.cli.cli:linea_cli"]},
install_requires=[
"Pillow",
"Pillow>=9.0.1", # for security reasons
"astor",
"click>=8.0.0",
"pydantic",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
source_code=source_1.id,
),
name="numpy",
version="1.21.5",
version="1.21.6",
package_name="numpy",
)
call_5 = CallNode(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
source_code=source_1.id,
),
name="PIL.Image",
version="9.0.0",
version="9.1.0",
package_name="PIL.Image",
)
call_7 = CallNode(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
source_code=source_1.id,
),
name="numpy",
version="1.21.5",
version="1.21.6",
package_name="numpy",
).id,
LiteralNode(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@
source_code=source_1.id,
),
name="PIL.Image",
version="9.0.0",
version="9.1.0",
package_name="PIL.Image",
).id,
LiteralNode(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
source_code=source_1.id,
),
name="PIL.Image",
version="9.0.0",
version="9.1.0",
package_name="PIL.Image",
)
call_9 = CallNode(
Expand Down

0 comments on commit 0362374

Please sign in to comment.