Add processing selectors and tests. #75

allanleal · 2019-02-13T14:42:05Z

Need your help to check if tests are passing or failing (or if they are adequate).

I'll update the docs shortly.

This implements the features discussed in #74 .

allanleal · 2019-02-13T15:10:02Z

tests/test_jinja.py

+def test_jinja_x86(monkeypatch):
+    template = "{{ x86 }}"
+
+    platform_bkp = platform


I need help here to mock this properly. I need to enforce platform.machine() returns a given value (e.g., 'x86')

You can use monkeypatch.setattr(platform, "machine", lambda: 'x86') and let pytest revert it back for yoy; it is fine to call monkeypatch.setattr multiple times too.

Hmmm I was almost there, but doing monkeypatch.setattr(platform, "machine", 'x86') instead, which caused problems later.

nicoddemus · 2019-02-13T15:56:39Z

Hi @allanleal,

Thanks for the PR!

Need your help to check if tests are passing or failing (or if they are adequate).

Usually we see the CI status here on the PR, but because your last commit in the branch had the string [skip ci], both Travis and AppVeyor did not post the status here. You can see the last time they built in:

https://travis-ci.org/ESSS/conda-devenv/builds/492745664?utm_source=github_status&utm_medium=notification
https://ci.appveyor.com/project/ESSS/conda-devenv/builds/22342149

This implements the features discussed in #74 .

Small GitHub tip: if write Fix #74 or Fixes #74, then #74 will be automatically closed when the PR gets merged to master. ;) More info: https://help.github.com/articles/closing-issues-using-keywords/

conda_devenv/devenv.py

nicoddemus · 2019-02-13T16:02:20Z

tests/test_jinja.py

+def test_jinja_x86(monkeypatch):
+    template = "{{ x86 }}"
+
+    platform_bkp = platform


You can use monkeypatch.setattr(platform, "machine", lambda: 'x86') and let pytest revert it back for yoy; it is fine to call monkeypatch.setattr multiple times too.

tests/test_jinja.py

nicoddemus · 2019-02-13T16:53:05Z

linting is failing due to an unused variable:

conda_devenv/devenv.py:15:5: F841 local variable 'pyversion' is assigned to but never used
ERROR: InvocationError for command '/home/travis/build/ESSS/conda-devenv/.tox/linting/bin/flake8 conda_devenv' (exited with code 1)

nicoddemus · 2019-02-13T17:11:12Z

Tests are passing! 🎉

All is left is updating the docs. 🤗

allanleal · 2019-02-13T17:12:38Z

:) I'll update the docs!

nicoddemus · 2019-02-13T18:10:33Z

Thanks a lot @allanleal! 🙇

prusse-martin · 2019-02-13T18:40:32Z

conda_devenv/devenv.py

+        "linux": islinux,
+        "linux32": islinux and is32bit,
+        "linux64": islinux and is64bit,
+        "armv6l": None,


Do we want to let those with None? I see you didn't add them to the docs.
Could you remove them? And maybe create a issue do add them later?

I'll see if I add them still in this PR. Before merging, I'll make a last call for approval just to be sure.

I ended up deleting those three variables with None and entering a new Issue - #77 .

allanleal · 2019-02-13T20:00:31Z

docs/conf.py

@@ -97,7 +97,7 @@
 #show_authors = False

 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'default'


I changed this for local testing purposes and it remained here. Anyway, I can revert it back, but this one looks better on readthedocs.

We try to use the same theme and styles on all open source projects from ESSS.
I will ask to revert this.

Sure, changed to sphinx.

allanleal · 2019-02-13T20:03:24Z

Okay -- all tests passed but one in travis (for py27). The error is a bit strange:

Downloading archive: https://s3.amazonaws.com/travis-python-archives/binaries/ubuntu/14.04/x86_64/python-3.5.tar.bz2
$ curl -sSf -o python-3.5.tar.bz2 ${archive_url}
curl: (56) SSL read: error:00000000:lib(0):func(0):reason(0), errno 104
Unable to download 3.5 archive. The archive may not exist. Please consider a different version.

Forcing a new build with an amend commit.

…hub.com:allanleal/conda-devenv into add-conda-build-preprocessing-selectors-support

prusse-martin · 2019-02-14T10:25:36Z

docs/conf.py

@@ -97,7 +97,7 @@
 #show_authors = False

 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'default'


We try to use the same theme and styles on all open source projects from ESSS.
I will ask to revert this.

allanleal · 2019-02-14T12:24:24Z

docs/conf.py

@@ -111,7 +111,7 @@

 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'default'
+html_theme = 'sphinx'


Ops...it's not here, but on pygments_style.

allanleal · 2019-02-14T12:55:35Z

Great - thanks @prusse-martin .

prusse-martin · 2019-02-14T12:56:28Z

Thank you for the work.
I did squash the commits to get get the repo's history clearer =)

allanleal · 2019-02-14T13:00:08Z

I did squash the commits to get get the repo's history clearer =)

That's OK by me - no worries!

allanleal added 4 commits February 13, 2019 15:38

Add processing selectors and tests.

9d600cb

Fix mocking of python functions.

8c6ecee

Add back deleted key-value pairs by mistake.

10512bd

[skip ci] Delete a blank line.

4db7701

allanleal commented Feb 13, 2019

View reviewed changes

nicoddemus requested changes Feb 13, 2019

View reviewed changes

allanleal added 2 commits February 13, 2019 17:12

Remove py py2k, py3k, and use mock with lambda.

e5fe7c5

Add forgotten lambda functions!

751a31b

nicoddemus reviewed Feb 13, 2019

View reviewed changes

tests/test_jinja.py Outdated Show resolved Hide resolved

allanleal added 2 commits February 13, 2019 17:53

Remove unused variable pyversion.

bf1a366

Fix lambda - need return of a tuple

e5999d4

allanleal added 5 commits February 13, 2019 18:32

Update usage docs.

ebb387f

Further improvements.

20e1f8d

Remove command role.

87b3c0a

Missing ``

ba1e330

Using table as in conda-build docs

9bdf187

nicoddemus approved these changes Feb 13, 2019

View reviewed changes

nicoddemus requested a review from prusse-martin February 13, 2019 18:10

prusse-martin requested changes Feb 13, 2019

View reviewed changes

allanleal added 6 commits February 13, 2019 20:25

Add sphinx_rtd_theme dependency

14c495a

Set sphinx_rdt_theme as the theme for docs.

9376f81

Add an overview of conda-devenv before contents section.

675d536

Adapt the existing example and add table with new variables.

dad5aac

Revert back changes in theme made for local testing.

8a29ad7

Remove some variables related to arm platforms.

065e585

allanleal mentioned this pull request Feb 13, 2019

Add missing variables armv6l, armv7l, ppc64le #77

Open

allanleal commented Feb 13, 2019

View reviewed changes

allanleal added 3 commits February 13, 2019 21:04

Remove some variables related to arm platforms.

135f528

Merge branch 'add-conda-build-preprocessing-selectors-support' of git…

6d3fea2

…hub.com:allanleal/conda-devenv into add-conda-build-preprocessing-selectors-support

Remove non implemented tests.

d82c101

prusse-martin requested changes Feb 14, 2019

View reviewed changes

Revert sphinx theme to sphinx

3304d4a

allanleal commented Feb 14, 2019

View reviewed changes

Fix pygments_style and html_theme back to original

e393996

prusse-martin approved these changes Feb 14, 2019

View reviewed changes

prusse-martin merged commit 54a7366 into ESSS:master Feb 14, 2019

ESSS deleted a comment Feb 14, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add processing selectors and tests. #75

Add processing selectors and tests. #75

allanleal commented Feb 13, 2019 •

edited

Loading

allanleal Feb 13, 2019

nicoddemus Feb 13, 2019

allanleal Feb 13, 2019

nicoddemus commented Feb 13, 2019

nicoddemus Feb 13, 2019

nicoddemus commented Feb 13, 2019

nicoddemus commented Feb 13, 2019

allanleal commented Feb 13, 2019

nicoddemus commented Feb 13, 2019

prusse-martin Feb 13, 2019

allanleal Feb 13, 2019

allanleal Feb 13, 2019

allanleal Feb 13, 2019

prusse-martin Feb 14, 2019 •

edited

Loading

allanleal Feb 14, 2019

allanleal commented Feb 13, 2019 •

edited

Loading

prusse-martin Feb 14, 2019 •

edited

Loading

allanleal Feb 14, 2019

allanleal commented Feb 14, 2019

prusse-martin commented Feb 14, 2019

allanleal commented Feb 14, 2019 •

edited

Loading

Add processing selectors and tests. #75

Add processing selectors and tests. #75

Conversation

allanleal commented Feb 13, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nicoddemus commented Feb 13, 2019

Choose a reason for hiding this comment

nicoddemus commented Feb 13, 2019

nicoddemus commented Feb 13, 2019

allanleal commented Feb 13, 2019

nicoddemus commented Feb 13, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

prusse-martin Feb 14, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

allanleal commented Feb 13, 2019 • edited Loading

prusse-martin Feb 14, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

allanleal commented Feb 14, 2019

prusse-martin commented Feb 14, 2019

allanleal commented Feb 14, 2019 • edited Loading

allanleal commented Feb 13, 2019 •

edited

Loading

prusse-martin Feb 14, 2019 •

edited

Loading

allanleal commented Feb 13, 2019 •

edited

Loading

prusse-martin Feb 14, 2019 •

edited

Loading

allanleal commented Feb 14, 2019 •

edited

Loading