diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 8e94075..791ef1a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -7,7 +7,7 @@ version: 2 updates: # Configuration for pip - package-ecosystem: "pip" # See documentation for possible values - directory: "/etc/requirements" # Location of package manifests + directory: "/etc/requirements_dependabot" # Location of package manifests schedule: interval: "daily" # for reference: diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index e19af15..aac7854 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -34,11 +34,11 @@ jobs: with: python-version: ${{ matrix.python-version }} cache: 'pip' - cache-dependency-path: 'etc/requirements_tests.txt' + cache-dependency-path: 'etc/requirements_dependabot/requirements_tests.txt' - name: Install dependencies run: | python -m pip install --upgrade pip - pip install -r etc/requirements_tests.txt + pip install -r etc/requirements_dependabot/requirements_tests.txt pip install -e . - name: Lint with flake8 # fail it if doesn't pass flake8 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8959a06..b3f8d54 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,7 +40,7 @@ jobs: while [ $i -lt 12 ] && [ "${{ github.ref_name }}" != $(pip index versions -i https://test.pypi.org/simple --pre market_prices | cut -d'(' -f2 | cut -d')' -f1 | sed 1q) ];\ do echo "waiting for package to appear in test index, i is $i, sleeping 5s"; sleep 5s; echo "woken up"; ((i++)); echo "next i is $i"; done pip install --index-url https://test.pypi.org/simple market_prices==${{ github.ref_name }} --no-deps - pip install -r etc/requirements/requirements.txt + pip install -r etc/requirements.txt python -c 'import market_prices;print(market_prices.__version__)' - name: Clean pip diff --git a/etc/requirements/requirements.txt b/etc/requirements.txt similarity index 100% rename from etc/requirements/requirements.txt rename to etc/requirements.txt diff --git a/etc/requirements/why_here.txt b/etc/requirements/why_here.txt deleted file mode 100644 index 5cb1d05..0000000 --- a/etc/requirements/why_here.txt +++ /dev/null @@ -1,3 +0,0 @@ -requirements.txt is in this dedicated directory simply so that dependabot -can be configured to look only at thses dependencies and ignore other lock -files (e.g. requirements_dev.txt). \ No newline at end of file diff --git a/etc/requirements_tests.txt b/etc/requirements_dependabot/requirements_tests.txt similarity index 100% rename from etc/requirements_tests.txt rename to etc/requirements_dependabot/requirements_tests.txt diff --git a/etc/requirements_dependabot/why_here.txt b/etc/requirements_dependabot/why_here.txt new file mode 100644 index 0000000..c7be3fe --- /dev/null +++ b/etc/requirements_dependabot/why_here.txt @@ -0,0 +1,8 @@ +requirements_test.txt is in this dedicated directory simply so that +dependabot can be configured to look only at thses dependencies and ignore +the additional requirements in requirements_dev.txt. + +Dependabot has to look at requirements_test.txt, as opposed to simply +requirements.txt, in order that the tests triggered by the dependabot PR +run in an environment that has installed the bumped versions of the +dependencies. \ No newline at end of file