From 36c7a35ebb7223ae05fb8df43f63b3697dbff69a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cau=C3=AA=20Baasch=20de=20Souza?= Date: Thu, 8 Dec 2022 12:20:22 -0300 Subject: [PATCH 1/3] WIP --- .github/workflows/main.yml | 15 +++++++++++++++ environment.devenv.yml | 5 ++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 79cb464..3afb328 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,6 +16,16 @@ jobs: fail-fast: false matrix: CONDA_PY: ["36", "37", "38", "39"] + include: + - CONDA_PY: "36" + PYTHON_VERSION: "=3.6" + - CONDA_PY: "37" + PYTHON_VERSION: "=3.7" + - CONDA_PY: "38" + PYTHON_VERSION: "=3.8" + - CONDA_PY: "39" + PYTHON_VERSION: "=3.9" + steps: - uses: actions/checkout@v2 @@ -33,13 +43,18 @@ jobs: - name: Install env: CONDA_PY: ${{ matrix.CONDA_PY }} + PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }} run: | conda config --system --set always_yes yes --set changeps1 no conda install -c conda-forge conda-devenv conda info -a export TEST_QMXGRAPH=1 + echo "=== conda devenv -n qmxgraph --print-full ===" + conda devenv -n qmxgraph --print-full + echo "=== === ===" conda devenv -n qmxgraph conda install -n qmxgraph coveralls pytest-cov + conda list -n qmxgraph conda init bash - name: Tests shell: bash -l {0} diff --git a/environment.devenv.yml b/environment.devenv.yml index f29d696..82dfa64 100644 --- a/environment.devenv.yml +++ b/environment.devenv.yml @@ -1,6 +1,5 @@ {% set TEST_QMXGRAPH = os.environ.get('TEST_QMXGRAPH', '0') != '0' %} {% set PYTHON_VERSION = os.environ.get('PYTHON_VERSION', '3.6') %} -{% set PYTHON_VERSION = os.environ.get('TRAVIS_PYTHON_VERSION', PYTHON_VERSION) %} name: qmxgraph @@ -15,6 +14,10 @@ environment: dependencies: - python ={{ PYTHON_VERSION }} + {% if "PYTHON_VERSION" in os.environ %} + - importlib_resources =1.3 + - zipp =3.3 + {% endif %} {% if TEST_QMXGRAPH %} - cherrypy From ae19258384a6f57658726d3e4b988a8a0304cca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Pr=C3=BCsse?= Date: Thu, 8 Dec 2022 19:06:02 -0300 Subject: [PATCH 2/3] WIP --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3afb328..5b962df 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,13 +18,13 @@ jobs: CONDA_PY: ["36", "37", "38", "39"] include: - CONDA_PY: "36" - PYTHON_VERSION: "=3.6" + PYTHON_VERSION: "3.6" - CONDA_PY: "37" - PYTHON_VERSION: "=3.7" + PYTHON_VERSION: "3.7" - CONDA_PY: "38" - PYTHON_VERSION: "=3.8" + PYTHON_VERSION: "3.8" - CONDA_PY: "39" - PYTHON_VERSION: "=3.9" + PYTHON_VERSION: "3.9" steps: From e8da864fdd1863d64981cd9ffe619df67b4fa086 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Pr=C3=BCsse?= Date: Fri, 9 Dec 2022 09:24:48 -0300 Subject: [PATCH 3/3] WIP - just to try top update the diff in the pr --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5b962df..ea9a271 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -51,7 +51,7 @@ jobs: export TEST_QMXGRAPH=1 echo "=== conda devenv -n qmxgraph --print-full ===" conda devenv -n qmxgraph --print-full - echo "=== === ===" + echo "=== === === === ===" conda devenv -n qmxgraph conda install -n qmxgraph coveralls pytest-cov conda list -n qmxgraph