Try to overcome non-local packages skipping by PyPi using local deps

elchupanebrej · Dec 31, 2023 · aef3762 · aef3762
1 parent e097819
commit aef3762
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 32 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -3,7 +3,7 @@
 	url = https://github.com/cucumber/compatibility-kit.git
 [submodule "messages"]
 	path = messages
-	url = https://github.com/cucumber/messages
+	url = https://github.com/elchupanebrej/messages
 [submodule "ci-environment"]
 	path = ci-environment
 	url = https://github.com/cucumber/ci-environment.git

diff --git a/ci-environment b/ci-environment
diff --git a/compatibility-kit b/compatibility-kit
diff --git a/gherkin b/gherkin
diff --git a/messages b/messages
diff --git a/pyproject.toml b/pyproject.toml
@@ -42,34 +42,9 @@ classifiers = [
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11"
 ]
-dependencies = [
-  "aiohttp",
-  "attrs",
-  "certifi",
-  "cucumber-expressions",
-  "decopatch",
-  "docopt-ng",
-  "filelock",
-  "gherkin-official>=24",
-  "importlib-metadata;python_version<'3.10.0'",
-  "importlib-resources",
-  "makefun",
-  "Mako",
-  "ordered_set",
-  "packaging",
-  "parse",
-  "parse_type>=0.6.0",
-  "py",
-  "pydantic>=2.0.3",
-  "pytest>=5.0",
-  "setuptools>=58",
-  "six>=1.16;python_version~='3.8'",
-  "cucumber-tag-expressions",
-  "typing-extensions;python_version<'3.11.0'",
-  "ci-environment@git+https://github.com/cucumber/ci-environment.git@main#subdirectory=python",
-  "messages@git+https://github.com/elchupanebrej/messages.git@main#subdirectory=python"
-]
 description = "BDD for pytest"
+# This is needed until ci-environment&messages become regular PyPi packages
+dynamic = ["dependencies"]
 license = {file = "LICENSE.rst"}
 maintainers = [
   {name = "Konstantin Goloveshko", email = "[email protected]"}

diff --git a/setup.py b/setup.py
@@ -0,0 +1,36 @@
+from pathlib import Path
+
+from setuptools import setup
+
+root_path = Path(__file__).parent
+
+setup(
+    # This is needed until ci-environment&messages become regular PyPi packages
+    install_requires=[
+        f"ci-environment@file://{root_path}/ci-environment/python",
+        f"messages@file://{root_path}/messages/python",
+        "aiohttp",
+        "attrs",
+        "certifi",
+        "cucumber-expressions",
+        "decopatch",
+        "docopt-ng",
+        "filelock",
+        "gherkin-official>=24",
+        "importlib-metadata;python_version<'3.10.0'",
+        "importlib-resources",
+        "makefun",
+        "Mako",
+        "ordered_set",
+        "packaging",
+        "parse",
+        "parse_type>=0.6.0",
+        "py",
+        "pydantic>=2.0.3",
+        "pytest>=5.0",
+        "setuptools>=58",
+        "six>=1.16;python_version~='3.8'",
+        "cucumber-tag-expressions",
+        "typing-extensions;python_version<'3.11.0'",
+    ],
+)
+1 −1		.github/workflows/prerelease-checks.yml
+2 −4		.github/workflows/release-github.yml
+3 −7		.github/workflows/release-java.yml
+4 −9		.github/workflows/release-javascript.yml
+2 −3		.github/workflows/release-ruby.yml
+3 −3		.github/workflows/test-go.yml
+3 −3		.github/workflows/test-java.yml
+3 −3		.github/workflows/test-javascript.yml
+3 −5		.github/workflows/test-python.yml
+7 −9		.github/workflows/test-ruby.yml
+8 −1		CHANGELOG.md
+4 −4		java/pom.xml
+495 −288		javascript/package-lock.json
+13 −13		javascript/package.json
+4 −1		python/pyproject.toml
+27 −0		ruby/.rubocop.yml
+227 −0		ruby/.rubocop_todo.yml
+1 −2		ruby/Gemfile
+2 −12		ruby/Rakefile
+1 −1		ruby/VERSION
+9 −10		ruby/cucumber-ci-environment.gemspec
+0 −16		ruby/rake/spec_warning.rb
+0 −32		ruby/scripts/update-gemspec
+0 −74		ruby/spec/capture_warnings.rb