Merge pull request #14 from plstcharles/conda-env-from-reqs

reuse requirements file in conda env to keep dependencies in sync
plstcharles · Jul 8, 2020 · 2491b50 · 2491b50
2 parents f2340dc + b615891
commit 2491b50
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 23 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -6,6 +6,14 @@ Changelog
 `Unreleased <http://github.com/plstcharles/thelper/tree/master>`_ (latest)
 ----------------------------------------------------------------------------------
 
+.. **INSERT APPLIED CHANGES HERE**
+
+`0.5.0-rc2 <http://github.com/plstcharles/thelper/tree/v0.5.0-rc2>`_ (2020/07/08)
+----------------------------------------------------------------------------------
+
+* Employ ``requirements.txt`` within ``conda-env.yml`` to kept dependencies in sync.
+* Fixes built docker image not using appropriate dependencies enforced through ``requirements.txt``.
+
 `0.5.0-rc1 <http://github.com/plstcharles/thelper/tree/v0.5.0-rc1>`_ (2020/07/07)
 ----------------------------------------------------------------------------------
 

diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,7 @@ FROM nvidia/cuda:10.0-cudnn7-devel-ubuntu16.04
 LABEL name="thelper"
 LABEL description="Training framework and CLI for PyTorch-based machine learning projects"
 LABEL vendor="Centre de Recherche Informatique de Montréal / Computer Research Institute of Montreal (CRIM)"
-LABEL version="0.5.0-rc1"
+LABEL version="0.5.0-rc2"
 
 ARG PYTHON_VERSION=3.7
 

diff --git a/README.rst b/README.rst
@@ -24,9 +24,9 @@ Overview
     :alt: Travis-CI Build Status
     :target: https://travis-ci.org/plstcharles/thelper
 
-.. |commits-since| image:: https://img.shields.io/github/commits-since/plstcharles/thelper/v0.5.0-rc1.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/plstcharles/thelper/v0.5.0-rc2.svg
     :alt: Commits since latest release
-    :target: https://github.com/plstcharles/thelper/compare/v0.5.0-rc1...master
+    :target: https://github.com/plstcharles/thelper/compare/v0.5.0-rc2...master
 
 .. |readthedocs| image:: https://readthedocs.org/projects/thelper/badge/?version=latest
     :alt: Documentation Build Status

diff --git a/ci/meta.yaml b/ci/meta.yaml
@@ -1,5 +1,5 @@
 {% set name = "thelper" %}
-{% set version = "0.5.0-rc1" %}
+{% set version = "0.5.0-rc2" %}
 
 package:
   name: "{{ name|lower }}"

diff --git a/conda-env.yml b/conda-env.yml
@@ -6,21 +6,8 @@ dependencies:
   - cython
   - ddt
   - gitdb
-  - gitpython
-  - lz4
-  - matplotlib
-  - numpy
   - opencv
-  # PILLOW_VERSION removed which causes torchvision<=0.4.0 to fail
-  - pillow<7
   - pip
-  - pytorch<1.3
-  - pyyaml
-  - scikit-learn
-  - six
-  - torchvision
-  - tqdm
   - pip:
-    - h5py
-    - opencv-python
     - tensorboardX
+    - -r requirements.txt
diff --git a/docs/src/conf.py b/docs/src/conf.py
@@ -23,7 +23,7 @@
 project = 'thelper'
 copyright = '2018, Pierre-Luc St-Charles'
 author = 'Pierre-Luc St-Charles'
-version = release = '0.5.0-rc1'
+version = release = '0.5.0-rc2'
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/requirements.txt b/requirements.txt
@@ -4,7 +4,8 @@ lz4
 matplotlib
 numpy
 opencv-python
-Pillow
+# PILLOW_VERSION removed which causes import to fail with torchvision
+pillow<7
 pip
 pyyaml
 scikit-learn

diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.5.0-rc1
+current_version = 0.5.0-rc2
 commit = True
 tag = True
 tag_name = v{new_version}
@@ -30,6 +30,8 @@ replace =
 	`Unreleased <http://github.com/plstcharles/thelper/tree/master>`_ (latest)
 	----------------------------------------------------------------------------------
 
+	.. **INSERT APPLIED CHANGES HERE**
+
 	`{new_version} <http://github.com/plstcharles/thelper/tree/v{new_version}>`_ ({now:%%Y/%%m/%%d})
 	----------------------------------------------------------------------------------
 
@@ -104,3 +106,4 @@ omit = *migrations*
 exclude_lines = 
 	if __name__ == .__main__.:
 	pragma: no cover
+
diff --git a/setup.py b/setup.py
@@ -54,7 +54,7 @@ def _unavailable(self, e):
 
 setuptools.setup(
     name="thelper",
-    version="0.5.0-rc1",
+    version="0.5.0-rc2",
     license="Apache Software License 2.0",
     description="Training framework & tools for PyTorch-based machine learning projects.",
     long_description="%s\n%s" % (

diff --git a/thelper/__init__.py b/thelper/__init__.py
@@ -23,4 +23,4 @@
 logger = logging.getLogger("thelper")
 
 __url__ = "https://github.com/plstcharles/thelper"
-__version__ = "0.5.0-rc1"
+__version__ = "0.5.0-rc2"